From 8b109fe2601ddf7be0dfc91441580d0df154f11a Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer@transier.us>
Date: Fri, 18 Nov 2022 11:03:53 -0700
Subject: [PATCH 001/547] Add rubocop.yml

---
 .rubocop.yml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
new file mode 100644
index 000000000..ee10b62d1
--- /dev/null
+++ b/.rubocop.yml
@@ -0,0 +1,25 @@
+AllCops:
+  Exclude:
+    - DerivedData/**/*
+    - Pods/**/*
+    - vendor/**/*
+  NewCops: enable
+  SuggestExtensions:
+    rubocop-rake: false
+
+Layout/LineLength:
+  Exclude:
+    - fastlane/Fastfile
+
+Metrics/BlockLength:
+  Exclude:
+    - fastlane/*file
+
+Metrics/BlockNesting:
+  Exclude:
+    - fastlane/*file
+
+Naming/FileName:
+  Exclude:
+    - fastlane/*file
+    - '**/*.podspec'

From 860f6acb393c6df82093ba406771ec8317f340b0 Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer@transier.us>
Date: Fri, 18 Nov 2022 11:04:06 -0700
Subject: [PATCH 002/547] Remove unneeded TravisCI code

---
 Rakefile | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/Rakefile b/Rakefile
index 5f337f755..bcbb3302a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -239,16 +239,6 @@ task :xcode => [:dependencies] do
   sh "open #{XCODE_WORKSPACE}"
 end
 
-def fold(label, &block)
-  puts "travis_fold:start:#{label}" if is_travis?
-  yield
-  puts "travis_fold:end:#{label}" if is_travis?
-end
-
-def is_travis?
-  return ENV["TRAVIS"] != nil
-end
-
 def pod(args)
   args = %w[bundle exec pod] + args
   sh(*args)

From fff6a3b217ad72457c7dde2a5de1254819f69baf Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer@transier.us>
Date: Fri, 18 Nov 2022 11:12:40 -0700
Subject: [PATCH 003/547] Apply rubocop fixes

---
 Podfile              |   8 +-
 Rakefile             | 162 ++++++------
 fastlane/Deliverfile |  12 +-
 fastlane/Fastfile    | 579 ++++++++++++++++++++++---------------------
 4 files changed, 385 insertions(+), 376 deletions(-)

diff --git a/Podfile b/Podfile
index 020fd582d..61f839a42 100644
--- a/Podfile
+++ b/Podfile
@@ -1,8 +1,8 @@
+# frozen_string_literal: true
+
 source 'https://cdn.cocoapods.org/'
 
-unless ['BUNDLE_BIN_PATH', 'BUNDLE_GEMFILE'].any? { |k| ENV.key?(k) }
-  raise 'Please run CocoaPods via `bundle exec`'
-end
+raise 'Please run CocoaPods via `bundle exec`' unless %w[BUNDLE_BIN_PATH BUNDLE_GEMFILE].any? { |k| ENV.key?(k) }
 
 inhibit_all_warnings!
 use_frameworks!
@@ -13,7 +13,6 @@ workspace 'Simplenote.xcworkspace'
 # Main
 #
 abstract_target 'Automattic' do
-
   # Main Target
   #
   target 'Simplenote' do
@@ -46,7 +45,6 @@ abstract_target 'Automattic' do
   end
 end
 
-
 # Post Install
 #
 post_install do |installer|
diff --git a/Rakefile b/Rakefile
index bcbb3302a..58c2655be 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,61 +1,64 @@
-SWIFTLINT_VERSION="0.41.0"
-XCODE_WORKSPACE="Simplenote.xcworkspace"
-XCODE_SCHEME="Simplenote"
-XCODE_CONFIGURATION="Debug"
+# frozen_string_literal: true
+
+require 'English'
+SWIFTLINT_VERSION = '0.41.0'
+XCODE_WORKSPACE = 'Simplenote.xcworkspace'
+XCODE_SCHEME = 'Simplenote'
+XCODE_CONFIGURATION = 'Debug'
 
 require 'fileutils'
 require 'tmpdir'
 require 'rake/clean'
 require 'yaml'
 require 'digest'
-PROJECT_DIR = File.expand_path(File.dirname(__FILE__))
+PROJECT_DIR = __dir__
 
 task default: %w[test]
 
-desc "Install required dependencies"
-task :dependencies => %w[dependencies:check]
+desc 'Install required dependencies'
+task dependencies: %w[dependencies:check]
 
 namespace :dependencies do
-  task :check => %w[bundler:check bundle:check credentials:apply pod:check lint:check]
+  task check: %w[bundler:check bundle:check credentials:apply pod:check lint:check]
 
   namespace :bundler do
     task :check do
-      unless command?("bundler")
-        Rake::Task["dependencies:bundler:install"].invoke
-      end
+      Rake::Task['dependencies:bundler:install'].invoke unless command?('bundler')
     end
 
     task :install do
-      puts "Bundler not found in PATH, installing to vendor"
+      puts 'Bundler not found in PATH, installing to vendor'
       ENV['GEM_HOME'] = File.join(PROJECT_DIR, 'vendor', 'gems')
-      ENV['PATH'] = File.join(PROJECT_DIR, 'vendor', 'gems', 'bin') + ":#{ENV['PATH']}"
-      sh "gem install bundler" unless command?("bundler")
+      ENV['PATH'] = File.join(PROJECT_DIR, 'vendor', 'gems', 'bin') + ":#{ENV.fetch('PATH', nil)}"
+      sh 'gem install bundler' unless command?('bundler')
     end
-    CLOBBER << "vendor/gems"
+    CLOBBER << 'vendor/gems'
   end
 
   namespace :bundle do
     task :check do
-      sh "bundle check --path=${BUNDLE_PATH:-vendor/bundle} > /dev/null", verbose: false do |ok, res|
+      sh 'bundle check --path=${BUNDLE_PATH:-vendor/bundle} > /dev/null', verbose: false do |ok, _res|
         next if ok
+
         # bundle check exits with a non zero code if install is needed
-        dependency_failed("Bundler")
-        Rake::Task["dependencies:bundle:install"].invoke
+        dependency_failed('Bundler')
+        Rake::Task['dependencies:bundle:install'].invoke
       end
     end
 
     task :install do
-      fold("install.bundler") do
-        sh "bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}"
+      fold('install.bundler') do
+        sh 'bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}'
       end
     end
-    CLOBBER << "vendor/bundle"
-    CLOBBER << ".bundle"
+    CLOBBER << 'vendor/bundle'
+    CLOBBER << '.bundle'
   end
 
   namespace :credentials do
     task :apply do
       next unless Dir.exist?(File.join(Dir.home, '.mobile-secrets/.git')) || ENV.key?('CONFIGURE_ENCRYPTION_KEY')
+
       sh('FASTLANE_SKIP_UPDATE_CHECK=1 FASTLANE_ENV_PRINTER=1 bundle exec fastlane run configure_apply force:true')
     end
   end
@@ -63,42 +66,41 @@ namespace :dependencies do
   namespace :pod do
     task :check do
       unless podfile_locked? && lockfiles_match?
-        dependency_failed("CocoaPods")
-        Rake::Task["dependencies:pod:install"].invoke
+        dependency_failed('CocoaPods')
+        Rake::Task['dependencies:pod:install'].invoke
       end
     end
 
     task :install do
-      fold("install.cocoapds") do
+      fold('install.cocoapds') do
         pod %w[install]
       end
     end
 
     task :clean do
-      fold("clean.cocoapds") do
+      fold('clean.cocoapds') do
         FileUtils.rm_rf('Pods')
       end
     end
-    CLOBBER << "Pods"
+    CLOBBER << 'Pods'
   end
 
   namespace :lint do
-
     task :check do
       if swiftlint_needs_install
-        dependency_failed("SwiftLint")
-        Rake::Task["dependencies:lint:install"].invoke
+        dependency_failed('SwiftLint')
+        Rake::Task['dependencies:lint:install'].invoke
       end
     end
 
     task :install do
-      fold("install.swiftlint") do
+      fold('install.swiftlint') do
         puts "Installing SwiftLint #{SWIFTLINT_VERSION} into #{swiftlint_path}"
         Dir.mktmpdir do |tmpdir|
           # Try first using a binary release
           zipfile = "#{tmpdir}/swiftlint-#{SWIFTLINT_VERSION}.zip"
           sh "curl --fail --location -o #{zipfile} https://github.com/realm/SwiftLint/releases/download/#{SWIFTLINT_VERSION}/portable_swiftlint.zip || true"
-          if File.exists?(zipfile)
+          if File.exist?(zipfile)
             extracted_dir = "#{tmpdir}/swiftlint-#{SWIFTLINT_VERSION}"
             sh "unzip #{zipfile} -d #{extracted_dir}"
             FileUtils.mkdir_p("#{swiftlint_path}/bin")
@@ -107,8 +109,8 @@ namespace :dependencies do
             sh "git clone --quiet https://github.com/realm/SwiftLint.git #{tmpdir}"
             Dir.chdir(tmpdir) do
               sh "git checkout --quiet #{SWIFTLINT_VERSION}"
-              sh "git submodule --quiet update --init --recursive"
-              FileUtils.remove_entry_secure(swiftlint_path) if Dir.exist?(swiftlint_path)
+              sh 'git submodule --quiet update --init --recursive'
+              FileUtils.rm_f(swiftlint_path)
               FileUtils.mkdir_p(swiftlint_path)
               sh "make prefix_install PREFIX='#{swiftlint_path}'"
             end
@@ -116,51 +118,51 @@ namespace :dependencies do
         end
       end
     end
-    CLOBBER << "vendor/swiftlint"
+    CLOBBER << 'vendor/swiftlint'
   end
-
 end
 
-CLOBBER << "vendor"
+CLOBBER << 'vendor'
 
 desc "Build #{XCODE_SCHEME}"
-task :build => [:dependencies] do
+task build: [:dependencies] do
   xcodebuild(:build)
 end
 
 desc "Profile build #{XCODE_SCHEME}"
-task :buildprofile => [:dependencies] do
-  ENV["verbose"] = "1"
-  xcodebuild(:build, "OTHER_SWIFT_FLAGS='-Xfrontend -debug-time-compilation -Xfrontend -debug-time-expression-type-checking'")
+task buildprofile: [:dependencies] do
+  ENV['verbose'] = '1'
+  xcodebuild(:build,
+             "OTHER_SWIFT_FLAGS='-Xfrontend -debug-time-compilation -Xfrontend -debug-time-expression-type-checking'")
 end
 
-task :timed_build => [:clean] do
+task timed_build: [:clean] do
   require 'benchmark'
   time = Benchmark.measure do
-    Rake::Task["build"].invoke
+    Rake::Task['build'].invoke
   end
   puts "CPU Time: #{time.total}"
   puts "Wall Time: #{time.real}"
 end
 
-desc "Run test suite"
-task :test => [:dependencies] do
+desc 'Run test suite'
+task test: [:dependencies] do
   xcodebuild(:build, :test)
 end
 
-desc "Remove any temporary products"
+desc 'Remove any temporary products'
 task :clean do
   xcodebuild(:clean)
 end
 
-desc "Checks the source for style errors"
-task :lint => %w[dependencies:lint:check] do
+desc 'Checks the source for style errors'
+task lint: %w[dependencies:lint:check] do
   swiftlint %w[lint --quiet]
 end
 
 namespace :lint do
-  desc "Automatically corrects style errors where possible"
-  task :autocorrect => %w[dependencies:lint:check] do
+  desc 'Automatically corrects style errors where possible'
+  task autocorrect: %w[dependencies:lint:check] do
     swiftlint %w[autocorrect]
   end
 end
@@ -168,32 +170,34 @@ end
 namespace :git do
   hooks = %w[pre-commit post-checkout post-merge]
 
-  desc "Install git hooks"
+  desc 'Install git hooks'
   task :install_hooks do
     hooks.each do |hook|
       target = hook_target(hook)
       source = hook_source(hook)
       backup = hook_backup(hook)
 
-      next if File.symlink?(target) and File.readlink(target) == source
-      next if File.file?(target) and File.identical?(target, source)
+      next if File.symlink?(target) && (File.readlink(target) == source)
+      next if File.file?(target) && File.identical?(target, source)
+
       if File.exist?(target)
         puts "Existing hook for #{hook}. Creating backup at #{target} -> #{backup}"
-        FileUtils.mv(target, backup, :force => true)
+        FileUtils.mv(target, backup, force: true)
       end
       FileUtils.ln_s(source, target)
       puts "Installed #{hook} hook"
     end
   end
 
-  desc "Uninstall git hooks"
+  desc 'Uninstall git hooks'
   task :uninstall_hooks do
     hooks.each do |hook|
       target = hook_target(hook)
       source = hook_source(hook)
       backup = hook_backup(hook)
 
-      next unless File.symlink?(target) and File.readlink(target) == source
+      next unless File.symlink?(target) && (File.readlink(target) == source)
+
       puts "Removing hook for #{hook}"
       File.unlink(target)
       if File.exist?(backup)
@@ -217,12 +221,10 @@ namespace :git do
 end
 
 namespace :git do
-  task :pre_commit => %[dependencies:lint:check] do
-    begin
-      swiftlint %w[lint --quiet --strict]
-    rescue
-      exit $?.exitstatus
-    end
+  task pre_commit: %(dependencies:lint:check) do
+    swiftlint %w[lint --quiet --strict]
+  rescue StandardError
+    exit $CHILD_STATUS.exitstatus
   end
 
   task :post_merge do
@@ -234,8 +236,8 @@ namespace :git do
   end
 end
 
-desc "Open the project in Xcode"
-task :xcode => [:dependencies] do
+desc 'Open the project in Xcode'
+task xcode: [:dependencies] do
   sh "open #{XCODE_WORKSPACE}"
 end
 
@@ -249,14 +251,14 @@ def lockfiles_match?
 end
 
 def podfile_locked?
-  podfile_checksum = Digest::SHA1.file("Podfile")
-  lockfile_checksum = YAML.load(File.read("Podfile.lock"))["PODFILE CHECKSUM"]
+  podfile_checksum = Digest::SHA1.file('Podfile')
+  lockfile_checksum = YAML.safe_load(File.read('Podfile.lock'))['PODFILE CHECKSUM']
 
   podfile_checksum == lockfile_checksum
 end
 
 def swiftlint_path
-    "#{PROJECT_DIR}/vendor/swiftlint"
+  "#{PROJECT_DIR}/vendor/swiftlint"
 end
 
 def swiftlint(args)
@@ -265,25 +267,28 @@ def swiftlint(args)
 end
 
 def swiftlint_bin
-    "#{swiftlint_path}/bin/swiftlint"
+  "#{swiftlint_path}/bin/swiftlint"
 end
 
 def swiftlint_needs_install
   return true unless File.exist?(swiftlint_bin)
+
   installed_version = `"#{swiftlint_bin}" version`.chomp
-  return (installed_version != SWIFTLINT_VERSION)
+  (installed_version != SWIFTLINT_VERSION)
 end
 
 def xcodebuild(*build_cmds)
-  cmd = "xcodebuild"
+  cmd = 'xcodebuild'
   cmd += " -destination 'platform=iOS Simulator,name=iPhone 6s'"
-  cmd += " -sdk iphonesimulator"
+  cmd += ' -sdk iphonesimulator'
   cmd += " -workspace #{XCODE_WORKSPACE}"
   cmd += " -scheme #{XCODE_SCHEME}"
   cmd += " -configuration #{xcode_configuration}"
-  cmd += " "
-  cmd += build_cmds.map(&:to_s).join(" ")
-  cmd += " | bundle exec xcpretty -f `bundle exec xcpretty-travis-formatter` && exit ${PIPESTATUS[0]}" unless ENV['verbose']
+  cmd += ' '
+  cmd += build_cmds.map(&:to_s).join(' ')
+  unless ENV['verbose']
+    cmd += ' | bundle exec xcpretty -f `bundle exec xcpretty-travis-formatter` && exit ${PIPESTATUS[0]}'
+  end
   sh(cmd)
 end
 
@@ -294,19 +299,20 @@ end
 def command?(command)
   system("which #{command} > /dev/null 2>&1")
 end
+
 def dependency_failed(component)
   msg = "#{component} dependencies missing or outdated. "
   if ENV['DRY_RUN']
-    msg += "Run rake dependencies to install them."
-    fail msg
+    msg += 'Run rake dependencies to install them.'
+    raise msg
   else
-    msg += "Installing..."
+    msg += 'Installing...'
     puts msg
   end
 end
 
 def check_dependencies_hook
-  ENV['DRY_RUN'] = "1"
+  ENV['DRY_RUN'] = '1'
   begin
     Rake::Task['dependencies'].invoke
   rescue Exception => e
diff --git a/fastlane/Deliverfile b/fastlane/Deliverfile
index a27802c01..980b37e51 100644
--- a/fastlane/Deliverfile
+++ b/fastlane/Deliverfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The Deliverfile allows you to store various App Store Connect metadata
 # For more information, check out the docs
 # https://docs.fastlane.tools/actions/deliver/
@@ -7,15 +9,15 @@
 ########################################
 
 # This folder has to include one folder for each language
-screenshots_path "./screenshots/"
-app_identifier "com.codality.NotationalFlow"
+screenshots_path './screenshots/'
+app_identifier 'com.codality.NotationalFlow'
 
 # Make sure to update these keys for a new version
-app_version "4.48"
+app_version '4.48'
 
 privacy_url({
-  'default' => 'https://simplenote.com/privacy/',
-})
+              'default' => 'https://simplenote.com/privacy/'
+            })
 
 copyright('2021 Automattic')
 
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index c682b4d87..8018e7a8a 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -1,12 +1,12 @@
+# frozen_string_literal: true
+
 default_platform(:ios)
 fastlane_require 'xcodeproj'
 fastlane_require 'dotenv'
 fastlane_require 'open-uri'
 fastlane_require 'buildkit'
 
-unless FastlaneCore::Helper.bundler?
-  UI.user_error!('Please run fastlane via `bundle exec`')
-end
+UI.user_error!('Please run fastlane via `bundle exec`') unless FastlaneCore::Helper.bundler?
 
 USER_ENV_FILE_PATH = File.join(Dir.home, '.simplenoteios-env.default')
 PROJECT_ENV_FILE_PATH = File.join(
@@ -23,48 +23,48 @@ before_all do
     UI.user_error!("~/.simplenoteios-env.default not found: Please copy env/user.env-example to #{USER_ENV_FILE_PATH} and fill in the values")
   end
   unless File.file?(PROJECT_ENV_FILE_PATH)
-    UI.user_error!("project.env not found: Make sure your configuration is up to date with `rake dependencies`")
+    UI.user_error!('project.env not found: Make sure your configuration is up to date with `rake dependencies`')
   end
 
   setup_ci
 end
 
-error do |lane, exception, options|
+error do |lane, _exception, _options|
   deoccupy_test_account if lane == :run_ui_tests
 end
 
 platform :ios do
-########################################################################
-# Environment
-########################################################################
-PROJECT_ROOT_FOLDER = File.dirname(File.expand_path(__dir__))
-VERSION_FILE_PATH = File.join(PROJECT_ROOT_FOLDER, 'config', 'Version.Public.xcconfig')
-OUTPUT_DIRECTORY_PATH = File.join(PROJECT_ROOT_FOLDER, 'build', 'results')
-
-Dotenv.load(USER_ENV_FILE_PATH)
-Dotenv.load(PROJECT_ENV_FILE_PATH)
-ENV[GHHELPER_REPO="Automattic/simplenote-ios"]
-ENV["PROJECT_NAME"]="Simplenote"
-ENV["PROJECT_ROOT_FOLDER"]=PROJECT_ROOT_FOLDER
-ENV['APP_STORE_STRINGS_FILE_NAME']='AppStoreStrings.pot'
-ENV["PUBLIC_CONFIG_FILE"]=VERSION_FILE_PATH
-ENV["DOWNLOAD_METADATA"]="./fastlane/download_metadata.swift"
-ENV['FL_RELEASE_TOOLKIT_DEFAULT_BRANCH'] = 'trunk'
-REPOSITORY_NAME="simplenote-ios"
-APP_STORE_BUNDLE_IDENTIFIER = 'com.codality.NotationalFlow'.freeze
-
-# Use this instead of getting values from ENV directly
-# It will throw an error if the requested value is missing
-def get_required_env(key)
-  unless ENV.key?(key)
-    UI.user_error!("Environment variable '#{key}' is not set. Have you setup #{USER_ENV_FILE_PATH} correctly?")
+  ########################################################################
+  # Environment
+  ########################################################################
+  PROJECT_ROOT_FOLDER = File.dirname(File.expand_path(__dir__))
+  VERSION_FILE_PATH = File.join(PROJECT_ROOT_FOLDER, 'config', 'Version.Public.xcconfig')
+  OUTPUT_DIRECTORY_PATH = File.join(PROJECT_ROOT_FOLDER, 'build', 'results')
+
+  Dotenv.load(USER_ENV_FILE_PATH)
+  Dotenv.load(PROJECT_ENV_FILE_PATH)
+  ENV.fetch(GHHELPER_REPO = 'Automattic/simplenote-ios', nil)
+  ENV['PROJECT_NAME'] = 'Simplenote'
+  ENV['PROJECT_ROOT_FOLDER'] = PROJECT_ROOT_FOLDER
+  ENV['APP_STORE_STRINGS_FILE_NAME'] = 'AppStoreStrings.pot'
+  ENV['PUBLIC_CONFIG_FILE'] = VERSION_FILE_PATH
+  ENV['DOWNLOAD_METADATA'] = './fastlane/download_metadata.swift'
+  ENV['FL_RELEASE_TOOLKIT_DEFAULT_BRANCH'] = 'trunk'
+  REPOSITORY_NAME = 'simplenote-ios'
+  APP_STORE_BUNDLE_IDENTIFIER = 'com.codality.NotationalFlow'
+
+  # Use this instead of getting values from ENV directly
+  # It will throw an error if the requested value is missing
+  def get_required_env(key)
+    unless ENV.key?(key)
+      UI.user_error!("Environment variable '#{key}' is not set. Have you setup #{USER_ENV_FILE_PATH} correctly?")
+    end
+    ENV.fetch(key, nil)
   end
-  ENV[key]
-end
 
-########################################################################
-# Release Lanes
-########################################################################
+  ########################################################################
+  # Release Lanes
+  ########################################################################
   #####################################################################################
   # code_freeze
   # -----------------------------------------------------------------------------------
@@ -77,18 +77,18 @@ end
   # bundle exec fastlane code_freeze
   # bundle exec fastlane code_freeze skip_confirm:true
   #####################################################################################
-  desc "Creates a new release branch from the current trunk"
-  lane :code_freeze do | options |
+  desc 'Creates a new release branch from the current trunk'
+  lane :code_freeze do |options|
     old_version = ios_codefreeze_prechecks(options)
 
-    ios_bump_version_release()
-    new_version = ios_get_app_version()
+    ios_bump_version_release
+    new_version = ios_get_app_version
     extract_release_notes_for_version(version: new_version,
-      release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'RELEASE-NOTES.txt'),
-      extracted_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt'))
+                                      release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'RELEASE-NOTES.txt'),
+                                      extracted_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt'))
     ios_update_release_notes(new_version: new_version)
-    setbranchprotection(repository:GHHELPER_REPO, branch: "release/#{new_version}")
-    setfrozentag(repository:GHHELPER_REPO, milestone: new_version)
+    setbranchprotection(repository: GHHELPER_REPO, branch: "release/#{new_version}")
+    setfrozentag(repository: GHHELPER_REPO, milestone: new_version)
 
     generate_strings_file_for_glotpress
     trigger_beta_build(branch_to_build: "release/#{new_version}")
@@ -106,20 +106,20 @@ end
   # Example:
   # bundle exec fastlane update_appstore_strings version:1.1
   #####################################################################################
-  desc "Updates the AppStoreStrings.pot file with the latest data"
-  lane :update_appstore_strings do | options |
-    prj_folder = Pathname.new(File.join(Dir.pwd, "..")).expand_path.to_s
-    source_metadata_folder = File.join(prj_folder, "fastlane/appstoreres/metadata/source")
+  desc 'Updates the AppStoreStrings.pot file with the latest data'
+  lane :update_appstore_strings do |options|
+    prj_folder = Pathname.new(File.join(Dir.pwd, '..')).expand_path.to_s
+    source_metadata_folder = File.join(prj_folder, 'fastlane/appstoreres/metadata/source')
 
     files = {
-      whats_new: File.join(prj_folder,  "/Simplenote/Resources/release_notes.txt"),
-      app_store_subtitle: File.join(source_metadata_folder, "subtitle.txt"),
-      app_store_desc: File.join(source_metadata_folder, "description.txt"),
-      app_store_keywords: File.join(source_metadata_folder, "keywords.txt")
+      whats_new: File.join(prj_folder, '/Simplenote/Resources/release_notes.txt'),
+      app_store_subtitle: File.join(source_metadata_folder, 'subtitle.txt'),
+      app_store_desc: File.join(source_metadata_folder, 'description.txt'),
+      app_store_keywords: File.join(source_metadata_folder, 'keywords.txt')
     }
 
     ios_update_metadata_source(
-      po_file_path: prj_folder + "/Simplenote/Resources/AppStoreStrings.pot",
+      po_file_path: "#{prj_folder}/Simplenote/Resources/AppStoreStrings.pot",
       source_files: files,
       release_version: options[:version]
     )
@@ -127,12 +127,12 @@ end
 
   # This lane lacks documentation because it ought to be part of the localized
   # metadata download script instead!
-  desc "Updates the files with the localized keywords values for App Store Connect to match the 100 characters requirement"
+  desc 'Updates the files with the localized keywords values for App Store Connect to match the 100 characters requirement'
   lane :sanitize_appstore_keywords do
-    Dir["./metadata/**"].each do |locale_dir|
+    Dir['./metadata/**'].each do |locale_dir|
       keywords_path = File.join(locale_dir, 'keywords.txt')
 
-      unless File.exists?(keywords_path)
+      unless File.exist?(keywords_path)
         UI.message "Could not find keywords file in #{locale_dir}. Skipping."
         next
       end
@@ -175,8 +175,8 @@ end
   # bundle exec fastlane new_beta_release skip_confirm:true
   # bundle exec fastlane new_beta_release base_version:10.6.1
   #####################################################################################
-  desc "Updates a release branch for a new beta release"
-  lane :new_beta_release do | options |
+  desc 'Updates a release branch for a new beta release'
+  lane :new_beta_release do |options|
     ios_betabuild_prechecks(options)
     download_localized_strings_and_metadata_from_glotpress
     ios_lint_localizations(input_dir: 'Simplenote', allow_retry: true)
@@ -198,7 +198,7 @@ end
   # bundle exec fastlane new_hotfix_release skip_confirm:true version:10.6.1
   #####################################################################################
   desc 'Creates a new hotfix branch for the given version:x.y.z. The branch will be cut from the tag x.y of the previous release'
-  lane :new_hotfix_release do | options |
+  lane :new_hotfix_release do |options|
     prev_ver = ios_hotfix_prechecks(options)
     ios_bump_version_hotfix(previous_version: prev_ver, version: options[:version])
   end
@@ -236,7 +236,9 @@ end
   #####################################################################################
   desc 'Trigger the final release build on CI'
   lane :finalize_release do |options|
-    UI.user_error!('To finalize a hotfix, please use the finalize_hotfix_release lane instead') if ios_current_branch_is_hotfix
+    if ios_current_branch_is_hotfix
+      UI.user_error!('To finalize a hotfix, please use the finalize_hotfix_release lane instead')
+    end
 
     ios_finalize_prechecks(options)
 
@@ -246,23 +248,23 @@ end
       abort_on_violations: false
     )
 
-    UI.message("Checking release notes strings translation status...")
+    UI.message('Checking release notes strings translation status...')
     check_translation_progress(
       glotpress_url: 'https://translate.wordpress.com/projects/simplenote/ios/release-notes/',
       abort_on_violations: false
     )
 
     ios_update_metadata(options)
-    sanitize_appstore_keywords()
+    sanitize_appstore_keywords
     ios_lint_localizations(input_dir: 'Simplenote', allow_retry: true)
-    ios_bump_version_beta()
+    ios_bump_version_beta
 
     # Wrap up
-    version = ios_get_app_version()
-    removebranchprotection(repository:GHHELPER_REPO, branch: "release/#{version}")
-    setfrozentag(repository:GHHELPER_REPO, milestone: version, freeze: false)
-    create_new_milestone(repository:GHHELPER_REPO)
-    close_milestone(repository:GHHELPER_REPO, milestone: version)
+    version = ios_get_app_version
+    removebranchprotection(repository: GHHELPER_REPO, branch: "release/#{version}")
+    setfrozentag(repository: GHHELPER_REPO, milestone: version, freeze: false)
+    create_new_milestone(repository: GHHELPER_REPO)
+    close_milestone(repository: GHHELPER_REPO, milestone: version)
 
     # Start the build
     trigger_release_build(branch_to_build: "release/#{version}")
@@ -283,12 +285,13 @@ end
   # bundle exec fastlane build_and_upload_beta_release skip_confirm:true
   # bundle exec fastlane build_and_upload_beta_release create_gh_release:true
   #####################################################################################
-  desc "Builds and uploads a beta release for distribution"
-  lane :build_and_upload_beta_release do | options |
+  desc 'Builds and uploads a beta release for distribution'
+  lane :build_and_upload_beta_release do |options|
     build_and_upload_release(
       skip_confirm: options[:skip_confirm],
       create_gh_release: options[:create_gh_release],
-      beta_release: true)
+      beta_release: true
+    )
   end
 
   #####################################################################################
@@ -306,12 +309,13 @@ end
   # bundle exec fastlane build_and_upload_stable_release skip_confirm:true
   # bundle exec fastlane build_and_upload_stable_release create_gh_release:true
   #####################################################################################
-  desc "Builds and uploads a stable release for distribution"
-  lane :build_and_upload_stable_release do | options |
+  desc 'Builds and uploads a stable release for distribution'
+  lane :build_and_upload_stable_release do |options|
     build_and_upload_release(
       skip_confirm: options[:skip_confirm],
       create_gh_release: options[:create_gh_release],
-      beta_release: false)
+      beta_release: false
+    )
   end
 
   #####################################################################################
@@ -328,17 +332,17 @@ end
   # bundle exec fastlane build_and_upload_release skip_confirm:true
   # bundle exec fastlane build_and_upload_release beta_release:true
   #####################################################################################
-  desc "Builds and uploads for distribution"
-  lane :build_and_upload_release do | options |
+  desc 'Builds and uploads for distribution'
+  lane :build_and_upload_release do |options|
     ios_build_prechecks(skip_confirm: options[:skip_confirm],
-      internal: false,
-      internal_on_single_version: options[:beta_release],
-      external: true)
+                        internal: false,
+                        internal_on_single_version: options[:beta_release],
+                        external: true)
 
-    ios_build_preflight()
+    ios_build_preflight
     build_and_upload_internal(skip_prechecks: true, skip_confirm: options[:skip_confirm]) if options[:beta_release]
     build_and_upload_to_app_store_connect(skip_prechecks: true, skip_confirm: options[:skip_confirm],
-                         beta_release: options[:beta_release], create_release: options[:create_gh_release])
+                                          beta_release: options[:beta_release], create_release: options[:create_gh_release])
   end
 
   #####################################################################################
@@ -353,23 +357,23 @@ end
   # bundle exec fastlane build_and_upload_internal
   # bundle exec fastlane build_and_upload_internal skip_confirm:true
   #####################################################################################
-  desc "Builds and updates for distribution"
-  lane :build_and_upload_internal do | options |
-    ios_build_prechecks(skip_confirm: options[:skip_confirm], internal: false) unless (options[:skip_prechecks])
-    ios_build_preflight() unless (options[:skip_prechecks])
+  desc 'Builds and updates for distribution'
+  lane :build_and_upload_internal do |options|
+    ios_build_prechecks(skip_confirm: options[:skip_confirm], internal: false) unless options[:skip_prechecks]
+    ios_build_preflight unless options[:skip_prechecks]
 
     internal_code_signing
 
     gym(
-      scheme: "Simplenote",
-      configuration: "Distribution Internal",
-      workspace: "Simplenote.xcworkspace",
-      export_method: "enterprise",
+      scheme: 'Simplenote',
+      configuration: 'Distribution Internal',
+      workspace: 'Simplenote.xcworkspace',
+      export_method: 'enterprise',
       clean: true,
       output_directory: OUTPUT_DIRECTORY_PATH,
-      export_team_id: ENV["INT_EXPORT_TEAM_ID"],
+      export_team_id: ENV.fetch('INT_EXPORT_TEAM_ID', nil),
       export_options: {
-        method: "enterprise",
+        method: 'enterprise',
         provisioningProfiles: simplenote_provisioning_profiles(
           root_bundle_id: "#{APP_STORE_BUNDLE_IDENTIFIER}.Internal",
           match_type: 'InHouse'
@@ -380,16 +384,16 @@ end
     File.rename(File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote.ipa'), File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote Internal.ipa'))
 
     appcenter_upload(
-      api_token: ENV["APPCENTER_API_TOKEN"],
-      owner_name: "automattic",
-      owner_type: "organization",
-      app_name: "Simplenote",
+      api_token: ENV.fetch('APPCENTER_API_TOKEN', nil),
+      owner_name: 'automattic',
+      owner_type: 'organization',
+      app_name: 'Simplenote',
       file: File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote Internal.ipa'),
       notify_testers: false
     )
 
     sentry_upload_dsym(
-      auth_token: ENV["SENTRY_AUTH_TOKEN"],
+      auth_token: ENV.fetch('SENTRY_AUTH_TOKEN', nil),
       org_slug: 'a8c',
       project_slug: 'simplenote-ios',
       dsym_path: lane_context[SharedValues::DSYM_OUTPUT_PATH]
@@ -408,21 +412,21 @@ end
   # bundle exec fastlane build_and_upload_to_app_store_connect
   # bundle exec fastlane build_and_upload_to_app_store_connect skip_confirm:true
   #####################################################################################
-  desc "Builds and uploads for distribution"
-  lane :build_and_upload_to_app_store_connect do | options |
-    ios_build_prechecks(skip_confirm: options[:skip_confirm], external: true) unless (options[:skip_prechecks])
-    ios_build_preflight() unless (options[:skip_prechecks])
+  desc 'Builds and uploads for distribution'
+  lane :build_and_upload_to_app_store_connect do |options|
+    ios_build_prechecks(skip_confirm: options[:skip_confirm], external: true) unless options[:skip_prechecks]
+    ios_build_preflight unless options[:skip_prechecks]
 
     appstore_code_signing
 
     gym(
-      scheme: "Simplenote",
-      workspace: "Simplenote.xcworkspace",
-      configuration: "Distribution AppStore",
+      scheme: 'Simplenote',
+      workspace: 'Simplenote.xcworkspace',
+      configuration: 'Distribution AppStore',
       clean: true,
       export_options: {
-        method: "app-store",
-        export_team_id: ENV["EXT_EXPORT_TEAM_ID"],
+        method: 'app-store',
+        export_team_id: ENV.fetch('EXT_EXPORT_TEAM_ID', nil),
         provisioningProfiles: simplenote_provisioning_profiles
       }
     )
@@ -432,29 +436,28 @@ end
       api_key_path: File.join(Dir.home, '.configure', 'simplenote-ios', 'secrets', 'app_store_connect_fastlane_api_key.json')
     )
 
-    sh("rm ../Simplenote.ipa")
-    dSYM_PATH = File.dirname(Dir.pwd) + "/Simplenote.app.dSYM.zip"
+    sh('rm ../Simplenote.ipa')
+    dSYM_PATH = "#{File.dirname(Dir.pwd)}/Simplenote.app.dSYM.zip"
 
     sentry_upload_dsym(
       dsym_path: dSYM_PATH,
-      auth_token: ENV["SENTRY_AUTH_TOKEN"],
+      auth_token: ENV.fetch('SENTRY_AUTH_TOKEN', nil),
       org_slug: 'a8c',
-      project_slug: 'simplenote-ios',
+      project_slug: 'simplenote-ios'
     )
 
     sh("rm #{dSYM_PATH}")
 
-    if (options[:create_release])
-      archive_zip_path = File.dirname(Dir.pwd) + "/Simplenote.xarchive.zip"
+    if options[:create_release]
+      archive_zip_path = "#{File.dirname(Dir.pwd)}/Simplenote.xarchive.zip"
       zip(path: lane_context[SharedValues::XCODEBUILD_ARCHIVE], output_path: archive_zip_path)
 
       version = options[:beta_release] ? ios_get_build_version : ios_get_app_version
-      create_release(repository:GHHELPER_REPO,
-        version: version,
-        release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt'),
-        release_assets: archive_zip_path.to_s,
-        prerelease: options[:beta_release]
-      )
+      create_release(repository: GHHELPER_REPO,
+                     version: version,
+                     release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt'),
+                     release_assets: archive_zip_path.to_s,
+                     prerelease: options[:beta_release])
 
       sh("rm #{archive_zip_path}")
     end
@@ -501,8 +504,8 @@ end
   # Example:
   # bundle exec fastlane build_and_upload_installable_build
   #####################################################################################
-  desc "Builds and uploads an installable build"
-  lane :build_and_upload_installable_build do | options |
+  desc 'Builds and uploads an installable build'
+  lane :build_and_upload_installable_build do |_options|
     alpha_code_signing
 
     # Get the current build version, and update it if needed
@@ -510,15 +513,15 @@ end
     apply_build_number(build_number)
 
     gym(
-      scheme: "Simplenote",
-      configuration: "Distribution Alpha",
-      workspace: "Simplenote.xcworkspace",
-      export_method: "enterprise",
+      scheme: 'Simplenote',
+      configuration: 'Distribution Alpha',
+      workspace: 'Simplenote.xcworkspace',
+      export_method: 'enterprise',
       clean: true,
       output_directory: OUTPUT_DIRECTORY_PATH,
-      export_team_id: ENV["INT_EXPORT_TEAM_ID"],
+      export_team_id: ENV.fetch('INT_EXPORT_TEAM_ID', nil),
       export_options: {
-        method: "enterprise",
+        method: 'enterprise',
         provisioningProfiles: simplenote_provisioning_profiles(
           root_bundle_id: "#{APP_STORE_BUNDLE_IDENTIFIER}.Alpha",
           match_type: 'InHouse'
@@ -529,17 +532,17 @@ end
     File.rename(File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote.ipa'), File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote Alpha.ipa'))
 
     appcenter_upload(
-      api_token: get_required_env("APPCENTER_API_TOKEN"),
-      owner_name: "automattic",
-      owner_type: "organization",
-      app_name: "Simplenote-Installable-Builds",
+      api_token: get_required_env('APPCENTER_API_TOKEN'),
+      owner_name: 'automattic',
+      owner_type: 'organization',
+      app_name: 'Simplenote-Installable-Builds',
       file: File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote Alpha.ipa'),
-      destinations: "All-Users-of-Simplenote-Installable-Builds",
+      destinations: 'All-Users-of-Simplenote-Installable-Builds',
       notify_testers: false
     )
 
     sentry_upload_dsym(
-      auth_token: get_required_env("SENTRY_AUTH_TOKEN"),
+      auth_token: get_required_env('SENTRY_AUTH_TOKEN'),
       org_slug: 'a8c',
       project_slug: 'simplenote-ios',
       dsym_path: lane_context[SharedValues::DSYM_OUTPUT_PATH]
@@ -598,7 +601,7 @@ end
   # On the other hand, right now Simplenote only needs one locale, so we might
   # as well keep using this on CI too. We still benefit from not having to
   # rebuild the app just to take the screenshots in light vs dark mode.
-  desc "Walk through the app taking screenshots."
+  desc 'Walk through the app taking screenshots.'
   lane :take_screenshots do |options|
     build_app_for_screenshots(options)
 
@@ -612,22 +615,22 @@ end
     )
   end
 
-  desc "Build the binaries to run to take the screenshots"
+  desc 'Build the binaries to run to take the screenshots'
   lane :build_app_for_screenshots do
     scan(
       workspace: workspace_path,
       scheme: screenshots_scheme,
       build_for_testing: true,
-      derived_data_path: derived_data_directory,
+      derived_data_path: derived_data_directory
     )
   end
 
-  desc "Runs through the app taking screenshots, using a prebuilt binary"
+  desc 'Runs through the app taking screenshots, using a prebuilt binary'
   lane :take_screenshots_from_app do |options|
-    devices = (options[:devices] || screenshot_devices).split(',').flatten()
+    devices = (options[:devices] || screenshot_devices).split(',').flatten
 
     languages = [
-      "en-US"
+      'en-US'
     ]
 
     # Erase the Simulators between runs in order to get everything back to a
@@ -673,22 +676,22 @@ end
       concurrent_simulators: false,
 
       # Allow the caller to invoke dark mode
-      dark_mode: options[:mode].to_s.downcase == "dark"
+      dark_mode: options[:mode].to_s.downcase == 'dark'
     )
   end
 
   lane :create_promo_screenshots do |options|
-    unless Fastlane::Helper::GitHelper.has_git_lfs then
-      UI.user_error!("Git LFS not enabled – Unable to generate promo screenshots. Run `git lfs install && git lfs fetch && git lfs pull` to fix this.")
+    unless Fastlane::Helper::GitHelper.has_git_lfs
+      UI.user_error!('Git LFS not enabled – Unable to generate promo screenshots. Run `git lfs install && git lfs fetch && git lfs pull` to fix this.')
     end
 
     # This value is defined in style.css. It would be good if there was a way
     # to make it parametric, so that if we update the CSS we don't risk this
     # getting out of sync.
-    font_name = "SourceSansPro-Regular.ttf"
-    user_font_directory = File.join(Dir.home, "Library/Fonts")
+    font_name = 'SourceSansPro-Regular.ttf'
+    user_font_directory = File.join(Dir.home, 'Library/Fonts')
     user_font_path = File.join(user_font_directory, font_name)
-    if File.exists?(user_font_path)
+    if File.exist?(user_font_path)
       UI.success("Custom font #{font_name} already installed locally.")
     else
       UI.message("Installing #{font_name} at #{user_font_path}.")
@@ -698,13 +701,13 @@ end
 
     promo_screenshots(
       orig_folder: options[:source] || screenshots_directory,
-      metadata_folder: File.join(Dir.pwd, "metadata"),
+      metadata_folder: File.join(Dir.pwd, 'metadata'),
       output_folder: promo_screenshots_directory,
       force: options[:force] || true
     )
   end
 
-  desc "Rebuild Screenshot Devices"
+  desc 'Rebuild Screenshot Devices'
   lane :rebuild_screenshot_devices do |options|
     require 'simctl'
 
@@ -714,18 +717,19 @@ end
     device_names = (options[:devices] || screenshot_devices).split(',').flatten
     sim_version = options[:simulator_version] || simulator_version
 
-    SimCtl.list_devices.each { |device|
+    SimCtl.list_devices.each do |device|
       next unless device_names.include? device.name
+
       UI.message("Deleting #{device.name} because it already exists.")
       device.delete
-    }
+    end
 
-    device_names.each { |device|
+    device_names.each do |device|
       runtime = SimCtl.runtime(name: "iOS #{sim_version}")
       devicetype = SimCtl.devicetype(name: device)
 
       SimCtl.create_device device, devicetype, runtime
-    }
+    end
   end
 
   #####################################################################################
@@ -747,12 +751,12 @@ end
   # Example:
   # bundle exec fastlane test device:"iPhone 14"
   #####################################################################################
-  desc "Run Unit Tests"
-  lane :run_unit_tests do | options |
+  desc 'Run Unit Tests'
+  lane :run_unit_tests do |options|
     scan(
       workspace: workspace_name,
       scheme: 'Simplenote',
-      device: options[:device] || "iPhone 14",
+      device: options[:device] || 'iPhone 14',
       output_directory: OUTPUT_DIRECTORY_PATH,
       reset_simulator: true,
       result_bundle: true
@@ -771,12 +775,12 @@ end
   # Example:
   # bundle exec fastlane run_ui_tests scheme:"SimplenoteUITests_Subset" device:"iPhone 14" test_account:"test.account@test.com"
   #####################################################################################
-  desc "Run UI tests"
-  lane :run_ui_tests do | options |
+  desc 'Run UI tests'
+  lane :run_ui_tests do |options|
     scan(
       workspace: workspace_name,
-      scheme: options[:scheme] || "SimplenoteUITests_Subset",
-      device: options[:device] || "iPhone 14",
+      scheme: options[:scheme] || 'SimplenoteUITests_Subset',
+      device: options[:device] || 'iPhone 14',
       output_directory: OUTPUT_DIRECTORY_PATH,
       reset_simulator: true,
       xcargs: { UI_TEST_ACCOUNT: options[:test_account] || '' },
@@ -796,15 +800,15 @@ end
   # Example:
   # bundle exec fastlane pick_test_account_and_run_ui_tests device:"iPhone 14"
   #####################################################################################
-  desc "Occupy a free test account and run UI tests with it"
-  lane :pick_test_account_and_run_ui_tests do | options |
+  desc 'Occupy a free test account and run UI tests with it'
+  lane :pick_test_account_and_run_ui_tests do |options|
     if is_ci
       sanitize_test_accounts
       find_free_test_account
-      run_ui_tests(options.merge({ test_account: get_required_env("UI_TESTS_ACCOUNT_EMAIL").sub("X", $used_test_account_index.to_s)}))
+      run_ui_tests(options.merge({ test_account: get_required_env('UI_TESTS_ACCOUNT_EMAIL').sub('X', $used_test_account_index.to_s) }))
       deoccupy_test_account
     else
-      UI.user_error!("This lane should be run only from CI")
+      UI.user_error!('This lane should be run only from CI')
     end
   end
 end
@@ -812,112 +816,111 @@ end
 ########################################################################
 # Configure Lanes
 ########################################################################
-  #####################################################################################
-  # update_certs_and_profiles
-  # -----------------------------------------------------------------------------------
-  # This lane downloads all the required certs and profiles and,
-  # if not run on CI it creates the missing ones.
-  # -----------------------------------------------------------------------------------
-  # Usage:
-  # bundle exec fastlane update_certs_and_profiles
-  #
-  # Example:
-  # bundle exec fastlane update_certs_and_profiles
-  #####################################################################################
-  lane :update_certs_and_profiles do | options |
-    alpha_code_signing
-    internal_code_signing
-    appstore_code_signing
-  end
+#####################################################################################
+# update_certs_and_profiles
+# -----------------------------------------------------------------------------------
+# This lane downloads all the required certs and profiles and,
+# if not run on CI it creates the missing ones.
+# -----------------------------------------------------------------------------------
+# Usage:
+# bundle exec fastlane update_certs_and_profiles
+#
+# Example:
+# bundle exec fastlane update_certs_and_profiles
+#####################################################################################
+lane :update_certs_and_profiles do |_options|
+  alpha_code_signing
+  internal_code_signing
+  appstore_code_signing
+end
 
-  lane :upload_screenshots do |options|
-    # This uses the following env vars from the user env:
-    # DELIVER_USER
-    # DELIVER_APP_IDENTIFIER
-    # FASTLANE_PASSWORD
-    #
-    # and from the project env:
-    # FASTLANE_ITC_TEAM_ID
-    upload_to_app_store(
-      edit_live: false,
-      use_live_version: false,
-      screenshots_path: promo_screenshots_directory,
-      skip_binary_upload: true,
-      skip_metadata: true,
-      skip_app_version_update: true,
-
-      # Prechecks
-      run_precheck_before_submit: false,
-      precheck_include_in_app_purchases: false,
-
-      # Delete all the previous screenshots on ASC
-      overwrite_screenshots: true,
-      # Set this to true to skip the interactive confirmation of the
-      # screenshots that will be uploaded. Please, though, don't do it, unless
-      # you disable the overwrite option above. If we loose the screenshot that
-      # are on ASC, we might not be able to recover them, unless we checkout
-      # whichever version made them and generate them again.
-      force: false,
-      submit_for_review: false
-    )
-  end
+lane :upload_screenshots do |_options|
+  # This uses the following env vars from the user env:
+  # DELIVER_USER
+  # DELIVER_APP_IDENTIFIER
+  # FASTLANE_PASSWORD
+  #
+  # and from the project env:
+  # FASTLANE_ITC_TEAM_ID
+  upload_to_app_store(
+    edit_live: false,
+    use_live_version: false,
+    screenshots_path: promo_screenshots_directory,
+    skip_binary_upload: true,
+    skip_metadata: true,
+    skip_app_version_update: true,
+
+    # Prechecks
+    run_precheck_before_submit: false,
+    precheck_include_in_app_purchases: false,
+
+    # Delete all the previous screenshots on ASC
+    overwrite_screenshots: true,
+    # Set this to true to skip the interactive confirmation of the
+    # screenshots that will be uploaded. Please, though, don't do it, unless
+    # you disable the overwrite option above. If we loose the screenshot that
+    # are on ASC, we might not be able to recover them, unless we checkout
+    # whichever version made them and generate them again.
+    force: false,
+    submit_for_review: false
+  )
+end
 
 ########################################################################
 # Fastlane match code signing
 ########################################################################
 
-  private_lane :alpha_code_signing do |options|
-    match(
-      type: "enterprise",
-      team_id: get_required_env("INT_EXPORT_TEAM_ID"),
-      readonly: options[:readonly] || is_ci,
-      app_identifier: simplenote_app_identifiers(root_bundle_id: "#{APP_STORE_BUNDLE_IDENTIFIER}.Alpha")
-    )
-  end
+private_lane :alpha_code_signing do |options|
+  match(
+    type: 'enterprise',
+    team_id: get_required_env('INT_EXPORT_TEAM_ID'),
+    readonly: options[:readonly] || is_ci,
+    app_identifier: simplenote_app_identifiers(root_bundle_id: "#{APP_STORE_BUNDLE_IDENTIFIER}.Alpha")
+  )
+end
 
-  private_lane :internal_code_signing do |options|
-    match(
-      type: "enterprise",
-      team_id: get_required_env("INT_EXPORT_TEAM_ID"),
-      readonly: options[:readonly] || is_ci,
-      app_identifier: simplenote_app_identifiers(root_bundle_id: "#{APP_STORE_BUNDLE_IDENTIFIER}.Internal")
-    )
-  end
+private_lane :internal_code_signing do |options|
+  match(
+    type: 'enterprise',
+    team_id: get_required_env('INT_EXPORT_TEAM_ID'),
+    readonly: options[:readonly] || is_ci,
+    app_identifier: simplenote_app_identifiers(root_bundle_id: "#{APP_STORE_BUNDLE_IDENTIFIER}.Internal")
+  )
+end
 
-  private_lane :appstore_code_signing do |options|
-    match(
-      type: "appstore",
-      team_id: get_required_env("EXT_EXPORT_TEAM_ID"),
-      readonly: options[:readonly] || is_ci,
-      app_identifier: simplenote_app_identifiers,
-      template_name: "NotationalFlow Keychain Access (Distribution)",
-    )
-  end
+private_lane :appstore_code_signing do |options|
+  match(
+    type: 'appstore',
+    team_id: get_required_env('EXT_EXPORT_TEAM_ID'),
+    readonly: options[:readonly] || is_ci,
+    app_identifier: simplenote_app_identifiers,
+    template_name: 'NotationalFlow Keychain Access (Distribution)'
+  )
+end
 
-  # Compiles the array of bundle identifiers for the different targets that
-  # make up the Simplenote app, to be used as the `app_identifier` parameter
-  # for the `match` action.
-  def simplenote_app_identifiers(root_bundle_id: APP_STORE_BUNDLE_IDENTIFIER)
-    extension_bundle_ids =
-      %w[Share Widgets Intents]
-      .map { |suffix| "#{root_bundle_id}.#{suffix}" }
+# Compiles the array of bundle identifiers for the different targets that
+# make up the Simplenote app, to be used as the `app_identifier` parameter
+# for the `match` action.
+def simplenote_app_identifiers(root_bundle_id: APP_STORE_BUNDLE_IDENTIFIER)
+  extension_bundle_ids =
+    %w[Share Widgets Intents]
+    .map { |suffix| "#{root_bundle_id}.#{suffix}" }
 
-    [root_bundle_id, *extension_bundle_ids]
-  end
+  [root_bundle_id, *extension_bundle_ids]
+end
 
-  # Compiles the dictionary mapping of the bundle identifiers and provisioning
-  # profiles to be used in the `export_options > provisioningProfiles`
-  # parameter for the `build_app`/`gym` action.
-  def simplenote_provisioning_profiles(root_bundle_id: APP_STORE_BUNDLE_IDENTIFIER, match_type: 'AppStore')
-    # FIXME: replace the array below with the following call once established
-    # the impact of adding the mapping for the Widgets extension, which is
-    # something we haven't had up to this point.
-    #
-    # simplenote_app_identifiers(root_bundle_id: root_bundle_id)
-    [root_bundle_id, "#{root_bundle_id}.Share", "#{root_bundle_id}.Intents"]
-      .map { |key| [key, "match #{match_type} #{key}"] }
-      .to_h
-  end
+# Compiles the dictionary mapping of the bundle identifiers and provisioning
+# profiles to be used in the `export_options > provisioningProfiles`
+# parameter for the `build_app`/`gym` action.
+def simplenote_provisioning_profiles(root_bundle_id: APP_STORE_BUNDLE_IDENTIFIER, match_type: 'AppStore')
+  # FIXME: replace the array below with the following call once established
+  # the impact of adding the mapping for the Widgets extension, which is
+  # something we haven't had up to this point.
+  #
+  # simplenote_app_identifiers(root_bundle_id: root_bundle_id)
+  [root_bundle_id, "#{root_bundle_id}.Share", "#{root_bundle_id}.Intents"]
+    .to_h { |key| [key, "match #{match_type} #{key}"] }
+end
 
 ########################################################################
 # Localization Lanes
@@ -930,7 +933,8 @@ lane :generate_strings_file_for_glotpress do
     paths: ['Simplenote/', 'SimplenoteIntents/', 'SimplenoteShare/',
             'SimplenoteWidgets/', 'Pods/Simperium/Simperium/',
             'Pods/Simperium/Simperium-iOS'],
-    output_dir: en_lproj_path)
+    output_dir: en_lproj_path
+  )
 
   git_commit(
     path: en_lproj_path,
@@ -958,40 +962,40 @@ def trigger_buildkite_release_build(branch:, beta:)
   )
 end
 
-def fastlane_directory()
-  File.expand_path File.dirname(__FILE__)
+def fastlane_directory
+  __dir__
 end
 
 def derived_data_directory
-  File.join(fastlane_directory, "DerivedData")
+  File.join(fastlane_directory, 'DerivedData')
 end
 
 def workspace_name
-  "Simplenote.xcworkspace"
+  'Simplenote.xcworkspace'
 end
 
 def screenshots_scheme
-  "SimplenoteScreenshots"
+  'SimplenoteScreenshots'
 end
 
 def workspace_path
   File.join(fastlane_directory, "../#{workspace_name}")
 end
 
-def screenshots_directory()
-  File.join(fastlane_directory, "screenshots")
+def screenshots_directory
+  File.join(fastlane_directory, 'screenshots')
 end
 
 def promo_screenshots_directory
-  File.join(fastlane_directory, "promo_screenshots")
+  File.join(fastlane_directory, 'promo_screenshots')
 end
 
-def screenshot_devices()
+def screenshot_devices
   [
-    "iPhone X",
-    "iPhone 8",
-    "iPad Pro (12.9-inch) (2nd generation)",
-    "iPad Pro (12.9-inch) (3rd generation)",
+    'iPhone X',
+    'iPhone 8',
+    'iPad Pro (12.9-inch) (2nd generation)',
+    'iPad Pro (12.9-inch) (3rd generation)'
   ]
 end
 
@@ -1000,9 +1004,10 @@ def simulator_version
 end
 
 def deoccupy_test_account
-  return if $used_test_account_index == nil
+  return if $used_test_account_index.nil?
+
   UI.message("Freeing used test account #{$used_test_account_index}")
-  change_test_account_availability("free")
+  change_test_account_availability('free')
   $used_test_account_index = nil
 end
 
@@ -1013,7 +1018,7 @@ end
 #   get_test_accounts_hash
 #     => {"0"=>"4079", "1"=>"free", "2"=>"free", "3"=>"free"}
 def get_test_accounts_hash
-  uri = URI.parse(get_required_env("UI_TESTS_ACCOUNTS_JSON_URL"))
+  uri = URI.parse(get_required_env('UI_TESTS_ACCOUNTS_JSON_URL'))
   response = Net::HTTP.get_response(uri)
   accounts_state = response.body.chomp
   JSON.parse(accounts_state)
@@ -1023,14 +1028,14 @@ end
 # Crashed fastlane if free account was not found.
 def find_free_test_account
   accounts_hash = get_test_accounts_hash
-  UI.message("Looking for a free test account...")
+  UI.message('Looking for a free test account...')
   UI.message("Accounts state: #{accounts_hash}")
 
   $used_test_account_index = accounts_hash.key('free')
 
-  UI.user_error!("Could not find free UI Test account. Quitting.") if $used_test_account_index.nil?
+  UI.user_error!('Could not find free UI Test account. Quitting.') if $used_test_account_index.nil?
   UI.message("Free account index: #{$used_test_account_index}")
-  change_test_account_availability("#{get_required_env("BUILDKITE_BUILD_NUMBER")}")
+  change_test_account_availability(get_required_env('BUILDKITE_BUILD_NUMBER').to_s)
 end
 
 # Replace a value in a key which is equal to $used_test_account_index global variable
@@ -1048,39 +1053,38 @@ end
 
 def sanitize_test_accounts
   accounts_hash = get_test_accounts_hash
-  UI.message("Sanitizing stale test accounts...")
+  UI.message('Sanitizing stale test accounts...')
   UI.message("Accounts before sanitizing: #{accounts_hash}")
 
   accounts_hash.each do |key, value|
-    next if value == "free" || is_job_running(value)
-    accounts_hash[key] = "free"
+    next if value == 'free' || is_job_running(value)
+
+    accounts_hash[key] = 'free'
     submit_accounts_hash(accounts_hash)
   end
 end
 
 def is_job_running(job_number)
-  begin
-    client = Buildkit.new(token: get_required_env('BUILDKITE_TOKEN'))
-    build = client.build('automattic', 'simplenote-ios', job_number)
+  client = Buildkit.new(token: get_required_env('BUILDKITE_TOKEN'))
+  build = client.build('automattic', 'simplenote-ios', job_number)
 
-    state = build['state']
+  state = build['state']
 
-    UI.message("Status of Job Number #{job_number} is #{state}")
+  UI.message("Status of Job Number #{job_number} is #{state}")
 
-    build['state'] == 'running'
-  rescue
-    false
-  end
+  build['state'] == 'running'
+rescue StandardError
+  false
 end
 
 def submit_accounts_hash(accounts_hash)
   UI.message("Writing new accounts state: #{accounts_hash}")
-  uri = URI.parse(get_required_env("UI_TESTS_ACCOUNTS_JSON_URL"))
+  uri = URI.parse(get_required_env('UI_TESTS_ACCOUNTS_JSON_URL'))
   request = Net::HTTP::Post.new(uri)
   request.body = accounts_hash.to_json
 
   req_options = {
-    use_ssl: uri.scheme == "https",
+    use_ssl: uri.scheme == 'https'
   }
 
   response = Net::HTTP.start(uri.hostname, uri.port, req_options) do |http|
@@ -1114,4 +1118,3 @@ def generate_installable_build_number
     "#{branch}-#{commit}"
   end
 end
-

From 39a67046e4f31e194d3e49d2bd75268ecf12f15f Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer@transier.us>
Date: Fri, 18 Nov 2022 12:03:10 -0700
Subject: [PATCH 004/547] Update Podfile.lock

---
 Podfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Podfile.lock b/Podfile.lock
index 87d192485..cdc28e38d 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -65,6 +65,6 @@ SPEC CHECKSUMS:
   WordPress-Ratings-iOS: 9f83dbba6e728c5121b1fd21b5683cf2fd120646
   ZIPFoundation: 063163dc828bf699c5be160eb4f58f676322d94f
 
-PODFILE CHECKSUM: 9cc274c6be26f2c5d638648574ddf65553445e98
+PODFILE CHECKSUM: 8d8834b02ffb09014570072f31b06679ab03843c
 
 COCOAPODS: 1.11.3

From 38fceee8467d7629c48025acc7ece1c9955a77c1 Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Tue, 6 Feb 2024 22:27:45 -0800
Subject: [PATCH 005/547] Fix Rubocop violations

---
 Scripts/extract_release_notes.rb | 31 ++++++++++++++++---------------
 Scripts/update-translations.rb   | 28 ++++++++++++++--------------
 2 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/Scripts/extract_release_notes.rb b/Scripts/extract_release_notes.rb
index c2e5649cf..bd3e2b040 100644
--- a/Scripts/extract_release_notes.rb
+++ b/Scripts/extract_release_notes.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Parses the release notes file to extract the current version information and
 # puts it to STDOUT.
 #
@@ -56,31 +58,30 @@ def replace_pr_number_with_markdown_link(string)
 # sequence. This accounts for the edge case in which more new lines make it
 # into the release notes file than expected.
 index = 0
-until lines[index].start_with? '-----'
-  index += 1
-end
+index += 1 until lines[index].start_with? '-----'
 
-lines[(index+1)...].each do |line|
+lines[(index + 1)...].each do |line|
   break if line.strip == ''
+
   release_lines.push line
 end
 
-formatted_lines = release_lines.
-    map { |l| l.gsub(/-   /, '- ') }
+formatted_lines = release_lines
+                  .map { |l| l.gsub(/-   /, '- ') }
 
 case mode
 when :strip_pr_links
-  formatted_lines = formatted_lines.
-    map { |l| l.gsub(/ \#\d*$/, '') }
+  formatted_lines = formatted_lines
+                    .map { |l| l.gsub(/ \#\d*$/, '') }
 when :keep_pr_links
   formatted_lines = formatted_lines.
-    # The PR "links" are not actually links, but PR "ids". On GitHub, they'll
-    # be automatically parsed into links to the corresponding PR, but outside
-    # GitHub, such as in our internal posts or on App Center, they won't.
-    #
-    # It's probably best to update the convention in writing the release notes
-    # but in the meantime let's compensate with more automation.
-    map { |l| replace_pr_number_with_markdown_link(l) }
+                    # The PR "links" are not actually links, but PR "ids". On GitHub, they'll
+                    # be automatically parsed into links to the corresponding PR, but outside
+                    # GitHub, such as in our internal posts or on App Center, they won't.
+                    #
+                    # It's probably best to update the convention in writing the release notes
+                    # but in the meantime let's compensate with more automation.
+                    map { |l| replace_pr_number_with_markdown_link(l) }
 end
 
 # It would be good to either add overriding of the file where the parsed
diff --git a/Scripts/update-translations.rb b/Scripts/update-translations.rb
index 8576e863f..b146020de 100755
--- a/Scripts/update-translations.rb
+++ b/Scripts/update-translations.rb
@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
+# frozen_string_literal: true
 
 # Supported languages:
-# ar,cy,zh-Hans,zh-Hant,nl,fa,fr,de,el,he,id,ko,pt,ru,es,sv,tr,ja,it 
+# ar,cy,zh-Hans,zh-Hant,nl,fa,fr,de,el,he,id,ko,pt,ru,es,sv,tr,ja,it
 # * Arabic
 # * Welsh
 # * Chinese (China) [zh-Hans]
@@ -25,11 +25,11 @@
 require 'json'
 
 if Dir.pwd =~ /Scripts/
-  puts "Must run script from root folder"
+  puts 'Must run script from root folder'
   exit
 end
 
-ALL_LANGS={
+ALL_LANGS = {
   'ar' => 'ar',         # Arabic
   'cy' => 'cy',         # Welsh
   'de' => 'de',         # German
@@ -48,34 +48,34 @@
   'sv' => 'sv',         # Swedish
   'tr' => 'tr',         # Turkish
   'zh-cn' => 'zh-Hans-CN', # Chinese (China)
-  'zh-tw' => 'zh-Hant-TW', # Chinese (Taiwan)
-}
+  'zh-tw' => 'zh-Hant-TW' # Chinese (Taiwan)
+}.freeze
 
 def copy_header(target_file, trans_strings)
   trans_strings.each_line do |line|
     if (!line.start_with?("/*"))
       target_file.write("\n")
       return
-    end 
+    end
 
     target_file.write(line)
   end
 end
 
 def copy_comment(f, trans_strings, value)
-  prev_line=""
+  prev_line = ''
   trans_strings.each_line do |line|
     if line.include?(value)
       f.write(prev_line)
-      return 
+      return
     end
-    prev_line=line
+    prev_line = line
   end
 end
 
 langs = {}
-if ARGV.count > 0
-  for key in ARGV
+if ARGV.count.positive?
+  ARGV.each do |key|
     unless local = ALL_LANGS[key]
       puts "Unknown language #{key}"
       exit 1
@@ -86,11 +86,11 @@ def copy_comment(f, trans_strings, value)
   langs = ALL_LANGS
 end
 
-langs.each do |code,local|
+langs.each do |code, local|
   lang_dir = File.join('Simplenote', "#{local}.lproj")
   puts "Updating #{code}"
   system "mkdir -p #{lang_dir}"
-  
+
   # Backup the current file
   system "if [ -e #{lang_dir}/Localizable.strings ]; then cp #{lang_dir}/Localizable.strings #{lang_dir}/Localizable.strings.bak; fi"
 

From 5aff4a27418ae6380ede0b749a7dbe9851056815 Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Tue, 6 Feb 2024 22:29:19 -0800
Subject: [PATCH 006/547] Updated Rubocop from `1.38.0` to `1.60.2`

---
 Gemfile.lock | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c8611365f..b3ea524ef 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -242,8 +242,9 @@ GEM
       concurrent-ruby (~> 1.0)
     java-properties (0.3.0)
     jmespath (1.6.2)
-    json (2.6.3)
+    json (2.7.1)
     jwt (2.7.1)
+    language_server-protocol (3.17.0.3)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     minitest (5.20.0)
@@ -263,9 +264,10 @@ GEM
     options (2.3.2)
     optparse (0.1.1)
     os (1.1.4)
-    parallel (1.23.0)
-    parser (3.1.2.1)
+    parallel (1.24.0)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
+      racc
     plist (3.7.0)
     progress_bar (1.3.3)
       highline (>= 1.6, < 3)
@@ -277,7 +279,7 @@ GEM
     rake-compiler (1.2.5)
       rake
     rchardet (1.8.0)
-    regexp_parser (2.6.0)
+    regexp_parser (2.9.0)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -286,20 +288,21 @@ GEM
     rexml (3.2.6)
     rmagick (3.2.0)
     rouge (2.0.7)
-    rubocop (1.38.0)
+    rubocop (1.60.2)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.23.0, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.23.0)
-      parser (>= 3.1.1.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
     ruby-macho (2.5.1)
-    ruby-progressbar (1.11.0)
+    ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     sawyer (0.9.2)

From c1527fd95493e2dabb404856cf4557d035f24e21 Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Tue, 6 Feb 2024 22:30:01 -0800
Subject: [PATCH 007/547] Fix Rubocop violations

---
 Rakefile                         | 2 +-
 Scripts/extract_release_notes.rb | 2 +-
 Scripts/update-translations.rb   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Rakefile b/Rakefile
index 58c2655be..a0fda4754 100644
--- a/Rakefile
+++ b/Rakefile
@@ -252,7 +252,7 @@ end
 
 def podfile_locked?
   podfile_checksum = Digest::SHA1.file('Podfile')
-  lockfile_checksum = YAML.safe_load(File.read('Podfile.lock'))['PODFILE CHECKSUM']
+  lockfile_checksum = YAML.safe_load_file('Podfile.lock')['PODFILE CHECKSUM']
 
   podfile_checksum == lockfile_checksum
 end
diff --git a/Scripts/extract_release_notes.rb b/Scripts/extract_release_notes.rb
index bd3e2b040..2cfd40ae5 100644
--- a/Scripts/extract_release_notes.rb
+++ b/Scripts/extract_release_notes.rb
@@ -67,7 +67,7 @@ def replace_pr_number_with_markdown_link(string)
 end
 
 formatted_lines = release_lines
-                  .map { |l| l.gsub(/-   /, '- ') }
+                  .map { |l| l.gsub('-   ', '- ') }
 
 case mode
 when :strip_pr_links
diff --git a/Scripts/update-translations.rb b/Scripts/update-translations.rb
index b146020de..2a3b11a30 100755
--- a/Scripts/update-translations.rb
+++ b/Scripts/update-translations.rb
@@ -53,7 +53,7 @@
 
 def copy_header(target_file, trans_strings)
   trans_strings.each_line do |line|
-    if (!line.start_with?("/*"))
+    unless line.start_with?('/*')
       target_file.write("\n")
       return
     end
@@ -76,7 +76,7 @@ def copy_comment(f, trans_strings, value)
 langs = {}
 if ARGV.count.positive?
   ARGV.each do |key|
-    unless local = ALL_LANGS[key]
+    unless (local = ALL_LANGS[key])
       puts "Unknown language #{key}"
       exit 1
     end

From a15e5d22d216e41b22583777cdb3e5ce79235de1 Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Tue, 6 Feb 2024 22:43:48 -0800
Subject: [PATCH 008/547] Update method indentation

---
 fastlane/Fastfile | 100 ++++++++++++++++++++++++++++++++++------------
 1 file changed, 75 insertions(+), 25 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 35ae7035a..a8aa0c71b 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -93,6 +93,7 @@ def get_required_env(key)
   unless ENV.key?(key)
     UI.user_error!("Environment variable '#{key}' is not set. Have you setup #{USER_ENV_FILE_PATH} correctly?")
   end
+end
 
   ########################################################################
   # Release Lanes
@@ -116,12 +117,20 @@ def get_required_env(key)
     ios_bump_version_release
     new_version = ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
 
-    extract_release_notes_for_version(version: new_version,
-                                      release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'RELEASE-NOTES.txt'),
-                                      extracted_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt'))
+    extract_release_notes_for_version(
+      version: new_version,
+      release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'RELEASE-NOTES.txt'),
+      extracted_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt')
+    )
     ios_update_release_notes(new_version: new_version)
-    setbranchprotection(repository: GHHELPER_REPO, branch: "release/#{new_version}")
-    setfrozentag(repository: GHHELPER_REPO, milestone: new_version)
+    setbranchprotection(
+      repository: GHHELPER_REPO,
+      branch: "release/#{new_version}"
+    )
+    setfrozentag(
+      repository: GHHELPER_REPO,
+      milestone: new_version
+    )
 
     generate_strings_file_for_glotpress
     trigger_beta_build(branch_to_build: "release/#{new_version}")
@@ -212,7 +221,10 @@ def get_required_env(key)
   lane :new_beta_release do |options|
     ios_betabuild_prechecks(options)
     download_localized_strings_and_metadata_from_glotpress
-    ios_lint_localizations(input_dir: 'Simplenote', allow_retry: true)
+    ios_lint_localizations(
+      input_dir: 'Simplenote',
+      allow_retry: true
+    )
     ios_bump_version_beta
     version = ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
     trigger_beta_build(branch_to_build: "release/#{version}")
@@ -233,7 +245,10 @@ def get_required_env(key)
   desc 'Creates a new hotfix branch for the given version:x.y.z. The branch will be cut from the tag x.y of the previous release'
   lane :new_hotfix_release do |options|
     prev_ver = ios_hotfix_prechecks(options)
-    ios_bump_version_hotfix(previous_version: prev_ver, version: options[:version])
+    ios_bump_version_hotfix(
+      previous_version: prev_ver,
+      version: options[:version]
+    )
   end
 
   #####################################################################################
@@ -292,16 +307,29 @@ def get_required_env(key)
       locales: GLOTPRESS_TO_LPROJ_APP_LOCALE_CODES,
       download_dir: File.join(PROJECT_ROOT_FOLDER, 'Simplenote')
     )
-    sanitize_appstore_keywords()
-    ios_lint_localizations(input_dir: 'Simplenote', allow_retry: true)
+    sanitize_appstore_keywords
+    ios_lint_localizations(
+      input_dir: 'Simplenote',
+      allow_retry: true
+    )
     ios_bump_version_beta
 
     # Wrap up
     version = ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
-    removebranchprotection(repository:GHHELPER_REPO, branch: "release/#{version}")
-    setfrozentag(repository:GHHELPER_REPO, milestone: version, freeze: false)
-    create_new_milestone(repository:GHHELPER_REPO)
-    close_milestone(repository:GHHELPER_REPO, milestone: version)
+    removebranchprotection(
+      repository: GHHELPER_REPO,
+      branch: "release/#{version}"
+    )
+    setfrozentag(
+      repository: GHHELPER_REPO,
+      milestone: version,
+      freeze: false
+    )
+    create_new_milestone(repository: GHHELPER_REPO)
+    close_milestone(
+      repository: GHHELPER_REPO,
+      milestone: version
+    )
 
     # Start the build
     trigger_release_build(branch_to_build: "release/#{version}")
@@ -371,15 +399,24 @@ def get_required_env(key)
   #####################################################################################
   desc 'Builds and uploads for distribution'
   lane :build_and_upload_release do |options|
-    ios_build_prechecks(skip_confirm: options[:skip_confirm],
-                        internal: false,
-                        internal_on_single_version: options[:beta_release],
-                        external: true)
+    ios_build_prechecks(
+      skip_confirm: options[:skip_confirm],
+      internal: false,
+      internal_on_single_version: options[:beta_release],
+      external: true
+    )
 
     ios_build_preflight
-    build_and_upload_internal(skip_prechecks: true, skip_confirm: options[:skip_confirm]) if options[:beta_release]
-    build_and_upload_to_app_store_connect(skip_prechecks: true, skip_confirm: options[:skip_confirm],
-                                          beta_release: options[:beta_release], create_release: options[:create_gh_release])
+    build_and_upload_internal(
+      skip_prechecks: true,
+      skip_confirm: options[:skip_confirm]
+    ) if options[:beta_release]
+    build_and_upload_to_app_store_connect(
+      skip_prechecks: true,
+      skip_confirm: options[:skip_confirm],
+      beta_release: options[:beta_release],
+      create_release: options[:create_gh_release]
+    )
   end
 
   #####################################################################################
@@ -396,7 +433,10 @@ def get_required_env(key)
   #####################################################################################
   desc 'Builds and updates for distribution'
   lane :build_and_upload_internal do |options|
-    ios_build_prechecks(skip_confirm: options[:skip_confirm], internal: false) unless options[:skip_prechecks]
+    ios_build_prechecks(
+      skip_confirm: options[:skip_confirm],
+      internal: false
+    ) unless options[:skip_prechecks]
     ios_build_preflight unless options[:skip_prechecks]
 
     internal_code_signing
@@ -451,7 +491,10 @@ def get_required_env(key)
   #####################################################################################
   desc 'Builds and uploads for distribution'
   lane :build_and_upload_to_app_store_connect do |options|
-    ios_build_prechecks(skip_confirm: options[:skip_confirm], external: true) unless options[:skip_prechecks]
+    ios_build_prechecks(
+      skip_confirm: options[:skip_confirm],
+      external: true
+    ) unless options[:skip_prechecks]
     ios_build_preflight unless options[:skip_prechecks]
 
     appstore_code_signing
@@ -490,7 +533,8 @@ def get_required_env(key)
       zip(path: lane_context[SharedValues::XCODEBUILD_ARCHIVE], output_path: archive_zip_path)
 
       version = options[:beta_release] ? ios_get_build_version : ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
-      create_release(repository:GHHELPER_REPO,
+      create_release(
+        repository: GHHELPER_REPO,
         version: version,
         release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt'),
         release_assets: archive_zip_path.to_s,
@@ -538,7 +582,10 @@ def get_required_env(key)
   #
   #####################################################################################
   lane :trigger_beta_build do |options|
-    trigger_buildkite_release_build(branch: options[:branch_to_build], beta: true)
+    trigger_buildkite_release_build(
+      branch: options[:branch_to_build],
+      beta: true
+    )
   end
 
   #####################################################################################
@@ -553,7 +600,10 @@ def get_required_env(key)
   #
   #####################################################################################
   lane :trigger_release_build do |options|
-    trigger_buildkite_release_build(branch: options[:branch_to_build], beta: false)
+    trigger_buildkite_release_build(
+      branch: options[:branch_to_build],
+      beta: false
+    )
   end
 
   #####################################################################################

From 6bde715607693c183e325d091a005d06043691f6 Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Tue, 6 Feb 2024 22:46:27 -0800
Subject: [PATCH 009/547] Replace `GHHELPER_REPO` with `GITHUB_TOKEN`

---
 fastlane/Fastfile | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index a8aa0c71b..0c0fc06fd 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -49,9 +49,11 @@ platform :ios do
   VERSION_FILE_PATH = File.join(PROJECT_ROOT_FOLDER, 'config', 'Version.Public.xcconfig')
   OUTPUT_DIRECTORY_PATH = File.join(PROJECT_ROOT_FOLDER, 'build', 'results')
 
+  GITHUB_TOKEN = 'Automattic/simplenote-ios'
+
   Dotenv.load(USER_ENV_FILE_PATH)
   Dotenv.load(PROJECT_ENV_FILE_PATH)
-  ENV.fetch(GHHELPER_REPO = 'Automattic/simplenote-ios', nil)
+
   ENV['PROJECT_NAME'] = 'Simplenote'
   ENV['PROJECT_ROOT_FOLDER'] = PROJECT_ROOT_FOLDER
   ENV['APP_STORE_STRINGS_FILE_NAME'] = 'AppStoreStrings.pot'
@@ -124,11 +126,11 @@ end
     )
     ios_update_release_notes(new_version: new_version)
     setbranchprotection(
-      repository: GHHELPER_REPO,
+      repository: GITHUB_TOKEN,
       branch: "release/#{new_version}"
     )
     setfrozentag(
-      repository: GHHELPER_REPO,
+      repository: GITHUB_TOKEN,
       milestone: new_version
     )
 
@@ -317,17 +319,17 @@ end
     # Wrap up
     version = ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
     removebranchprotection(
-      repository: GHHELPER_REPO,
+      repository: GITHUB_TOKEN,
       branch: "release/#{version}"
     )
     setfrozentag(
-      repository: GHHELPER_REPO,
+      repository: GITHUB_TOKEN,
       milestone: version,
       freeze: false
     )
-    create_new_milestone(repository: GHHELPER_REPO)
+    create_new_milestone(repository: GITHUB_TOKEN)
     close_milestone(
-      repository: GHHELPER_REPO,
+      repository: GITHUB_TOKEN,
       milestone: version
     )
 
@@ -534,7 +536,7 @@ end
 
       version = options[:beta_release] ? ios_get_build_version : ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
       create_release(
-        repository: GHHELPER_REPO,
+        repository: GITHUB_TOKEN,
         version: version,
         release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt'),
         release_assets: archive_zip_path.to_s,

From 260c2d47ff6f0513fb429e4e15ebec5d6dc2667f Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Tue, 6 Feb 2024 22:53:20 -0800
Subject: [PATCH 010/547] Update `rubocop.yml` to current standards

---
 .rubocop.yml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index ee10b62d1..fdb0d8582 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -7,19 +7,17 @@ AllCops:
   SuggestExtensions:
     rubocop-rake: false
 
+Metrics/MethodLength:
+  Max: 30
+
 Layout/LineLength:
-  Exclude:
-    - fastlane/Fastfile
+  Max: 180
 
 Metrics/BlockLength:
   Exclude:
     - fastlane/*file
+    - Podfile
+    - Rakefile
 
-Metrics/BlockNesting:
-  Exclude:
-    - fastlane/*file
-
-Naming/FileName:
-  Exclude:
-    - fastlane/*file
-    - '**/*.podspec'
+Style/HashSyntax:
+  EnforcedShorthandSyntax: never

From 9b003751ff32cd38b0c80c27c1a85ffe2256310a Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Tue, 6 Feb 2024 23:00:46 -0800
Subject: [PATCH 011/547] Move constants and fix `GITHUB_TOKEN/REPO` error

---
 fastlane/Fastfile | 56 +++++++++++++++++++++++------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 0c0fc06fd..88d33d5db 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -41,27 +41,12 @@ error do |lane, _exception, _options|
   deoccupy_test_account if lane == :run_ui_tests
 end
 
-platform :ios do
-  ########################################################################
-  # Environment
-  ########################################################################
-  PROJECT_ROOT_FOLDER = File.dirname(File.expand_path(__dir__))
-  VERSION_FILE_PATH = File.join(PROJECT_ROOT_FOLDER, 'config', 'Version.Public.xcconfig')
-  OUTPUT_DIRECTORY_PATH = File.join(PROJECT_ROOT_FOLDER, 'build', 'results')
-
-  GITHUB_TOKEN = 'Automattic/simplenote-ios'
-
-  Dotenv.load(USER_ENV_FILE_PATH)
-  Dotenv.load(PROJECT_ENV_FILE_PATH)
-
-  ENV['PROJECT_NAME'] = 'Simplenote'
-  ENV['PROJECT_ROOT_FOLDER'] = PROJECT_ROOT_FOLDER
-  ENV['APP_STORE_STRINGS_FILE_NAME'] = 'AppStoreStrings.pot'
-  ENV['PUBLIC_CONFIG_FILE'] = VERSION_FILE_PATH
-  ENV['DOWNLOAD_METADATA'] = './fastlane/download_metadata.swift'
-  ENV['FL_RELEASE_TOOLKIT_DEFAULT_BRANCH'] = 'trunk'
-  REPOSITORY_NAME = 'simplenote-ios'
-  APP_STORE_BUNDLE_IDENTIFIER = 'com.codality.NotationalFlow'
+# Constants
+PROJECT_ROOT_FOLDER = File.dirname(File.expand_path(__dir__))
+VERSION_FILE_PATH = File.join(PROJECT_ROOT_FOLDER, 'config', 'Version.Public.xcconfig')
+OUTPUT_DIRECTORY_PATH = File.join(PROJECT_ROOT_FOLDER, 'build', 'results')
+GITHUB_REPO = 'Automattic/simplenote-ios'
+APP_STORE_BUNDLE_IDENTIFIER = 'com.codality.NotationalFlow'
 
 # List of locales used for the app strings (GlotPress code => `*.lproj` folder name`)
 #
@@ -89,6 +74,19 @@ GLOTPRESS_TO_LPROJ_APP_LOCALE_CODES = {
   'zh-tw' => 'zh-Hant-TW'   # Chinese (Taiwan)
 }.freeze
 
+########################################################################
+# Environment
+########################################################################
+Dotenv.load(USER_ENV_FILE_PATH)
+Dotenv.load(PROJECT_ENV_FILE_PATH)
+
+ENV['PROJECT_NAME'] = 'Simplenote'
+ENV['PROJECT_ROOT_FOLDER'] = PROJECT_ROOT_FOLDER
+ENV['APP_STORE_STRINGS_FILE_NAME'] = 'AppStoreStrings.pot'
+ENV['PUBLIC_CONFIG_FILE'] = VERSION_FILE_PATH
+ENV['DOWNLOAD_METADATA'] = './fastlane/download_metadata.swift'
+ENV['FL_RELEASE_TOOLKIT_DEFAULT_BRANCH'] = 'trunk'
+
 # Use this instead of getting values from ENV directly
 # It will throw an error if the requested value is missing
 def get_required_env(key)
@@ -97,6 +95,8 @@ def get_required_env(key)
   end
 end
 
+platform :ios do
+
   ########################################################################
   # Release Lanes
   ########################################################################
@@ -126,11 +126,11 @@ end
     )
     ios_update_release_notes(new_version: new_version)
     setbranchprotection(
-      repository: GITHUB_TOKEN,
+      repository: GITHUB_REPO,
       branch: "release/#{new_version}"
     )
     setfrozentag(
-      repository: GITHUB_TOKEN,
+      repository: GITHUB_REPO,
       milestone: new_version
     )
 
@@ -319,17 +319,17 @@ end
     # Wrap up
     version = ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
     removebranchprotection(
-      repository: GITHUB_TOKEN,
+      repository: GITHUB_REPO,
       branch: "release/#{version}"
     )
     setfrozentag(
-      repository: GITHUB_TOKEN,
+      repository: GITHUB_REPO,
       milestone: version,
       freeze: false
     )
-    create_new_milestone(repository: GITHUB_TOKEN)
+    create_new_milestone(repository: GITHUB_REPO)
     close_milestone(
-      repository: GITHUB_TOKEN,
+      repository: GITHUB_REPO,
       milestone: version
     )
 
@@ -536,7 +536,7 @@ end
 
       version = options[:beta_release] ? ios_get_build_version : ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
       create_release(
-        repository: GITHUB_TOKEN,
+        repository: GITHUB_REPO,
         version: version,
         release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt'),
         release_assets: archive_zip_path.to_s,

From 34bbf4cebf05496b07f0fdff1c1e4835ccfe188d Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Tue, 6 Feb 2024 23:04:42 -0800
Subject: [PATCH 012/547] Fix Rubocop violations

---
 fastlane/Fastfile | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 88d33d5db..a6f538660 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -96,7 +96,6 @@ def get_required_env(key)
 end
 
 platform :ios do
-
   ########################################################################
   # Release Lanes
   ########################################################################
@@ -519,16 +518,16 @@ platform :ios do
     )
 
     sh('rm ../Simplenote.ipa')
-    dSYM_PATH = "#{File.dirname(Dir.pwd)}/Simplenote.app.dSYM.zip"
+    dsym_path = "#{File.dirname(Dir.pwd)}/Simplenote.app.dSYM.zip"
 
     sentry_upload_dsym(
-      dsym_path: dSYM_PATH,
+      dsym_path: dsym_path,
       auth_token: ENV.fetch('SENTRY_AUTH_TOKEN', nil),
       org_slug: 'a8c',
       project_slug: 'simplenote-ios'
     )
 
-    sh("rm #{dSYM_PATH}")
+    sh("rm #{dsym_path}")
 
     if options[:create_release]
       archive_zip_path = "#{File.dirname(Dir.pwd)}/Simplenote.xarchive.zip"
@@ -678,7 +677,8 @@ platform :ios do
   #
   # @param [String] app_name The display name to use in the comment text to identify which app this Installable Build is about
   # @param [String] build_number The App Center's build number for this build
-  # @param [String] url_slug The last component of the `install.appcenter.ms` URL used to install the app. Typically a sluggified version of the app name in App Center (e.g. `WPiOS-One-Offs`)
+  # @param [String] url_slug The last component of the `install.appcenter.ms` URL used to install the app. Typically a sluggified version of the app name
+  #                          in App Center (e.g. `WPiOS-One-Offs`)
   #
   # @called_by CI — especially, relies on `BUILDKITE_PULL_REQUEST` being defined
   #
@@ -959,7 +959,8 @@ platform :ios do
 
     # If Fastlane cannot instantiate a user, it will ask the caller for the email.
     # Once we have it, we can set it as `FASTLANE_USER` in the environment (which has lifecycle limited to this call) so that the next commands will already have access to it.
-    # Note that if the user is already available to `AccountManager`, setting it in the environment is redundant, but Fastlane doesn't provide a way to check it so we have to do it anyway.
+    # Note that if the user is already available to `AccountManager`, setting it in the environment is redundant, but Fastlane
+    # doesn't provide a way to check it so we have to do it anyway.
     ENV['FASTLANE_USER'] = CredentialsManager::AccountManager.new.user
 
     # Add all development certificates to the provisioning profiles (just in case – this is an easy step to miss)
@@ -1189,14 +1190,14 @@ def sanitize_test_accounts
   UI.message("Accounts before sanitizing: #{accounts_hash}")
 
   accounts_hash.each do |key, value|
-    next if value == 'free' || is_job_running(value)
+    next if value == 'free' || job_running?(value)
 
     accounts_hash[key] = 'free'
     submit_accounts_hash(accounts_hash)
   end
 end
 
-def is_job_running(job_number)
+def job_running?(job_number)
   client = Buildkit.new(token: get_required_env('BUILDKITE_TOKEN'))
   build = client.build('automattic', 'simplenote-ios', job_number)
 

From 82c0a3aba949c823800a4d509e0c9f198d0425d4 Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Tue, 6 Feb 2024 23:09:25 -0800
Subject: [PATCH 013/547] Fix Rubocop violations

---
 Rakefile          |  4 +---
 fastlane/Fastfile | 55 +++++++++++++++++++++++------------------------
 2 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/Rakefile b/Rakefile
index a0fda4754..62c5ad1bf 100644
--- a/Rakefile
+++ b/Rakefile
@@ -286,9 +286,7 @@ def xcodebuild(*build_cmds)
   cmd += " -configuration #{xcode_configuration}"
   cmd += ' '
   cmd += build_cmds.map(&:to_s).join(' ')
-  unless ENV['verbose']
-    cmd += ' | bundle exec xcpretty -f `bundle exec xcpretty-travis-formatter` && exit ${PIPESTATUS[0]}'
-  end
+  cmd += ' | bundle exec xcpretty -f `bundle exec xcpretty-travis-formatter` && exit ${PIPESTATUS[0]}' unless ENV['verbose']
   sh(cmd)
 end
 
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index a6f538660..c7981c699 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -23,16 +23,14 @@ before_all do
   # Check that the env files exist
   unless is_ci || File.file?(USER_ENV_FILE_PATH)
     error_message = <<~ERROR
-    ~/.simplenoteios-env.default not found. Please copy env/user.env-example to #{USER_ENV_FILE_PATH} and fill in the values") using the following command:
+      ~/.simplenoteios-env.default not found. Please copy env/user.env-example to #{USER_ENV_FILE_PATH} and fill in the values") using the following command:
 
-    \tcp #{PROJECT_ROOT_FOLDER}/fastlane/env/user.env-example #{USER_ENV_FILE_PATH}
+      \tcp #{PROJECT_ROOT_FOLDER}/fastlane/env/user.env-example #{USER_ENV_FILE_PATH}
     ERROR
     UI.user_error!(error_message)
   end
 
-  unless File.file?(PROJECT_ENV_FILE_PATH)
-    UI.user_error!('project.env not found: Make sure your configuration is up to date with `rake dependencies`')
-  end
+  UI.user_error!('project.env not found: Make sure your configuration is up to date with `rake dependencies`') unless File.file?(PROJECT_ENV_FILE_PATH)
 
   setup_ci
 end
@@ -90,9 +88,8 @@ ENV['FL_RELEASE_TOOLKIT_DEFAULT_BRANCH'] = 'trunk'
 # Use this instead of getting values from ENV directly
 # It will throw an error if the requested value is missing
 def get_required_env(key)
-  unless ENV.key?(key)
-    UI.user_error!("Environment variable '#{key}' is not set. Have you setup #{USER_ENV_FILE_PATH} correctly?")
-  end
+  UI.user_error!("Environment variable '#{key}' is not set. Have you setup #{USER_ENV_FILE_PATH} correctly?") unless ENV.key?(key)
+  ENV.fetch(key)
 end
 
 platform :ios do
@@ -113,7 +110,7 @@ platform :ios do
   #####################################################################################
   desc 'Creates a new release branch from the current trunk'
   lane :code_freeze do |options|
-    old_version = ios_codefreeze_prechecks(options)
+    ios_codefreeze_prechecks(options)
 
     ios_bump_version_release
     new_version = ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
@@ -194,9 +191,7 @@ platform :ios do
       arabic_comma = '،'
       keywords = keywords.gsub(arabic_comma, english_comma) if File.basename(locale_dir) == 'ar-SA'
 
-      until keywords.length <= app_store_connect_keywords_length_limit
-        keywords = keywords.split(english_comma)[0...-1].join(english_comma)
-      end
+      keywords = keywords.split(english_comma)[0...-1].join(english_comma) until keywords.length <= app_store_connect_keywords_length_limit
 
       File.write(keywords_path, keywords)
     end
@@ -285,9 +280,7 @@ platform :ios do
   #####################################################################################
   desc 'Trigger the final release build on CI'
   lane :finalize_release do |options|
-    if ios_current_branch_is_hotfix
-      UI.user_error!('To finalize a hotfix, please use the finalize_hotfix_release lane instead')
-    end
+    UI.user_error!('To finalize a hotfix, please use the finalize_hotfix_release lane instead') if ios_current_branch_is_hotfix
 
     ios_finalize_prechecks(options)
 
@@ -408,10 +401,12 @@ platform :ios do
     )
 
     ios_build_preflight
-    build_and_upload_internal(
-      skip_prechecks: true,
-      skip_confirm: options[:skip_confirm]
-    ) if options[:beta_release]
+    if options[:beta_release]
+      build_and_upload_internal(
+        skip_prechecks: true,
+        skip_confirm: options[:skip_confirm]
+      )
+    end
     build_and_upload_to_app_store_connect(
       skip_prechecks: true,
       skip_confirm: options[:skip_confirm],
@@ -434,10 +429,12 @@ platform :ios do
   #####################################################################################
   desc 'Builds and updates for distribution'
   lane :build_and_upload_internal do |options|
-    ios_build_prechecks(
-      skip_confirm: options[:skip_confirm],
-      internal: false
-    ) unless options[:skip_prechecks]
+    unless options[:skip_prechecks]
+      ios_build_prechecks(
+        skip_confirm: options[:skip_confirm],
+        internal: false
+      )
+    end
     ios_build_preflight unless options[:skip_prechecks]
 
     internal_code_signing
@@ -492,10 +489,12 @@ platform :ios do
   #####################################################################################
   desc 'Builds and uploads for distribution'
   lane :build_and_upload_to_app_store_connect do |options|
-    ios_build_prechecks(
-      skip_confirm: options[:skip_confirm],
-      external: true
-    ) unless options[:skip_prechecks]
+    unless options[:skip_prechecks]
+      ios_build_prechecks(
+        skip_confirm: options[:skip_confirm],
+        external: true
+      )
+    end
     ios_build_preflight unless options[:skip_prechecks]
 
     appstore_code_signing
@@ -1220,7 +1219,7 @@ def submit_accounts_hash(accounts_hash)
     use_ssl: uri.scheme == 'https'
   }
 
-  response = Net::HTTP.start(uri.hostname, uri.port, req_options) do |http|
+  Net::HTTP.start(uri.hostname, uri.port, req_options) do |http|
     http.request(request)
   end
 

From 0ed00e9856a85c4d55b3045f7a510b8619015175 Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Tue, 6 Feb 2024 23:12:21 -0800
Subject: [PATCH 014/547] Use `get_required_env` for required tokens

---
 fastlane/Fastfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index c7981c699..4de77f5b1 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -459,7 +459,7 @@ platform :ios do
     File.rename(File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote.ipa'), File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote Internal.ipa'))
 
     appcenter_upload(
-      api_token: ENV.fetch('APPCENTER_API_TOKEN', nil),
+      api_token: get_required_env('APPCENTER_API_TOKEN'),
       owner_name: 'automattic',
       owner_type: 'organization',
       app_name: 'Simplenote',
@@ -468,7 +468,7 @@ platform :ios do
     )
 
     sentry_upload_dsym(
-      auth_token: ENV.fetch('SENTRY_AUTH_TOKEN', nil),
+      auth_token: get_required_env('SENTRY_API_TOKEN'),
       org_slug: 'a8c',
       project_slug: 'simplenote-ios',
       dsym_path: lane_context[SharedValues::DSYM_OUTPUT_PATH]
@@ -521,7 +521,7 @@ platform :ios do
 
     sentry_upload_dsym(
       dsym_path: dsym_path,
-      auth_token: ENV.fetch('SENTRY_AUTH_TOKEN', nil),
+      auth_token: get_required_env('SENTRY_AUTH_TOKEN'),
       org_slug: 'a8c',
       project_slug: 'simplenote-ios'
     )

From 28a387eec99ff40d148615589632921c689009d2 Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Tue, 6 Feb 2024 23:13:15 -0800
Subject: [PATCH 015/547] Update Podfile.lock

---
 Podfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Podfile.lock b/Podfile.lock
index e590a298d..e7d572490 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -47,6 +47,6 @@ SPEC CHECKSUMS:
   WordPress-Ratings-iOS: 9f83dbba6e728c5121b1fd21b5683cf2fd120646
   ZIPFoundation: 063163dc828bf699c5be160eb4f58f676322d94f
 
-PODFILE CHECKSUM: 0663a4b2a1777f0957be7a40d3b2f7bf92a7fb64
+PODFILE CHECKSUM: 0310d57af0efbf50954ff46d578bc70b455981c4
 
 COCOAPODS: 1.14.1

From 57711bfcb08741d7d9abf5dc2253dac1959abb17 Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Tue, 6 Feb 2024 23:24:47 -0800
Subject: [PATCH 016/547] Re-add `fold` method to `Rakefile`

---
 Rakefile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Rakefile b/Rakefile
index 62c5ad1bf..cfb63df35 100644
--- a/Rakefile
+++ b/Rakefile
@@ -241,6 +241,11 @@ task xcode: [:dependencies] do
   sh "open #{XCODE_WORKSPACE}"
 end
 
+def fold(label)
+  puts "--- #{label}" if ENV['BUILDKITE']
+  yield
+end
+
 def pod(args)
   args = %w[bundle exec pod] + args
   sh(*args)

From 132aac134a9bb33a14770f4de0f4f5573c0e3cd2 Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Tue, 6 Feb 2024 23:34:55 -0800
Subject: [PATCH 017/547] Fix Rubocop violation

---
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index cfb63df35..5e64fa6f5 100644
--- a/Rakefile
+++ b/Rakefile
@@ -318,7 +318,7 @@ def check_dependencies_hook
   ENV['DRY_RUN'] = '1'
   begin
     Rake::Task['dependencies'].invoke
-  rescue Exception => e
+  rescue StandardError => e
     puts e.message
     exit 1
   end

From 2119e165f9b2317ac1cd3dc1a28de187e98c3840 Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Tue, 6 Feb 2024 23:46:56 -0800
Subject: [PATCH 018/547] Fix Rubocop violations

---
 Scripts/update-translations.rb |  8 ++++----
 fastlane/Fastfile              | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Scripts/update-translations.rb b/Scripts/update-translations.rb
index 2a3b11a30..7f8d70e42 100755
--- a/Scripts/update-translations.rb
+++ b/Scripts/update-translations.rb
@@ -55,19 +55,19 @@ def copy_header(target_file, trans_strings)
   trans_strings.each_line do |line|
     unless line.start_with?('/*')
       target_file.write("\n")
-      return
+      break
     end
 
     target_file.write(line)
   end
 end
 
-def copy_comment(f, trans_strings, value)
+def copy_comment(file, trans_strings, value)
   prev_line = ''
   trans_strings.each_line do |line|
     if line.include?(value)
-      f.write(prev_line)
-      return
+      file.write(prev_line)
+      break
     end
     prev_line = line
   end
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 4de77f5b1..c795cb164 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -1147,9 +1147,9 @@ end
 # the account index, and values are either "free" or BUILDKITE_BUILD_NUMBER, in case if account
 # was occupied by a build. Returns the hash.
 # Example:
-#   get_test_accounts_hash
+#   test_accounts_hash
 #     => {"0"=>"4079", "1"=>"free", "2"=>"free", "3"=>"free"}
-def get_test_accounts_hash
+def test_accounts_hash
   uri = URI.parse(get_required_env('UI_TESTS_ACCOUNTS_JSON_URL'))
   response = Net::HTTP.get_response(uri)
   accounts_state = response.body.chomp
@@ -1159,7 +1159,7 @@ end
 # Finds the index of first free account in accounts hash, and marks it as accupied by current build.
 # Crashed fastlane if free account was not found.
 def find_free_test_account
-  accounts_hash = get_test_accounts_hash
+  accounts_hash = test_accounts_hash
   UI.message('Looking for a free test account...')
   UI.message("Accounts state: #{accounts_hash}")
 
@@ -1178,13 +1178,13 @@ end
 #   change_test_account_availability("4820")
 #     => {"0"=>"4820", "1"=>"free", "2"=>"free", "3"=>"free"}
 def change_test_account_availability(availability)
-  accounts_hash = get_test_accounts_hash
+  accounts_hash = test_accounts_hash
   accounts_hash[$used_test_account_index.to_s] = availability
   submit_accounts_hash(accounts_hash)
 end
 
 def sanitize_test_accounts
-  accounts_hash = get_test_accounts_hash
+  accounts_hash = test_accounts_hash
   UI.message('Sanitizing stale test accounts...')
   UI.message("Accounts before sanitizing: #{accounts_hash}")
 
@@ -1223,7 +1223,7 @@ def submit_accounts_hash(accounts_hash)
     http.request(request)
   end
 
-  UI.message("Accounts state after write: #{get_test_accounts_hash}")
+  UI.message("Accounts state after write: #{test_accounts_hash}")
 end
 
 def apply_build_number(build_number)

From 356bdec3dcad3b58f116c72bb336f1e79824c4b1 Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Wed, 7 Feb 2024 00:00:39 -0800
Subject: [PATCH 019/547] Allow `used_test_account_index` global variable

---
 .rubocop.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.rubocop.yml b/.rubocop.yml
index fdb0d8582..acff6190c 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -21,3 +21,8 @@ Metrics/BlockLength:
 
 Style/HashSyntax:
   EnforcedShorthandSyntax: never
+
+# Used by UI test account methods. See https://github.com/Automattic/simplenote-ios/pull/1275 for more details.
+Style/GlobalVars:
+  AllowedVariables:
+    - $used_test_account_index

From 42cc23a8b2193f83135349ae24682856e33a7c3d Mon Sep 17 00:00:00 2001
From: Spencer Transier <17955542+spencertransier@users.noreply.github.com>
Date: Wed, 7 Feb 2024 07:57:04 -0800
Subject: [PATCH 020/547] Use File.join

Co-authored-by: Olivier Halligon <olivier.halligon@automattic.com>
---
 fastlane/Fastfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index c795cb164..b38226edd 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -149,17 +149,17 @@ platform :ios do
   desc 'Updates the AppStoreStrings.pot file with the latest data'
   lane :update_appstore_strings do |options|
     prj_folder = Pathname.new(File.join(Dir.pwd, '..')).expand_path.to_s
-    source_metadata_folder = File.join(prj_folder, 'fastlane/appstoreres/metadata/source')
+    source_metadata_folder = File.join(prj_folder, 'fastlane', 'appstoreres', 'metadata', 'source')
 
     files = {
-      whats_new: File.join(prj_folder, '/Simplenote/Resources/release_notes.txt'),
+      whats_new: File.join(prj_folder, 'Simplenote', 'Resources', 'release_notes.txt'),
       app_store_subtitle: File.join(source_metadata_folder, 'subtitle.txt'),
       app_store_desc: File.join(source_metadata_folder, 'description.txt'),
       app_store_keywords: File.join(source_metadata_folder, 'keywords.txt')
     }
 
     ios_update_metadata_source(
-      po_file_path: "#{prj_folder}/Simplenote/Resources/AppStoreStrings.pot",
+      po_file_path: File.join(prj_folder, 'Simplenote', 'Resources', 'AppStoreStrings.pot'),
       source_files: files,
       release_version: options[:version]
     )
@@ -517,7 +517,7 @@ platform :ios do
     )
 
     sh('rm ../Simplenote.ipa')
-    dsym_path = "#{File.dirname(Dir.pwd)}/Simplenote.app.dSYM.zip"
+    dsym_path = File.join(File.dirname(Dir.pwd), 'Simplenote.app.dSYM.zip')
 
     sentry_upload_dsym(
       dsym_path: dsym_path,
@@ -529,7 +529,7 @@ platform :ios do
     sh("rm #{dsym_path}")
 
     if options[:create_release]
-      archive_zip_path = "#{File.dirname(Dir.pwd)}/Simplenote.xarchive.zip"
+      archive_zip_path = File.join(File.dirname(Dir.pwd)), 'Simplenote.xarchive.zip')
       zip(path: lane_context[SharedValues::XCODEBUILD_ARCHIVE], output_path: archive_zip_path)
 
       version = options[:beta_release] ? ios_get_build_version : ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)

From 6dd4a85208e229ebbb5678f6b936fd97478c56aa Mon Sep 17 00:00:00 2001
From: Spencer Transier <17955542+spencertransier@users.noreply.github.com>
Date: Wed, 7 Feb 2024 07:57:49 -0800
Subject: [PATCH 021/547] Remove unused `|_options|`

Co-authored-by: Olivier Halligon <olivier.halligon@automattic.com>
---
 fastlane/Fastfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index b38226edd..bb3c40d71 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -618,7 +618,7 @@ platform :ios do
   # bundle exec fastlane build_and_upload_installable_build
   #####################################################################################
   desc 'Builds and uploads an installable build'
-  lane :build_and_upload_installable_build do |_options|
+  lane :build_and_upload_installable_build do
     alpha_code_signing
 
     # Get the current build version, and update it if needed
@@ -991,7 +991,7 @@ end
 # Example:
 # bundle exec fastlane update_certs_and_profiles
 #####################################################################################
-lane :update_certs_and_profiles do |_options|
+lane :update_certs_and_profiles do
   alpha_code_signing
   internal_code_signing
   appstore_code_signing

From 345b6fdf9e41f0cac847995fd019211b4f004a4d Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Wed, 7 Feb 2024 16:00:59 -0800
Subject: [PATCH 022/547] Group `require`s and constants together

---
 Rakefile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Rakefile b/Rakefile
index 5e64fa6f5..0629c9cb5 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,16 +1,17 @@
 # frozen_string_literal: true
 
 require 'English'
-SWIFTLINT_VERSION = '0.41.0'
-XCODE_WORKSPACE = 'Simplenote.xcworkspace'
-XCODE_SCHEME = 'Simplenote'
-XCODE_CONFIGURATION = 'Debug'
-
 require 'fileutils'
 require 'tmpdir'
 require 'rake/clean'
 require 'yaml'
 require 'digest'
+
+# Constants
+SWIFTLINT_VERSION = '0.41.0'
+XCODE_WORKSPACE = 'Simplenote.xcworkspace'
+XCODE_SCHEME = 'Simplenote'
+XCODE_CONFIGURATION = 'Debug'
 PROJECT_DIR = __dir__
 
 task default: %w[test]

From 0a760bd4f8d0d4787f1cbc523f1de13e8c0d3abd Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Wed, 7 Feb 2024 16:03:37 -0800
Subject: [PATCH 023/547] Updated `remove_branch_protection` name

---
 fastlane/Fastfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index bb3c40d71..973b81312 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -310,7 +310,7 @@ platform :ios do
 
     # Wrap up
     version = ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
-    removebranchprotection(
+    remove_branch_protection(
       repository: GITHUB_REPO,
       branch: "release/#{version}"
     )

From 8a8f5271a85d33a38b5e6c5190a94063ca1f7f55 Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Wed, 7 Feb 2024 16:05:28 -0800
Subject: [PATCH 024/547] Update `setbranchprotection` to
 `copy_branch_protection`

---
 fastlane/Fastfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 973b81312..e4ba57f98 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -45,6 +45,7 @@ VERSION_FILE_PATH = File.join(PROJECT_ROOT_FOLDER, 'config', 'Version.Public.xcc
 OUTPUT_DIRECTORY_PATH = File.join(PROJECT_ROOT_FOLDER, 'build', 'results')
 GITHUB_REPO = 'Automattic/simplenote-ios'
 APP_STORE_BUNDLE_IDENTIFIER = 'com.codality.NotationalFlow'
+DEFAULT_BRANCH = 'trunk'
 
 # List of locales used for the app strings (GlotPress code => `*.lproj` folder name`)
 #
@@ -121,9 +122,10 @@ platform :ios do
       extracted_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt')
     )
     ios_update_release_notes(new_version: new_version)
-    setbranchprotection(
+    copy_branch_protection(
       repository: GITHUB_REPO,
-      branch: "release/#{new_version}"
+      from_branch: DEFAULT_BRANCH,
+      to_branch: "release/#{new_version}"
     )
     setfrozentag(
       repository: GITHUB_REPO,

From d67dce51a4a8328ee079d3d2825e971378fe484a Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Wed, 7 Feb 2024 16:07:18 -0800
Subject: [PATCH 025/547] Update Release Toolkit to `9.4.0` and Fastlane to
 `2.219.0`

---
 Gemfile.lock | 95 +++++++++++++++++++++++++---------------------------
 1 file changed, 45 insertions(+), 50 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b3ea524ef..dddca5485 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,7 +3,7 @@ GEM
   specs:
     CFPropertyList (3.0.6)
       rexml
-    activesupport (7.1.1)
+    activesupport (7.1.3)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -13,7 +13,7 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.5)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
@@ -21,25 +21,25 @@ GEM
     artifactory (3.0.15)
     ast (2.4.2)
     atomos (0.1.3)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.842.0)
-    aws-sdk-core (3.185.1)
-      aws-eventstream (~> 1, >= 1.0.2)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.888.0)
+    aws-sdk-core (3.191.1)
+      aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+      aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.72.0)
-      aws-sdk-core (~> 3, >= 3.184.0)
+    aws-sdk-kms (1.77.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.136.0)
-      aws-sdk-core (~> 3, >= 3.181.0)
+    aws-sdk-s3 (1.143.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.6)
-    aws-sigv4 (1.6.1)
+      aws-sigv4 (~> 1.8)
+    aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
-    base64 (0.1.1)
-    bigdecimal (3.1.4)
+    base64 (0.2.0)
+    bigdecimal (3.1.6)
     buildkit (1.5.0)
       sawyer (>= 0.6)
     chroma (0.2.0)
@@ -85,22 +85,21 @@ GEM
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
     declarative (0.0.20)
     diffy (3.4.2)
     digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
+    domain_name (0.6.20240107)
     dotenv (2.8.1)
-    drb (2.1.1)
+    drb (2.2.0)
       ruby2_keywords
     emoji_regex (3.2.3)
     escape (0.0.4)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    excon (0.104.0)
+    excon (0.109.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -129,8 +128,8 @@ GEM
     faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    fastimage (2.2.7)
-    fastlane (2.216.0)
+    fastimage (2.3.0)
+    fastlane (2.219.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -149,6 +148,7 @@ GEM
       gh_inspector (>= 1.1.2, < 2.0.0)
       google-apis-androidpublisher_v3 (~> 0.3)
       google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, < 2.0.0)
       google-cloud-storage (~> 1.31)
       highline (~> 2.0)
       http-cookie (~> 1.0.5)
@@ -157,7 +157,7 @@ GEM
       mini_magick (>= 4.9.4, < 5.0.0)
       multipart-post (>= 2.0.0, < 3.0.0)
       naturally (~> 2.2)
-      optparse (~> 0.1.1)
+      optparse (>= 0.1.1)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
       security (= 0.1.3)
@@ -173,7 +173,7 @@ GEM
     fastlane-plugin-appcenter (1.11.1)
     fastlane-plugin-sentry (1.14.0)
       os (~> 1.1, >= 1.1.4)
-    fastlane-plugin-wpmreleasetoolkit (9.1.0)
+    fastlane-plugin-wpmreleasetoolkit (9.4.0)
       activesupport (>= 6.1.7.1)
       buildkit (~> 1.5)
       chroma (= 0.2.0)
@@ -182,7 +182,7 @@ GEM
       git (~> 1.3)
       google-cloud-storage (~> 1.31)
       java-properties (~> 0.3.0)
-      nokogiri (~> 1.11)
+      nokogiri (~> 1.11, < 1.16)
       octokit (~> 6.1)
       parallel (~> 1.14)
       plist (~> 3.1)
@@ -194,12 +194,12 @@ GEM
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
-    git (1.18.0)
+    git (1.19.1)
       addressable (~> 2.8)
       rchardet (~> 1.8)
-    google-apis-androidpublisher_v3 (0.51.0)
+    google-apis-androidpublisher_v3 (0.54.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.1)
+    google-apis-core (0.11.3)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -207,24 +207,23 @@ GEM
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
       rexml
-      webrick
     google-apis-iamcredentials_v1 (0.17.0)
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-playcustomapp_v1 (0.13.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-storage_v1 (0.19.0)
-      google-apis-core (>= 0.9.0, < 2.a)
-    google-cloud-core (1.6.0)
-      google-cloud-env (~> 1.0)
+    google-apis-storage_v1 (0.31.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-cloud-core (1.6.1)
+      google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
     google-cloud-errors (1.3.1)
-    google-cloud-storage (1.44.0)
+    google-cloud-storage (1.47.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.19.0)
+      google-apis-storage_v1 (~> 0.31.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
@@ -247,36 +246,36 @@ GEM
     language_server-protocol (3.17.0.3)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
-    minitest (5.20.0)
+    minitest (5.22.2)
     molinillo (0.8.0)
     multi_json (1.15.0)
-    multipart-post (2.3.0)
-    mutex_m (0.1.2)
+    multipart-post (2.4.0)
+    mutex_m (0.2.0)
     nanaimo (0.3.0)
     nap (1.1.0)
     naturally (2.2.1)
     netrc (0.11.0)
-    nokogiri (1.15.4-arm64-darwin)
+    nokogiri (1.15.5-arm64-darwin)
       racc (~> 1.4)
     octokit (6.1.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     options (2.3.2)
-    optparse (0.1.1)
+    optparse (0.4.0)
     os (1.1.4)
     parallel (1.24.0)
     parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
-    plist (3.7.0)
+    plist (3.7.1)
     progress_bar (1.3.3)
       highline (>= 1.6, < 3)
       options (~> 2.3.0)
     public_suffix (4.0.7)
-    racc (1.7.1)
+    racc (1.7.3)
     rainbow (3.1.1)
-    rake (13.0.6)
-    rake-compiler (1.2.5)
+    rake (13.1.0)
+    rake-compiler (1.2.7)
       rake
     rchardet (1.8.0)
     regexp_parser (2.9.0)
@@ -322,7 +321,7 @@ GEM
       unicode-display_width (>= 1.1.1, < 3)
     trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     typhoeus (1.4.0)
@@ -330,13 +329,9 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
     unicode-display_width (2.5.0)
-    webrick (1.8.1)
     word_wrap (1.0.0)
-    xcodeproj (1.23.0)
+    xcodeproj (1.24.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)

From 026291a474a6688590b72f95387b8ad015af6ec8 Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Wed, 7 Feb 2024 16:10:35 -0800
Subject: [PATCH 026/547] Fix comment indenting

---
 Scripts/extract_release_notes.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Scripts/extract_release_notes.rb b/Scripts/extract_release_notes.rb
index 2cfd40ae5..cae2662fe 100644
--- a/Scripts/extract_release_notes.rb
+++ b/Scripts/extract_release_notes.rb
@@ -74,14 +74,14 @@ def replace_pr_number_with_markdown_link(string)
   formatted_lines = formatted_lines
                     .map { |l| l.gsub(/ \#\d*$/, '') }
 when :keep_pr_links
-  formatted_lines = formatted_lines.
-                    # The PR "links" are not actually links, but PR "ids". On GitHub, they'll
-                    # be automatically parsed into links to the corresponding PR, but outside
-                    # GitHub, such as in our internal posts or on App Center, they won't.
-                    #
-                    # It's probably best to update the convention in writing the release notes
-                    # but in the meantime let's compensate with more automation.
-                    map { |l| replace_pr_number_with_markdown_link(l) }
+  # The PR "links" are not actually links, but PR "ids". On GitHub, they'll
+  # be automatically parsed into links to the corresponding PR, but outside
+  # GitHub, such as in our internal posts or on App Center, they won't.
+  #
+  # It's probably best to update the convention in writing the release notes
+  # but in the meantime let's compensate with more automation.
+  formatted_lines = formatted_lines
+                    .map { |l| replace_pr_number_with_markdown_link(l) }
 end
 
 # It would be good to either add overriding of the file where the parsed

From 33022a2625a261bcdbe3f1e4f6c4e8c17a4e1dc1 Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Wed, 7 Feb 2024 16:13:00 -0800
Subject: [PATCH 027/547] Use `get_required_env` for env vars

---
 fastlane/Fastfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index e4ba57f98..b28fe1b9d 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -448,7 +448,7 @@ platform :ios do
       export_method: 'enterprise',
       clean: true,
       output_directory: OUTPUT_DIRECTORY_PATH,
-      export_team_id: ENV.fetch('INT_EXPORT_TEAM_ID', nil),
+      export_team_id: get_required_env('INT_EXPORT_TEAM_ID'),
       export_options: {
         method: 'enterprise',
         provisioningProfiles: simplenote_provisioning_profiles(
@@ -508,7 +508,7 @@ platform :ios do
       clean: true,
       export_options: {
         method: 'app-store',
-        export_team_id: ENV.fetch('EXT_EXPORT_TEAM_ID', nil),
+        export_team_id: get_required_env('EXT_EXPORT_TEAM_ID'),
         provisioningProfiles: simplenote_provisioning_profiles
       }
     )
@@ -634,7 +634,7 @@ platform :ios do
       export_method: 'enterprise',
       clean: true,
       output_directory: OUTPUT_DIRECTORY_PATH,
-      export_team_id: ENV.fetch('INT_EXPORT_TEAM_ID', nil),
+      export_team_id: get_required_env('INT_EXPORT_TEAM_ID'),
       export_options: {
         method: 'enterprise',
         provisioningProfiles: simplenote_provisioning_profiles(

From 2177a071036217143f6e4672ae8b7f0de3d808db Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Wed, 7 Feb 2024 16:44:41 -0800
Subject: [PATCH 028/547] Fix parenthesis

---
 fastlane/Fastfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 0be2a106a..ef7798874 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -133,9 +133,9 @@ platform :ios do
     )
 
     generate_strings_file_for_glotpress
-    
+
     push_to_git_remote(tags: false)
-    
+
     trigger_beta_build(branch_to_build: "release/#{new_version}")
   end
 
@@ -534,7 +534,7 @@ platform :ios do
     sh("rm #{dsym_path}")
 
     if options[:create_release]
-      archive_zip_path = File.join(File.dirname(Dir.pwd)), 'Simplenote.xarchive.zip')
+      archive_zip_path = File.join(File.dirname(Dir.pwd), 'Simplenote.xarchive.zip')
       zip(path: lane_context[SharedValues::XCODEBUILD_ARCHIVE], output_path: archive_zip_path)
 
       version = options[:beta_release] ? ios_get_build_version : ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)

From 7102a2fe61d24528e9c5841ea60e602de0c237aa Mon Sep 17 00:00:00 2001
From: Spencer Transier <17955542+spencertransier@users.noreply.github.com>
Date: Thu, 8 Feb 2024 12:19:52 -0800
Subject: [PATCH 029/547] Move `ios_build_preflight` to existing unless block

Co-authored-by: Olivier Halligon <olivier.halligon@automattic.com>
---
 fastlane/Fastfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index ef7798874..bbe15ca5a 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -499,8 +499,8 @@ platform :ios do
         skip_confirm: options[:skip_confirm],
         external: true
       )
+      ios_build_preflight
     end
-    ios_build_preflight unless options[:skip_prechecks]
 
     appstore_code_signing
 

From ee82f371b523fd9c094494acee7c53860a076adc Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Thu, 8 Feb 2024 16:59:25 -0800
Subject: [PATCH 030/547] Move `push_to_git_remote` before GitHub configuration

---
 fastlane/Fastfile | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index bbe15ca5a..583b5ec1c 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -122,6 +122,14 @@ platform :ios do
       extracted_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt')
     )
     ios_update_release_notes(new_version: new_version)
+
+    generate_strings_file_for_glotpress
+
+    UI.important('Pushing changes to remote and configuring the release on GitHub')
+    UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.") unless options[:skip_confirm] || UI.confirm('Do you want to continue?')
+
+    push_to_git_remote(tags: false)
+
     copy_branch_protection(
       repository: GITHUB_REPO,
       from_branch: DEFAULT_BRANCH,
@@ -132,10 +140,6 @@ platform :ios do
       milestone: new_version
     )
 
-    generate_strings_file_for_glotpress
-
-    push_to_git_remote(tags: false)
-
     trigger_beta_build(branch_to_build: "release/#{new_version}")
   end
 

From 47a2fc04cf66e703137e82cad3600d113f027a59 Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Thu, 8 Feb 2024 17:01:56 -0800
Subject: [PATCH 031/547] Update UI message

---
 fastlane/Fastfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 583b5ec1c..e15fb046e 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -125,7 +125,7 @@ platform :ios do
 
     generate_strings_file_for_glotpress
 
-    UI.important('Pushing changes to remote and configuring the release on GitHub')
+    UI.important('Pushing changes to remote, configuring the release on GitHub, and triggering the beta build')
     UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.") unless options[:skip_confirm] || UI.confirm('Do you want to continue?')
 
     push_to_git_remote(tags: false)

From f0a4aa05ab1d9d4d45b57461949133330137de99 Mon Sep 17 00:00:00 2001
From: Ian Maia <ian.maia@automattic.com>
Date: Tue, 20 Feb 2024 16:37:07 +0100
Subject: [PATCH 032/547] Add Dangermattic configuration

---
 .github/workflows/run-danger.yml | 13 ++++++++++
 Dangerfile                       | 42 ++++++++++++++++++++++++++++++++
 Gemfile                          |  2 +-
 3 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/run-danger.yml
 create mode 100644 Dangerfile

diff --git a/.github/workflows/run-danger.yml b/.github/workflows/run-danger.yml
new file mode 100644
index 000000000..856ab8cea
--- /dev/null
+++ b/.github/workflows/run-danger.yml
@@ -0,0 +1,13 @@
+name: ☢️ Danger
+
+on:
+  pull_request:
+    types: [opened, reopened, ready_for_review, synchronize, edited, labeled, unlabeled, milestoned, demilestoned]
+
+jobs:
+  dangermattic:
+    # runs on draft PRs only for opened / synchronize events
+    if: ${{ (github.event.pull_request.draft == false) || (github.event.pull_request.draft == true && contains(fromJSON('["opened", "synchronize"]'), github.event.action)) }}
+    uses: Automattic/dangermattic/.github/workflows/reusable-run-danger.yml@v1.0.0
+    secrets:
+      github-token: ${{ secrets.DANGERMATTIC_GITHUB_TOKEN }}
diff --git a/Dangerfile b/Dangerfile
new file mode 100644
index 000000000..5deb44319
--- /dev/null
+++ b/Dangerfile
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+github.dismiss_out_of_range_messages
+
+# `files: []` forces rubocop to scan all files, not just the ones modified in the PR
+rubocop.lint(files: [], force_exclusion: true, inline_comment: true, fail_on_inline_comment: true, include_cop_names: true)
+
+manifest_pr_checker.check_all_manifest_lock_updated
+
+podfile_checker.check_podfile_does_not_have_branch_references
+
+ios_release_checker.check_core_data_model_changed
+ios_release_checker.check_release_notes_and_app_store_strings
+
+# skip remaining checks if we're in a release-process PR
+if github.pr_labels.include?('Releases')
+  message('This PR has the `Releases` label: some checks will be skipped.')
+  return
+end
+
+common_release_checker.check_internal_release_notes_changed(report_type: :message)
+
+ios_release_checker.check_modified_translations_on_release_branch
+
+view_changes_checker.check
+
+pr_size_checker.check_diff_size(max_size: 500)
+
+# skip remaining checks if the PR is still a Draft
+if github.pr_draft?
+  message('This PR is still a Draft: some checks will be skipped.')
+  return
+end
+
+labels_checker.check(
+  do_not_merge_labels: ['[Status] DO NOT MERGE'],
+  required_labels: [//],
+  required_labels_error: 'PR requires at least one label.'
+)
+
+# runs the milestone check if this is not a WIP feature and the PR is against the main branch or the release branch
+milestone_checker.check_milestone_due_date(days_before_due: 4) if (github_utils.main_branch? || github_utils.release_branch?) && !github_utils.wip_feature?
diff --git a/Gemfile b/Gemfile
index 565b1b481..b78fff34a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,11 +4,11 @@ source 'https://rubygems.org'
 
 # 1.14.0 fixes a bug that broke compatibility with Ruby 3
 gem 'cocoapods', '~> 1.14'
+gem 'danger-dangermattic', '~> 1.0'
 gem 'fastlane', '~> 2'
 gem 'fastlane-plugin-appcenter', '~> 1.11'
 gem 'fastlane-plugin-sentry', '~> 1.6'
 gem 'fastlane-plugin-wpmreleasetoolkit', '~> 9.1'
-gem 'rubocop', '~> 1.38'
 
 group :screenshots, optional: true do
   gem 'rmagick', '~> 3.2.0'

From e22bdfadf3fc8e79987500a63020d9a656b8b07c Mon Sep 17 00:00:00 2001
From: Ian Maia <ian.maia@automattic.com>
Date: Tue, 20 Feb 2024 16:51:55 +0100
Subject: [PATCH 033/547] Run bundle install

---
 Gemfile.lock | 76 +++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 66 insertions(+), 10 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c8611365f..a17c35f6a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -44,6 +44,10 @@ GEM
       sawyer (>= 0.6)
     chroma (0.2.0)
     claide (1.1.0)
+    claide-plugins (0.9.2)
+      cork
+      nap
+      open4 (~> 1.3)
     cocoapods (1.14.1)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
@@ -87,6 +91,44 @@ GEM
       highline (~> 2.0.0)
     concurrent-ruby (1.2.2)
     connection_pool (2.4.1)
+    cork (0.3.0)
+      colored2 (~> 3.1)
+    danger (9.4.3)
+      claide (~> 1.0)
+      claide-plugins (>= 0.9.2)
+      colored2 (~> 3.1)
+      cork (~> 0.1)
+      faraday (>= 0.9.0, < 3.0)
+      faraday-http-cache (~> 2.0)
+      git (~> 1.13)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.0)
+      no_proxy_fix
+      octokit (>= 4.0)
+      terminal-table (>= 1, < 4)
+    danger-dangermattic (1.0.0)
+      danger (~> 9.4)
+      danger-junit (~> 1.0)
+      danger-plugin-api (~> 1.0)
+      danger-rubocop (~> 0.12)
+      danger-swiftlint (~> 0.35)
+      danger-xcode_summary (~> 1.0)
+      rubocop (~> 1.60)
+    danger-junit (1.0.2)
+      danger (> 2.0)
+      ox (~> 2.0)
+    danger-plugin-api (1.0.0)
+      danger (> 2.0)
+    danger-rubocop (0.12.0)
+      danger
+      rubocop (~> 1.0)
+    danger-swiftlint (0.35.0)
+      danger
+      rake (> 10)
+      thor (~> 1.0.0)
+    danger-xcode_summary (1.3.0)
+      danger-plugin-api (~> 1.0)
+      xcresult (~> 0.2)
     declarative (0.0.20)
     diffy (3.4.2)
     digest-crc (0.6.5)
@@ -119,6 +161,8 @@ GEM
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
+    faraday-http-cache (2.5.1)
+      faraday (>= 0.8)
     faraday-httpclient (1.0.1)
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
@@ -244,6 +288,11 @@ GEM
     jmespath (1.6.2)
     json (2.6.3)
     jwt (2.7.1)
+    kramdown (2.4.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    language_server-protocol (3.17.0.3)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     minitest (5.20.0)
@@ -255,17 +304,21 @@ GEM
     nap (1.1.0)
     naturally (2.2.1)
     netrc (0.11.0)
+    no_proxy_fix (0.1.2)
     nokogiri (1.15.4-arm64-darwin)
       racc (~> 1.4)
     octokit (6.1.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
+    open4 (1.3.4)
     options (2.3.2)
     optparse (0.1.1)
     os (1.1.4)
+    ox (2.14.17)
     parallel (1.23.0)
-    parser (3.1.2.1)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
+      racc
     plist (3.7.0)
     progress_bar (1.3.3)
       highline (>= 1.6, < 3)
@@ -277,7 +330,7 @@ GEM
     rake-compiler (1.2.5)
       rake
     rchardet (1.8.0)
-    regexp_parser (2.6.0)
+    regexp_parser (2.9.0)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -286,20 +339,21 @@ GEM
     rexml (3.2.6)
     rmagick (3.2.0)
     rouge (2.0.7)
-    rubocop (1.38.0)
+    rubocop (1.60.2)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.23.0, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.23.0)
-      parser (>= 3.1.1.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
     ruby-macho (2.5.1)
-    ruby-progressbar (1.11.0)
+    ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     sawyer (0.9.2)
@@ -317,6 +371,7 @@ GEM
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
+    thor (1.0.1)
     trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
     tty-screen (0.8.1)
@@ -344,6 +399,7 @@ GEM
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
+    xcresult (0.2.1)
 
 PLATFORMS
   arm64-darwin-21
@@ -352,12 +408,12 @@ PLATFORMS
 
 DEPENDENCIES
   cocoapods (~> 1.14)
+  danger-dangermattic (~> 1.0)
   fastlane (~> 2)
   fastlane-plugin-appcenter (~> 1.11)
   fastlane-plugin-sentry (~> 1.6)
   fastlane-plugin-wpmreleasetoolkit (~> 9.1)
   rmagick (~> 3.2.0)
-  rubocop (~> 1.38)
 
 BUNDLED WITH
    2.4.13

From 2b45b7f9402da68f1f6a673c029adaf5f2789cb4 Mon Sep 17 00:00:00 2001
From: Ian Maia <ian.maia@automattic.com>
Date: Tue, 20 Feb 2024 16:52:26 +0100
Subject: [PATCH 034/547] Add RuboCop config

---
 .rubocop.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
new file mode 100644
index 000000000..ad146a0a1
--- /dev/null
+++ b/.rubocop.yml
@@ -0,0 +1,18 @@
+AllCops:
+  NewCops: enable
+  SuggestExtensions:
+    rubocop-rake: false
+
+Metrics/MethodLength:
+  Max: 30
+
+Layout/LineLength:
+  Max: 180
+
+Metrics/BlockLength:
+  Exclude:
+    - fastlane/Fastfile
+    - Rakefile
+
+Style/HashSyntax:
+  EnforcedShorthandSyntax: never

From 5dec4c9786a19a1dfd78ba1a2a5817f581f531e6 Mon Sep 17 00:00:00 2001
From: Ian Maia <ian.maia@automattic.com>
Date: Tue, 20 Feb 2024 16:53:40 +0100
Subject: [PATCH 035/547] Run RuboCop -a

---
 Podfile                          |   6 +-
 Rakefile                         | 148 ++++----
 Scripts/extract_release_notes.rb |  29 +-
 Scripts/update-translations.rb   |  24 +-
 fastlane/Fastfile                | 561 +++++++++++++++----------------
 5 files changed, 378 insertions(+), 390 deletions(-)

diff --git a/Podfile b/Podfile
index ef7e409e8..d9e7ff13e 100644
--- a/Podfile
+++ b/Podfile
@@ -1,8 +1,6 @@
 source 'https://cdn.cocoapods.org/'
 
-unless ['BUNDLE_BIN_PATH', 'BUNDLE_GEMFILE'].any? { |k| ENV.key?(k) }
-  raise 'Please run CocoaPods via `bundle exec`'
-end
+raise 'Please run CocoaPods via `bundle exec`' unless %w[BUNDLE_BIN_PATH BUNDLE_GEMFILE].any? { |k| ENV.key?(k) }
 
 inhibit_all_warnings!
 use_frameworks!
@@ -13,7 +11,6 @@ workspace 'Simplenote.xcworkspace'
 # Main
 #
 abstract_target 'Automattic' do
-
   # Main Target
   #
   target 'Simplenote' do
@@ -44,7 +41,6 @@ abstract_target 'Automattic' do
   end
 end
 
-
 # Post Install
 #
 post_install do |installer|
diff --git a/Rakefile b/Rakefile
index e27dc8665..556dd6342 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,61 +1,61 @@
-SWIFTLINT_VERSION="0.41.0"
-XCODE_WORKSPACE="Simplenote.xcworkspace"
-XCODE_SCHEME="Simplenote"
-XCODE_CONFIGURATION="Debug"
+SWIFTLINT_VERSION = '0.41.0'
+XCODE_WORKSPACE = 'Simplenote.xcworkspace'
+XCODE_SCHEME = 'Simplenote'
+XCODE_CONFIGURATION = 'Debug'
 
 require 'fileutils'
 require 'tmpdir'
 require 'rake/clean'
 require 'yaml'
 require 'digest'
-PROJECT_DIR = File.expand_path(File.dirname(__FILE__))
+PROJECT_DIR = __dir__
 
 task default: %w[test]
 
-desc "Install required dependencies"
-task :dependencies => %w[dependencies:check]
+desc 'Install required dependencies'
+task dependencies: %w[dependencies:check]
 
 namespace :dependencies do
-  task :check => %w[bundler:check bundle:check credentials:apply pod:check lint:check]
+  task check: %w[bundler:check bundle:check credentials:apply pod:check lint:check]
 
   namespace :bundler do
     task :check do
-      unless command?("bundler")
-        Rake::Task["dependencies:bundler:install"].invoke
-      end
+      Rake::Task['dependencies:bundler:install'].invoke unless command?('bundler')
     end
 
     task :install do
-      puts "Bundler not found in PATH, installing to vendor"
+      puts 'Bundler not found in PATH, installing to vendor'
       ENV['GEM_HOME'] = File.join(PROJECT_DIR, 'vendor', 'gems')
-      ENV['PATH'] = File.join(PROJECT_DIR, 'vendor', 'gems', 'bin') + ":#{ENV['PATH']}"
-      sh "gem install bundler" unless command?("bundler")
+      ENV['PATH'] = File.join(PROJECT_DIR, 'vendor', 'gems', 'bin') + ":#{ENV.fetch('PATH', nil)}"
+      sh 'gem install bundler' unless command?('bundler')
     end
-    CLOBBER << "vendor/gems"
+    CLOBBER << 'vendor/gems'
   end
 
   namespace :bundle do
     task :check do
-      sh "bundle check --path=${BUNDLE_PATH:-vendor/bundle} > /dev/null", verbose: false do |ok, res|
+      sh 'bundle check --path=${BUNDLE_PATH:-vendor/bundle} > /dev/null', verbose: false do |ok, _res|
         next if ok
+
         # bundle check exits with a non zero code if install is needed
-        dependency_failed("Bundler")
-        Rake::Task["dependencies:bundle:install"].invoke
+        dependency_failed('Bundler')
+        Rake::Task['dependencies:bundle:install'].invoke
       end
     end
 
     task :install do
-      fold("install.bundler") do
-        sh "bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}"
+      fold('install.bundler') do
+        sh 'bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}'
       end
     end
-    CLOBBER << "vendor/bundle"
-    CLOBBER << ".bundle"
+    CLOBBER << 'vendor/bundle'
+    CLOBBER << '.bundle'
   end
 
   namespace :credentials do
     task :apply do
       next unless Dir.exist?(File.join(Dir.home, '.mobile-secrets/.git')) || ENV.key?('CONFIGURE_ENCRYPTION_KEY')
+
       sh('FASTLANE_SKIP_UPDATE_CHECK=1 FASTLANE_ENV_PRINTER=1 bundle exec fastlane run configure_apply force:true')
     end
   end
@@ -63,36 +63,35 @@ namespace :dependencies do
   namespace :pod do
     task :check do
       unless podfile_locked? && lockfiles_match?
-        dependency_failed("CocoaPods")
-        Rake::Task["dependencies:pod:install"].invoke
+        dependency_failed('CocoaPods')
+        Rake::Task['dependencies:pod:install'].invoke
       end
     end
 
     task :install do
-      fold("install.cocoapds") do
+      fold('install.cocoapds') do
         pod %w[install]
       end
     end
 
     task :clean do
-      fold("clean.cocoapds") do
+      fold('clean.cocoapds') do
         FileUtils.rm_rf('Pods')
       end
     end
-    CLOBBER << "Pods"
+    CLOBBER << 'Pods'
   end
 
   namespace :lint do
-
     task :check do
       if swiftlint_needs_install
-        dependency_failed("SwiftLint")
-        Rake::Task["dependencies:lint:install"].invoke
+        dependency_failed('SwiftLint')
+        Rake::Task['dependencies:lint:install'].invoke
       end
     end
 
     task :install do
-      fold("install.swiftlint") do
+      fold('install.swiftlint') do
         puts "Installing SwiftLint #{SWIFTLINT_VERSION} into #{swiftlint_path}"
         Dir.mktmpdir do |tmpdir|
           # Try first using a binary release
@@ -107,7 +106,7 @@ namespace :dependencies do
             sh "git clone --quiet https://github.com/realm/SwiftLint.git #{tmpdir}"
             Dir.chdir(tmpdir) do
               sh "git checkout --quiet #{SWIFTLINT_VERSION}"
-              sh "git submodule --quiet update --init --recursive"
+              sh 'git submodule --quiet update --init --recursive'
               FileUtils.remove_entry_secure(swiftlint_path) if Dir.exist?(swiftlint_path)
               FileUtils.mkdir_p(swiftlint_path)
               sh "make prefix_install PREFIX='#{swiftlint_path}'"
@@ -116,51 +115,50 @@ namespace :dependencies do
         end
       end
     end
-    CLOBBER << "vendor/swiftlint"
+    CLOBBER << 'vendor/swiftlint'
   end
-
 end
 
-CLOBBER << "vendor"
+CLOBBER << 'vendor'
 
 desc "Build #{XCODE_SCHEME}"
-task :build => [:dependencies] do
+task build: [:dependencies] do
   xcodebuild(:build)
 end
 
 desc "Profile build #{XCODE_SCHEME}"
-task :buildprofile => [:dependencies] do
-  ENV["verbose"] = "1"
+task buildprofile: [:dependencies] do
+  ENV['verbose'] = '1'
   xcodebuild(:build, "OTHER_SWIFT_FLAGS='-Xfrontend -debug-time-compilation -Xfrontend -debug-time-expression-type-checking'")
 end
 
-task :timed_build => [:clean] do
+task timed_build: [:clean] do
   require 'benchmark'
   time = Benchmark.measure do
-    Rake::Task["build"].invoke
+    Rake::Task['build'].invoke
   end
   puts "CPU Time: #{time.total}"
   puts "Wall Time: #{time.real}"
 end
 
-desc "Run test suite"
-task :test => [:dependencies] do
+desc 'Run test suite'
+task test: [:dependencies] do
   xcodebuild(:build, :test)
 end
 
-desc "Remove any temporary products"
+desc 'Remove any temporary products'
 task :clean do
   xcodebuild(:clean)
 end
 
-desc "Checks the source for style errors"
-task :lint => %w[dependencies:lint:check] do
+desc 'Checks the source for style errors'
+task lint: %w[dependencies:lint:check] do
   swiftlint %w[lint --quiet]
 end
 
 namespace :lint do
-  desc "Automatically corrects style errors where possible"
-  task :autocorrect => %w[dependencies:lint:check] do
+  desc 'Automatically corrects style errors where possible'
+  task autocorrect: %w[dependencies:lint:check] do
     swiftlint %w[autocorrect]
   end
 end
@@ -168,7 +166,7 @@ end
 namespace :git do
   hooks = %w[pre-commit post-checkout post-merge]
 
-  desc "Install git hooks"
+  desc 'Install git hooks'
   task :install_hooks do
     hooks.each do |hook|
       target = hook_target(hook)
@@ -177,16 +175,17 @@ namespace :git do
 
       next if File.symlink?(target) and File.readlink(target) == source
       next if File.file?(target) and File.identical?(target, source)
+
       if File.exist?(target)
         puts "Existing hook for #{hook}. Creating backup at #{target} -> #{backup}"
-        FileUtils.mv(target, backup, :force => true)
+        FileUtils.mv(target, backup, force: true)
       end
       FileUtils.ln_s(source, target)
       puts "Installed #{hook} hook"
     end
   end
 
-  desc "Uninstall git hooks"
+  desc 'Uninstall git hooks'
   task :uninstall_hooks do
     hooks.each do |hook|
       target = hook_target(hook)
@@ -194,6 +193,7 @@ namespace :git do
       backup = hook_backup(hook)
 
       next unless File.symlink?(target) and File.readlink(target) == source
+
       puts "Removing hook for #{hook}"
       File.unlink(target)
       if File.exist?(backup)
@@ -217,12 +217,10 @@ namespace :git do
 end
 
 namespace :git do
-  task :pre_commit => %[dependencies:lint:check] do
-    begin
-      swiftlint %w[lint --quiet --strict]
-    rescue
-      exit $?.exitstatus
-    end
+  task pre_commit: %(dependencies:lint:check) do
+    swiftlint %w[lint --quiet --strict]
+  rescue StandardError
+    exit $?.exitstatus
   end
 
   task :post_merge do
@@ -234,19 +232,19 @@ namespace :git do
   end
 end
 
-desc "Open the project in Xcode"
-task :xcode => [:dependencies] do
+desc 'Open the project in Xcode'
+task xcode: [:dependencies] do
   sh "open #{XCODE_WORKSPACE}"
 end
 
-def fold(label, &block)
+def fold(label)
   puts "travis_fold:start:#{label}" if is_travis?
   yield
   puts "travis_fold:end:#{label}" if is_travis?
 end
 
 def is_travis?
-  return ENV["TRAVIS"] != nil
+  !ENV['TRAVIS'].nil?
 end
 
 def pod(args)
@@ -259,14 +257,14 @@ def lockfiles_match?
 end
 
 def podfile_locked?
-  podfile_checksum = Digest::SHA1.file("Podfile")
-  lockfile_checksum = YAML.load(File.read("Podfile.lock"))["PODFILE CHECKSUM"]
+  podfile_checksum = Digest::SHA1.file('Podfile')
+  lockfile_checksum = YAML.load_file('Podfile.lock')['PODFILE CHECKSUM']
 
   podfile_checksum == lockfile_checksum
 end
 
 def swiftlint_path
-    "#{PROJECT_DIR}/vendor/swiftlint"
+  "#{PROJECT_DIR}/vendor/swiftlint"
 end
 
 def swiftlint(args)
@@ -275,25 +273,26 @@ def swiftlint(args)
 end
 
 def swiftlint_bin
-    "#{swiftlint_path}/bin/swiftlint"
+  "#{swiftlint_path}/bin/swiftlint"
 end
 
 def swiftlint_needs_install
   return true unless File.exist?(swiftlint_bin)
+
   installed_version = `"#{swiftlint_bin}" version`.chomp
-  return (installed_version != SWIFTLINT_VERSION)
+  (installed_version != SWIFTLINT_VERSION)
 end
 
 def xcodebuild(*build_cmds)
-  cmd = "xcodebuild"
+  cmd = 'xcodebuild'
   cmd += " -destination 'platform=iOS Simulator,name=iPhone 6s'"
-  cmd += " -sdk iphonesimulator"
+  cmd += ' -sdk iphonesimulator'
   cmd += " -workspace #{XCODE_WORKSPACE}"
   cmd += " -scheme #{XCODE_SCHEME}"
   cmd += " -configuration #{xcode_configuration}"
-  cmd += " "
-  cmd += build_cmds.map(&:to_s).join(" ")
-  cmd += " | bundle exec xcpretty -f `bundle exec xcpretty-travis-formatter` && exit ${PIPESTATUS[0]}" unless ENV['verbose']
+  cmd += ' '
+  cmd += build_cmds.map(&:to_s).join(' ')
+  cmd += ' | bundle exec xcpretty -f `bundle exec xcpretty-travis-formatter` && exit ${PIPESTATUS[0]}' unless ENV['verbose']
   sh(cmd)
 end
 
@@ -304,19 +303,20 @@ end
 def command?(command)
   system("which #{command} > /dev/null 2>&1")
 end
+
 def dependency_failed(component)
   msg = "#{component} dependencies missing or outdated. "
   if ENV['DRY_RUN']
-    msg += "Run rake dependencies to install them."
-    fail msg
+    msg += 'Run rake dependencies to install them.'
+    raise msg
   else
-    msg += "Installing..."
+    msg += 'Installing...'
     puts msg
   end
 end
 
 def check_dependencies_hook
-  ENV['DRY_RUN'] = "1"
+  ENV['DRY_RUN'] = '1'
   begin
     Rake::Task['dependencies'].invoke
   rescue Exception => e
diff --git a/Scripts/extract_release_notes.rb b/Scripts/extract_release_notes.rb
index c2e5649cf..52a29db5a 100644
--- a/Scripts/extract_release_notes.rb
+++ b/Scripts/extract_release_notes.rb
@@ -56,31 +56,30 @@ def replace_pr_number_with_markdown_link(string)
 # sequence. This accounts for the edge case in which more new lines make it
 # into the release notes file than expected.
 index = 0
-until lines[index].start_with? '-----'
-  index += 1
-end
+index += 1 until lines[index].start_with? '-----'
 
-lines[(index+1)...].each do |line|
+lines[(index + 1)...].each do |line|
   break if line.strip == ''
+
   release_lines.push line
 end
 
-formatted_lines = release_lines.
-    map { |l| l.gsub(/-   /, '- ') }
+formatted_lines = release_lines
+                  .map { |l| l.gsub('-   ', '- ') }
 
 case mode
 when :strip_pr_links
-  formatted_lines = formatted_lines.
-    map { |l| l.gsub(/ \#\d*$/, '') }
+  formatted_lines = formatted_lines
+                    .map { |l| l.gsub(/ \#\d*$/, '') }
 when :keep_pr_links
   formatted_lines = formatted_lines.
-    # The PR "links" are not actually links, but PR "ids". On GitHub, they'll
-    # be automatically parsed into links to the corresponding PR, but outside
-    # GitHub, such as in our internal posts or on App Center, they won't.
-    #
-    # It's probably best to update the convention in writing the release notes
-    # but in the meantime let's compensate with more automation.
-    map { |l| replace_pr_number_with_markdown_link(l) }
+                    # The PR "links" are not actually links, but PR "ids". On GitHub, they'll
+                    # be automatically parsed into links to the corresponding PR, but outside
+                    # GitHub, such as in our internal posts or on App Center, they won't.
+                    #
+                    # It's probably best to update the convention in writing the release notes
+                    # but in the meantime let's compensate with more automation.
+                    map { |l| replace_pr_number_with_markdown_link(l) }
 end
 
 # It would be good to either add overriding of the file where the parsed
diff --git a/Scripts/update-translations.rb b/Scripts/update-translations.rb
index 8576e863f..425d9e71d 100755
--- a/Scripts/update-translations.rb
+++ b/Scripts/update-translations.rb
@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
-
 # Supported languages:
-# ar,cy,zh-Hans,zh-Hant,nl,fa,fr,de,el,he,id,ko,pt,ru,es,sv,tr,ja,it 
+# ar,cy,zh-Hans,zh-Hant,nl,fa,fr,de,el,he,id,ko,pt,ru,es,sv,tr,ja,it
 # * Arabic
 # * Welsh
 # * Chinese (China) [zh-Hans]
@@ -25,11 +23,11 @@
 require 'json'
 
 if Dir.pwd =~ /Scripts/
-  puts "Must run script from root folder"
+  puts 'Must run script from root folder'
   exit
 end
 
-ALL_LANGS={
+ALL_LANGS = {
   'ar' => 'ar',         # Arabic
   'cy' => 'cy',         # Welsh
   'de' => 'de',         # German
@@ -48,28 +46,28 @@
   'sv' => 'sv',         # Swedish
   'tr' => 'tr',         # Turkish
   'zh-cn' => 'zh-Hans-CN', # Chinese (China)
-  'zh-tw' => 'zh-Hant-TW', # Chinese (Taiwan)
+  'zh-tw' => 'zh-Hant-TW' # Chinese (Taiwan)
 }
 
 def copy_header(target_file, trans_strings)
   trans_strings.each_line do |line|
-    if (!line.start_with?("/*"))
+    unless line.start_with?('/*')
       target_file.write("\n")
       return
-    end 
+    end
 
     target_file.write(line)
   end
 end
 
 def copy_comment(f, trans_strings, value)
-  prev_line=""
+  prev_line = ''
   trans_strings.each_line do |line|
     if line.include?(value)
       f.write(prev_line)
-      return 
+      return
     end
-    prev_line=line
+    prev_line = line
   end
 end
 
@@ -86,11 +84,11 @@ def copy_comment(f, trans_strings, value)
   langs = ALL_LANGS
 end
 
-langs.each do |code,local|
+langs.each do |code, local|
   lang_dir = File.join('Simplenote', "#{local}.lproj")
   puts "Updating #{code}"
   system "mkdir -p #{lang_dir}"
-  
+
   # Backup the current file
   system "if [ -e #{lang_dir}/Localizable.strings ]; then cp #{lang_dir}/Localizable.strings #{lang_dir}/Localizable.strings.bak; fi"
 
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index a4a88625d..554351855 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -4,9 +4,7 @@ fastlane_require 'dotenv'
 fastlane_require 'open-uri'
 fastlane_require 'buildkit'
 
-unless FastlaneCore::Helper.bundler?
-  UI.user_error!('Please run fastlane via `bundle exec`')
-end
+UI.user_error!('Please run fastlane via `bundle exec`') unless FastlaneCore::Helper.bundler?
 
 USER_ENV_FILE_PATH = File.join(Dir.home, '.simplenoteios-env.default')
 PROJECT_ENV_FILE_PATH = File.join(
@@ -23,82 +21,78 @@ before_all do
   # Check that the env files exist
   unless is_ci || File.file?(USER_ENV_FILE_PATH)
     error_message = <<~ERROR
-    ~/.simplenoteios-env.default not found. Please copy env/user.env-example to #{USER_ENV_FILE_PATH} and fill in the values") using the following command:
+      ~/.simplenoteios-env.default not found. Please copy env/user.env-example to #{USER_ENV_FILE_PATH} and fill in the values") using the following command:
 
-    \tcp #{PROJECT_ROOT_FOLDER}/fastlane/env/user.env-example #{USER_ENV_FILE_PATH}
+      \tcp #{PROJECT_ROOT_FOLDER}/fastlane/env/user.env-example #{USER_ENV_FILE_PATH}
     ERROR
     UI.user_error!(error_message)
   end
 
-  unless File.file?(PROJECT_ENV_FILE_PATH)
-    UI.user_error!("project.env not found: Make sure your configuration is up to date with `rake dependencies`")
-  end
+  UI.user_error!('project.env not found: Make sure your configuration is up to date with `rake dependencies`') unless File.file?(PROJECT_ENV_FILE_PATH)
 
   setup_ci
 end
 
-error do |lane, exception, options|
+error do |lane, _exception, _options|
   deoccupy_test_account if lane == :run_ui_tests
 end
 
 platform :ios do
-########################################################################
-# Environment
-########################################################################
-PROJECT_ROOT_FOLDER = File.dirname(File.expand_path(__dir__))
-VERSION_FILE_PATH = File.join(PROJECT_ROOT_FOLDER, 'config', 'Version.Public.xcconfig')
-OUTPUT_DIRECTORY_PATH = File.join(PROJECT_ROOT_FOLDER, 'build', 'results')
-
-Dotenv.load(USER_ENV_FILE_PATH)
-Dotenv.load(PROJECT_ENV_FILE_PATH)
-ENV[GHHELPER_REPO="Automattic/simplenote-ios"]
-ENV["PROJECT_NAME"]="Simplenote"
-ENV["PROJECT_ROOT_FOLDER"]=PROJECT_ROOT_FOLDER
-ENV['APP_STORE_STRINGS_FILE_NAME']='AppStoreStrings.pot'
-ENV["PUBLIC_CONFIG_FILE"]=VERSION_FILE_PATH
-ENV["DOWNLOAD_METADATA"]="./fastlane/download_metadata.swift"
-ENV['FL_RELEASE_TOOLKIT_DEFAULT_BRANCH'] = 'trunk'
-REPOSITORY_NAME="simplenote-ios"
-APP_STORE_BUNDLE_IDENTIFIER = 'com.codality.NotationalFlow'.freeze
-
-# List of locales used for the app strings (GlotPress code => `*.lproj` folder name`)
-#
-# TODO: Replace with `LocaleHelper` once provided by release toolkit (https://github.com/wordpress-mobile/release-toolkit/pull/296)
-GLOTPRESS_TO_LPROJ_APP_LOCALE_CODES = {
-  'ar' => 'ar',             # Arabic
-  'cy' => 'cy',             # Welsh
-  'de' => 'de',             # German
-  'el' => 'el',             # Greek
-  'en' => 'en',             # English
-  'es' => 'es',             # Spanish
-  'fa' => 'fa',             # Persian
-  'fr' => 'fr',             # French
-  'he' => 'he',             # Hebrew
-  'id' => 'id',             # Indonesian
-  'it' => 'it',             # Italian
-  'ja' => 'ja',             # Japanese
-  'ko' => 'ko',             # Korean
-  'nl' => 'nl',             # Dutch
-  'pt-br' => 'pt-BR',       # Portuguese (Brazil)
-  'ru' => 'ru',             # Russian
-  'sv' => 'sv',             # Swedish
-  'tr' => 'tr',             # Turkish
-  'zh-cn' => 'zh-Hans-CN',  # Chinese (China)
-  'zh-tw' => 'zh-Hant-TW'   # Chinese (Taiwan)
-}.freeze
-
-# Use this instead of getting values from ENV directly
-# It will throw an error if the requested value is missing
-def get_required_env(key)
-  unless ENV.key?(key)
-    UI.user_error!("Environment variable '#{key}' is not set. Have you setup #{USER_ENV_FILE_PATH} correctly?")
+  ########################################################################
+  # Environment
+  ########################################################################
+  PROJECT_ROOT_FOLDER = File.dirname(File.expand_path(__dir__))
+  VERSION_FILE_PATH = File.join(PROJECT_ROOT_FOLDER, 'config', 'Version.Public.xcconfig')
+  OUTPUT_DIRECTORY_PATH = File.join(PROJECT_ROOT_FOLDER, 'build', 'results')
+
+  Dotenv.load(USER_ENV_FILE_PATH)
+  Dotenv.load(PROJECT_ENV_FILE_PATH)
+  ENV.fetch(GHHELPER_REPO = 'Automattic/simplenote-ios', nil)
+  ENV['PROJECT_NAME'] = 'Simplenote'
+  ENV['PROJECT_ROOT_FOLDER'] = PROJECT_ROOT_FOLDER
+  ENV['APP_STORE_STRINGS_FILE_NAME'] = 'AppStoreStrings.pot'
+  ENV['PUBLIC_CONFIG_FILE'] = VERSION_FILE_PATH
+  ENV['DOWNLOAD_METADATA'] = './fastlane/download_metadata.swift'
+  ENV['FL_RELEASE_TOOLKIT_DEFAULT_BRANCH'] = 'trunk'
+  REPOSITORY_NAME = 'simplenote-ios'
+  APP_STORE_BUNDLE_IDENTIFIER = 'com.codality.NotationalFlow'.freeze
+
+  # List of locales used for the app strings (GlotPress code => `*.lproj` folder name`)
+  #
+  # TODO: Replace with `LocaleHelper` once provided by release toolkit (https://github.com/wordpress-mobile/release-toolkit/pull/296)
+  GLOTPRESS_TO_LPROJ_APP_LOCALE_CODES = {
+    'ar' => 'ar',             # Arabic
+    'cy' => 'cy',             # Welsh
+    'de' => 'de',             # German
+    'el' => 'el',             # Greek
+    'en' => 'en',             # English
+    'es' => 'es',             # Spanish
+    'fa' => 'fa',             # Persian
+    'fr' => 'fr',             # French
+    'he' => 'he',             # Hebrew
+    'id' => 'id',             # Indonesian
+    'it' => 'it',             # Italian
+    'ja' => 'ja',             # Japanese
+    'ko' => 'ko',             # Korean
+    'nl' => 'nl',             # Dutch
+    'pt-br' => 'pt-BR',       # Portuguese (Brazil)
+    'ru' => 'ru',             # Russian
+    'sv' => 'sv',             # Swedish
+    'tr' => 'tr',             # Turkish
+    'zh-cn' => 'zh-Hans-CN',  # Chinese (China)
+    'zh-tw' => 'zh-Hant-TW'   # Chinese (Taiwan)
+  }.freeze
+
+  # Use this instead of getting values from ENV directly
+  # It will throw an error if the requested value is missing
+  def get_required_env(key)
+    UI.user_error!("Environment variable '#{key}' is not set. Have you setup #{USER_ENV_FILE_PATH} correctly?") unless ENV.key?(key)
+    ENV.fetch(key, nil)
   end
-  ENV[key]
-end
 
-########################################################################
-# Release Lanes
-########################################################################
+  ########################################################################
+  # Release Lanes
+  ########################################################################
   #####################################################################################
   # code_freeze
   # -----------------------------------------------------------------------------------
@@ -111,20 +105,20 @@ end
   # bundle exec fastlane code_freeze
   # bundle exec fastlane code_freeze skip_confirm:true
   #####################################################################################
-  desc "Creates a new release branch from the current trunk"
-  lane :code_freeze do | options |
+  desc 'Creates a new release branch from the current trunk'
+  lane :code_freeze do |options|
     old_version = ios_codefreeze_prechecks(options)
 
     ios_bump_version_release
     new_version = ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
     extract_release_notes_for_version(version: new_version,
-      release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'RELEASE-NOTES.txt'),
-      extracted_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt'))
+                                      release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'RELEASE-NOTES.txt'),
+                                      extracted_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt'))
     ios_update_release_notes(new_version: new_version)
 
     push_to_git_remote(tags: false)
-    setbranchprotection(repository:GHHELPER_REPO, branch: "release/#{new_version}")
-    setfrozentag(repository:GHHELPER_REPO, milestone: new_version)
+    setbranchprotection(repository: GHHELPER_REPO, branch: "release/#{new_version}")
+    setfrozentag(repository: GHHELPER_REPO, milestone: new_version)
 
     generate_strings_file_for_glotpress
     trigger_beta_build(branch_to_build: "release/#{new_version}")
@@ -142,20 +136,20 @@ end
   # Example:
   # bundle exec fastlane update_appstore_strings version:1.1
   #####################################################################################
-  desc "Updates the AppStoreStrings.pot file with the latest data"
-  lane :update_appstore_strings do | options |
-    prj_folder = Pathname.new(File.join(Dir.pwd, "..")).expand_path.to_s
-    source_metadata_folder = File.join(prj_folder, "fastlane/appstoreres/metadata/source")
+  desc 'Updates the AppStoreStrings.pot file with the latest data'
+  lane :update_appstore_strings do |options|
+    prj_folder = Pathname.new(File.join(Dir.pwd, '..')).expand_path.to_s
+    source_metadata_folder = File.join(prj_folder, 'fastlane/appstoreres/metadata/source')
 
     files = {
-      whats_new: File.join(prj_folder,  "/Simplenote/Resources/release_notes.txt"),
-      app_store_subtitle: File.join(source_metadata_folder, "subtitle.txt"),
-      app_store_desc: File.join(source_metadata_folder, "description.txt"),
-      app_store_keywords: File.join(source_metadata_folder, "keywords.txt")
+      whats_new: File.join(prj_folder, '/Simplenote/Resources/release_notes.txt'),
+      app_store_subtitle: File.join(source_metadata_folder, 'subtitle.txt'),
+      app_store_desc: File.join(source_metadata_folder, 'description.txt'),
+      app_store_keywords: File.join(source_metadata_folder, 'keywords.txt')
     }
 
     ios_update_metadata_source(
-      po_file_path: prj_folder + "/Simplenote/Resources/AppStoreStrings.pot",
+      po_file_path: prj_folder + '/Simplenote/Resources/AppStoreStrings.pot',
       source_files: files,
       release_version: options[:version]
     )
@@ -163,9 +157,9 @@ end
 
   # This lane lacks documentation because it ought to be part of the localized
   # metadata download script instead!
-  desc "Updates the files with the localized keywords values for App Store Connect to match the 100 characters requirement"
+  desc 'Updates the files with the localized keywords values for App Store Connect to match the 100 characters requirement'
   lane :sanitize_appstore_keywords do
-    Dir["./metadata/**"].each do |locale_dir|
+    Dir['./metadata/**'].each do |locale_dir|
       keywords_path = File.join(locale_dir, 'keywords.txt')
 
       unless File.exist?(keywords_path)
@@ -187,9 +181,7 @@ end
       arabic_comma = '،'
       keywords = keywords.gsub(arabic_comma, english_comma) if File.basename(locale_dir) == 'ar-SA'
 
-      until keywords.length <= app_store_connect_keywords_length_limit
-        keywords = keywords.split(english_comma)[0...-1].join(english_comma)
-      end
+      keywords = keywords.split(english_comma)[0...-1].join(english_comma) until keywords.length <= app_store_connect_keywords_length_limit
 
       File.write(keywords_path, keywords)
     end
@@ -211,8 +203,8 @@ end
   # bundle exec fastlane new_beta_release skip_confirm:true
   # bundle exec fastlane new_beta_release base_version:10.6.1
   #####################################################################################
-  desc "Updates a release branch for a new beta release"
-  lane :new_beta_release do | options |
+  desc 'Updates a release branch for a new beta release'
+  lane :new_beta_release do |options|
     ios_betabuild_prechecks(options)
     download_localized_strings_and_metadata_from_glotpress
     ios_lint_localizations(input_dir: 'Simplenote', allow_retry: true)
@@ -234,7 +226,7 @@ end
   # bundle exec fastlane new_hotfix_release skip_confirm:true version:10.6.1
   #####################################################################################
   desc 'Creates a new hotfix branch for the given version:x.y.z. The branch will be cut from the tag x.y of the previous release'
-  lane :new_hotfix_release do | options |
+  lane :new_hotfix_release do |options|
     prev_ver = ios_hotfix_prechecks(options)
     ios_bump_version_hotfix(previous_version: prev_ver, version: options[:version])
   end
@@ -282,7 +274,7 @@ end
       abort_on_violations: false
     )
 
-    UI.message("Checking release notes strings translation status...")
+    UI.message('Checking release notes strings translation status...')
     check_translation_progress(
       glotpress_url: 'https://translate.wordpress.com/projects/simplenote/ios/release-notes/',
       abort_on_violations: false
@@ -293,16 +285,16 @@ end
       locales: GLOTPRESS_TO_LPROJ_APP_LOCALE_CODES,
       download_dir: File.join(PROJECT_ROOT_FOLDER, 'Simplenote')
     )
-    sanitize_appstore_keywords()
+    sanitize_appstore_keywords
     ios_lint_localizations(input_dir: 'Simplenote', allow_retry: true)
-    ios_bump_version_beta()
+    ios_bump_version_beta
 
     # Wrap up
     version = ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
-    removebranchprotection(repository:GHHELPER_REPO, branch: "release/#{version}")
-    setfrozentag(repository:GHHELPER_REPO, milestone: version, freeze: false)
-    create_new_milestone(repository:GHHELPER_REPO)
-    close_milestone(repository:GHHELPER_REPO, milestone: version)
+    removebranchprotection(repository: GHHELPER_REPO, branch: "release/#{version}")
+    setfrozentag(repository: GHHELPER_REPO, milestone: version, freeze: false)
+    create_new_milestone(repository: GHHELPER_REPO)
+    close_milestone(repository: GHHELPER_REPO, milestone: version)
 
     # Start the build
     trigger_release_build(branch_to_build: "release/#{version}")
@@ -323,12 +315,13 @@ end
   # bundle exec fastlane build_and_upload_beta_release skip_confirm:true
   # bundle exec fastlane build_and_upload_beta_release create_gh_release:true
   #####################################################################################
-  desc "Builds and uploads a beta release for distribution"
-  lane :build_and_upload_beta_release do | options |
+  desc 'Builds and uploads a beta release for distribution'
+  lane :build_and_upload_beta_release do |options|
     build_and_upload_release(
       skip_confirm: options[:skip_confirm],
       create_gh_release: options[:create_gh_release],
-      beta_release: true)
+      beta_release: true
+    )
   end
 
   #####################################################################################
@@ -346,12 +339,13 @@ end
   # bundle exec fastlane build_and_upload_stable_release skip_confirm:true
   # bundle exec fastlane build_and_upload_stable_release create_gh_release:true
   #####################################################################################
-  desc "Builds and uploads a stable release for distribution"
-  lane :build_and_upload_stable_release do | options |
+  desc 'Builds and uploads a stable release for distribution'
+  lane :build_and_upload_stable_release do |options|
     build_and_upload_release(
       skip_confirm: options[:skip_confirm],
       create_gh_release: options[:create_gh_release],
-      beta_release: false)
+      beta_release: false
+    )
   end
 
   #####################################################################################
@@ -368,17 +362,17 @@ end
   # bundle exec fastlane build_and_upload_release skip_confirm:true
   # bundle exec fastlane build_and_upload_release beta_release:true
   #####################################################################################
-  desc "Builds and uploads for distribution"
-  lane :build_and_upload_release do | options |
+  desc 'Builds and uploads for distribution'
+  lane :build_and_upload_release do |options|
     ios_build_prechecks(skip_confirm: options[:skip_confirm],
-      internal: false,
-      internal_on_single_version: options[:beta_release],
-      external: true)
+                        internal: false,
+                        internal_on_single_version: options[:beta_release],
+                        external: true)
 
-    ios_build_preflight()
+    ios_build_preflight
     build_and_upload_internal(skip_prechecks: true, skip_confirm: options[:skip_confirm]) if options[:beta_release]
     build_and_upload_to_app_store_connect(skip_prechecks: true, skip_confirm: options[:skip_confirm],
-                         beta_release: options[:beta_release], create_release: options[:create_gh_release])
+                                          beta_release: options[:beta_release], create_release: options[:create_gh_release])
   end
 
   #####################################################################################
@@ -393,23 +387,23 @@ end
   # bundle exec fastlane build_and_upload_internal
   # bundle exec fastlane build_and_upload_internal skip_confirm:true
   #####################################################################################
-  desc "Builds and updates for distribution"
-  lane :build_and_upload_internal do | options |
-    ios_build_prechecks(skip_confirm: options[:skip_confirm], internal: false) unless (options[:skip_prechecks])
-    ios_build_preflight() unless (options[:skip_prechecks])
+  desc 'Builds and updates for distribution'
+  lane :build_and_upload_internal do |options|
+    ios_build_prechecks(skip_confirm: options[:skip_confirm], internal: false) unless options[:skip_prechecks]
+    ios_build_preflight unless options[:skip_prechecks]
 
     internal_code_signing
 
     gym(
-      scheme: "Simplenote",
-      configuration: "Distribution Internal",
-      workspace: "Simplenote.xcworkspace",
-      export_method: "enterprise",
+      scheme: 'Simplenote',
+      configuration: 'Distribution Internal',
+      workspace: 'Simplenote.xcworkspace',
+      export_method: 'enterprise',
       clean: true,
       output_directory: OUTPUT_DIRECTORY_PATH,
-      export_team_id: ENV["INT_EXPORT_TEAM_ID"],
+      export_team_id: ENV.fetch('INT_EXPORT_TEAM_ID', nil),
       export_options: {
-        method: "enterprise",
+        method: 'enterprise',
         provisioningProfiles: simplenote_provisioning_profiles(
           root_bundle_id: "#{APP_STORE_BUNDLE_IDENTIFIER}.Internal",
           match_type: 'InHouse'
@@ -420,16 +414,16 @@ end
     File.rename(File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote.ipa'), File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote Internal.ipa'))
 
     appcenter_upload(
-      api_token: ENV["APPCENTER_API_TOKEN"],
-      owner_name: "automattic",
-      owner_type: "organization",
-      app_name: "Simplenote",
+      api_token: ENV.fetch('APPCENTER_API_TOKEN', nil),
+      owner_name: 'automattic',
+      owner_type: 'organization',
+      app_name: 'Simplenote',
       file: File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote Internal.ipa'),
       notify_testers: false
     )
 
     sentry_upload_dsym(
-      auth_token: ENV["SENTRY_AUTH_TOKEN"],
+      auth_token: ENV.fetch('SENTRY_AUTH_TOKEN', nil),
       org_slug: 'a8c',
       project_slug: 'simplenote-ios',
       dsym_path: lane_context[SharedValues::DSYM_OUTPUT_PATH]
@@ -448,21 +442,21 @@ end
   # bundle exec fastlane build_and_upload_to_app_store_connect
   # bundle exec fastlane build_and_upload_to_app_store_connect skip_confirm:true
   #####################################################################################
-  desc "Builds and uploads for distribution"
-  lane :build_and_upload_to_app_store_connect do | options |
-    ios_build_prechecks(skip_confirm: options[:skip_confirm], external: true) unless (options[:skip_prechecks])
-    ios_build_preflight() unless (options[:skip_prechecks])
+  desc 'Builds and uploads for distribution'
+  lane :build_and_upload_to_app_store_connect do |options|
+    ios_build_prechecks(skip_confirm: options[:skip_confirm], external: true) unless options[:skip_prechecks]
+    ios_build_preflight unless options[:skip_prechecks]
 
     appstore_code_signing
 
     gym(
-      scheme: "Simplenote",
-      workspace: "Simplenote.xcworkspace",
-      configuration: "Distribution AppStore",
+      scheme: 'Simplenote',
+      workspace: 'Simplenote.xcworkspace',
+      configuration: 'Distribution AppStore',
       clean: true,
       export_options: {
-        method: "app-store",
-        export_team_id: ENV["EXT_EXPORT_TEAM_ID"],
+        method: 'app-store',
+        export_team_id: ENV.fetch('EXT_EXPORT_TEAM_ID', nil),
         provisioningProfiles: simplenote_provisioning_profiles
       }
     )
@@ -472,29 +466,28 @@ end
       api_key_path: APP_STORE_CONNECT_KEY_PATH
     )
 
-    sh("rm ../Simplenote.ipa")
-    dSYM_PATH = File.dirname(Dir.pwd) + "/Simplenote.app.dSYM.zip"
+    sh('rm ../Simplenote.ipa')
+    dSYM_PATH = File.dirname(Dir.pwd) + '/Simplenote.app.dSYM.zip'
 
     sentry_upload_dsym(
       dsym_path: dSYM_PATH,
-      auth_token: ENV["SENTRY_AUTH_TOKEN"],
+      auth_token: ENV.fetch('SENTRY_AUTH_TOKEN', nil),
       org_slug: 'a8c',
-      project_slug: 'simplenote-ios',
+      project_slug: 'simplenote-ios'
     )
 
     sh("rm #{dSYM_PATH}")
 
-    if (options[:create_release])
-      archive_zip_path = File.dirname(Dir.pwd) + "/Simplenote.xarchive.zip"
+    if options[:create_release]
+      archive_zip_path = File.dirname(Dir.pwd) + '/Simplenote.xarchive.zip'
       zip(path: lane_context[SharedValues::XCODEBUILD_ARCHIVE], output_path: archive_zip_path)
 
       version = options[:beta_release] ? ios_get_build_version : ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
-      create_release(repository:GHHELPER_REPO,
-        version: version,
-        release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt'),
-        release_assets: archive_zip_path.to_s,
-        prerelease: options[:beta_release]
-      )
+      create_release(repository: GHHELPER_REPO,
+                     version: version,
+                     release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt'),
+                     release_assets: archive_zip_path.to_s,
+                     prerelease: options[:beta_release])
 
       sh("rm #{archive_zip_path}")
     end
@@ -566,8 +559,8 @@ end
   # Example:
   # bundle exec fastlane build_and_upload_installable_build
   #####################################################################################
-  desc "Builds and uploads an installable build"
-  lane :build_and_upload_installable_build do | options |
+  desc 'Builds and uploads an installable build'
+  lane :build_and_upload_installable_build do |_options|
     alpha_code_signing
 
     # Get the current build version, and update it if needed
@@ -575,15 +568,15 @@ end
     apply_build_number(build_number)
 
     gym(
-      scheme: "Simplenote",
-      configuration: "Distribution Alpha",
-      workspace: "Simplenote.xcworkspace",
-      export_method: "enterprise",
+      scheme: 'Simplenote',
+      configuration: 'Distribution Alpha',
+      workspace: 'Simplenote.xcworkspace',
+      export_method: 'enterprise',
       clean: true,
       output_directory: OUTPUT_DIRECTORY_PATH,
-      export_team_id: ENV["INT_EXPORT_TEAM_ID"],
+      export_team_id: ENV.fetch('INT_EXPORT_TEAM_ID', nil),
       export_options: {
-        method: "enterprise",
+        method: 'enterprise',
         provisioningProfiles: simplenote_provisioning_profiles(
           root_bundle_id: "#{APP_STORE_BUNDLE_IDENTIFIER}.Alpha",
           match_type: 'InHouse'
@@ -594,17 +587,17 @@ end
     File.rename(File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote.ipa'), File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote Alpha.ipa'))
 
     appcenter_upload(
-      api_token: get_required_env("APPCENTER_API_TOKEN"),
-      owner_name: "automattic",
-      owner_type: "organization",
-      app_name: "Simplenote-Installable-Builds",
+      api_token: get_required_env('APPCENTER_API_TOKEN'),
+      owner_name: 'automattic',
+      owner_type: 'organization',
+      app_name: 'Simplenote-Installable-Builds',
       file: File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote Alpha.ipa'),
-      destinations: "All-Users-of-Simplenote-Installable-Builds",
+      destinations: 'All-Users-of-Simplenote-Installable-Builds',
       notify_testers: false
     )
 
     sentry_upload_dsym(
-      auth_token: get_required_env("SENTRY_AUTH_TOKEN"),
+      auth_token: get_required_env('SENTRY_AUTH_TOKEN'),
       org_slug: 'a8c',
       project_slug: 'simplenote-ios',
       dsym_path: lane_context[SharedValues::DSYM_OUTPUT_PATH]
@@ -663,7 +656,7 @@ end
   # On the other hand, right now Simplenote only needs one locale, so we might
   # as well keep using this on CI too. We still benefit from not having to
   # rebuild the app just to take the screenshots in light vs dark mode.
-  desc "Walk through the app taking screenshots."
+  desc 'Walk through the app taking screenshots.'
   lane :take_screenshots do |options|
     build_app_for_screenshots(options)
 
@@ -677,22 +670,22 @@ end
     )
   end
 
-  desc "Build the binaries to run to take the screenshots"
+  desc 'Build the binaries to run to take the screenshots'
   lane :build_app_for_screenshots do
     scan(
       workspace: workspace_path,
       scheme: screenshots_scheme,
       build_for_testing: true,
-      derived_data_path: derived_data_directory,
+      derived_data_path: derived_data_directory
     )
   end
 
-  desc "Runs through the app taking screenshots, using a prebuilt binary"
+  desc 'Runs through the app taking screenshots, using a prebuilt binary'
   lane :take_screenshots_from_app do |options|
-    devices = (options[:devices] || screenshot_devices).split(',').flatten()
+    devices = (options[:devices] || screenshot_devices).split(',').flatten
 
     languages = [
-      "en-US"
+      'en-US'
     ]
 
     # Erase the Simulators between runs in order to get everything back to a
@@ -738,20 +731,20 @@ end
       concurrent_simulators: false,
 
       # Allow the caller to invoke dark mode
-      dark_mode: options[:mode].to_s.downcase == "dark"
+      dark_mode: options[:mode].to_s.downcase == 'dark'
     )
   end
 
   lane :create_promo_screenshots do |options|
-    unless Fastlane::Helper::GitHelper.has_git_lfs then
-      UI.user_error!("Git LFS not enabled – Unable to generate promo screenshots. Run `git lfs install && git lfs fetch && git lfs pull` to fix this.")
+    unless Fastlane::Helper::GitHelper.has_git_lfs
+      UI.user_error!('Git LFS not enabled – Unable to generate promo screenshots. Run `git lfs install && git lfs fetch && git lfs pull` to fix this.')
     end
 
     # This value is defined in style.css. It would be good if there was a way
     # to make it parametric, so that if we update the CSS we don't risk this
     # getting out of sync.
-    font_name = "SourceSansPro-Regular.ttf"
-    user_font_directory = File.join(Dir.home, "Library/Fonts")
+    font_name = 'SourceSansPro-Regular.ttf'
+    user_font_directory = File.join(Dir.home, 'Library/Fonts')
     user_font_path = File.join(user_font_directory, font_name)
     if File.exist?(user_font_path)
       UI.success("Custom font #{font_name} already installed locally.")
@@ -763,13 +756,13 @@ end
 
     promo_screenshots(
       orig_folder: options[:source] || screenshots_directory,
-      metadata_folder: File.join(Dir.pwd, "metadata"),
+      metadata_folder: File.join(Dir.pwd, 'metadata'),
       output_folder: promo_screenshots_directory,
       force: options[:force] || true
     )
   end
 
-  desc "Rebuild Screenshot Devices"
+  desc 'Rebuild Screenshot Devices'
   lane :rebuild_screenshot_devices do |options|
     require 'simctl'
 
@@ -779,18 +772,19 @@ end
     device_names = (options[:devices] || screenshot_devices).split(',').flatten
     sim_version = options[:simulator_version] || simulator_version
 
-    SimCtl.list_devices.each { |device|
+    SimCtl.list_devices.each do |device|
       next unless device_names.include? device.name
+
       UI.message("Deleting #{device.name} because it already exists.")
       device.delete
-    }
+    end
 
-    device_names.each { |device|
+    device_names.each do |device|
       runtime = SimCtl.runtime(name: "iOS #{sim_version}")
       devicetype = SimCtl.devicetype(name: device)
 
       SimCtl.create_device device, devicetype, runtime
-    }
+    end
   end
 
   #####################################################################################
@@ -812,12 +806,12 @@ end
   # Example:
   # bundle exec fastlane test device:"iPhone 14"
   #####################################################################################
-  desc "Run Unit Tests"
-  lane :run_unit_tests do | options |
+  desc 'Run Unit Tests'
+  lane :run_unit_tests do |options|
     scan(
       workspace: workspace_name,
       scheme: 'Simplenote',
-      device: options[:device] || "iPhone 14",
+      device: options[:device] || 'iPhone 14',
       output_directory: OUTPUT_DIRECTORY_PATH,
       reset_simulator: true,
       result_bundle: true
@@ -836,12 +830,12 @@ end
   # Example:
   # bundle exec fastlane run_ui_tests scheme:"SimplenoteUITests_Subset" device:"iPhone 14" test_account:"test.account@test.com"
   #####################################################################################
-  desc "Run UI tests"
-  lane :run_ui_tests do | options |
+  desc 'Run UI tests'
+  lane :run_ui_tests do |options|
     scan(
       workspace: workspace_name,
-      scheme: options[:scheme] || "SimplenoteUITests_Subset",
-      device: options[:device] || "iPhone 14",
+      scheme: options[:scheme] || 'SimplenoteUITests_Subset',
+      device: options[:device] || 'iPhone 14',
       output_directory: OUTPUT_DIRECTORY_PATH,
       reset_simulator: true,
       xcargs: { UI_TEST_ACCOUNT: options[:test_account] || '' },
@@ -861,15 +855,15 @@ end
   # Example:
   # bundle exec fastlane pick_test_account_and_run_ui_tests device:"iPhone 14"
   #####################################################################################
-  desc "Occupy a free test account and run UI tests with it"
-  lane :pick_test_account_and_run_ui_tests do | options |
+  desc 'Occupy a free test account and run UI tests with it'
+  lane :pick_test_account_and_run_ui_tests do |options|
     if is_ci
       sanitize_test_accounts
       find_free_test_account
-      run_ui_tests(options.merge({ test_account: get_required_env("UI_TESTS_ACCOUNT_EMAIL").sub("X", $used_test_account_index.to_s)}))
+      run_ui_tests(options.merge({ test_account: get_required_env('UI_TESTS_ACCOUNT_EMAIL').sub('X', $used_test_account_index.to_s) }))
       deoccupy_test_account
     else
-      UI.user_error!("This lane should be run only from CI")
+      UI.user_error!('This lane should be run only from CI')
     end
   end
 
@@ -925,80 +919,80 @@ end
 ########################################################################
 # Configure Lanes
 ########################################################################
-  #####################################################################################
-  # update_certs_and_profiles
-  # -----------------------------------------------------------------------------------
-  # This lane downloads all the required certs and profiles and,
-  # if not run on CI it creates the missing ones.
-  # -----------------------------------------------------------------------------------
-  # Usage:
-  # bundle exec fastlane update_certs_and_profiles
-  #
-  # Example:
-  # bundle exec fastlane update_certs_and_profiles
-  #####################################################################################
-  lane :update_certs_and_profiles do | options |
-    alpha_code_signing
-    internal_code_signing
-    appstore_code_signing
-  end
+#####################################################################################
+# update_certs_and_profiles
+# -----------------------------------------------------------------------------------
+# This lane downloads all the required certs and profiles and,
+# if not run on CI it creates the missing ones.
+# -----------------------------------------------------------------------------------
+# Usage:
+# bundle exec fastlane update_certs_and_profiles
+#
+# Example:
+# bundle exec fastlane update_certs_and_profiles
+#####################################################################################
+lane :update_certs_and_profiles do |_options|
+  alpha_code_signing
+  internal_code_signing
+  appstore_code_signing
+end
 
 ########################################################################
 # Fastlane match code signing
 ########################################################################
 
-  private_lane :alpha_code_signing do |options|
-    match(
-      type: "enterprise",
-      team_id: get_required_env("INT_EXPORT_TEAM_ID"),
-      readonly: options[:readonly] || is_ci,
-      app_identifier: simplenote_app_identifiers(root_bundle_id: "#{APP_STORE_BUNDLE_IDENTIFIER}.Alpha")
-    )
-  end
+private_lane :alpha_code_signing do |options|
+  match(
+    type: 'enterprise',
+    team_id: get_required_env('INT_EXPORT_TEAM_ID'),
+    readonly: options[:readonly] || is_ci,
+    app_identifier: simplenote_app_identifiers(root_bundle_id: "#{APP_STORE_BUNDLE_IDENTIFIER}.Alpha")
+  )
+end
 
-  private_lane :internal_code_signing do |options|
-    match(
-      type: "enterprise",
-      team_id: get_required_env("INT_EXPORT_TEAM_ID"),
-      readonly: options[:readonly] || is_ci,
-      app_identifier: simplenote_app_identifiers(root_bundle_id: "#{APP_STORE_BUNDLE_IDENTIFIER}.Internal")
-    )
-  end
+private_lane :internal_code_signing do |options|
+  match(
+    type: 'enterprise',
+    team_id: get_required_env('INT_EXPORT_TEAM_ID'),
+    readonly: options[:readonly] || is_ci,
+    app_identifier: simplenote_app_identifiers(root_bundle_id: "#{APP_STORE_BUNDLE_IDENTIFIER}.Internal")
+  )
+end
 
-  private_lane :appstore_code_signing do |options|
-    match(
-      type: "appstore",
-      team_id: get_required_env("EXT_EXPORT_TEAM_ID"),
-      readonly: options[:readonly] || is_ci,
-      app_identifier: simplenote_app_identifiers,
-      template_name: "NotationalFlow Keychain Access (Distribution)",
-    )
-  end
+private_lane :appstore_code_signing do |options|
+  match(
+    type: 'appstore',
+    team_id: get_required_env('EXT_EXPORT_TEAM_ID'),
+    readonly: options[:readonly] || is_ci,
+    app_identifier: simplenote_app_identifiers,
+    template_name: 'NotationalFlow Keychain Access (Distribution)'
+  )
+end
 
-  # Compiles the array of bundle identifiers for the different targets that
-  # make up the Simplenote app, to be used as the `app_identifier` parameter
-  # for the `match` action.
-  def simplenote_app_identifiers(root_bundle_id: APP_STORE_BUNDLE_IDENTIFIER)
-    extension_bundle_ids =
-      %w[Share Widgets Intents]
-      .map { |suffix| "#{root_bundle_id}.#{suffix}" }
+# Compiles the array of bundle identifiers for the different targets that
+# make up the Simplenote app, to be used as the `app_identifier` parameter
+# for the `match` action.
+def simplenote_app_identifiers(root_bundle_id: APP_STORE_BUNDLE_IDENTIFIER)
+  extension_bundle_ids =
+    %w[Share Widgets Intents]
+    .map { |suffix| "#{root_bundle_id}.#{suffix}" }
 
-    [root_bundle_id, *extension_bundle_ids]
-  end
+  [root_bundle_id, *extension_bundle_ids]
+end
 
-  # Compiles the dictionary mapping of the bundle identifiers and provisioning
-  # profiles to be used in the `export_options > provisioningProfiles`
-  # parameter for the `build_app`/`gym` action.
-  def simplenote_provisioning_profiles(root_bundle_id: APP_STORE_BUNDLE_IDENTIFIER, match_type: 'AppStore')
-    # FIXME: replace the array below with the following call once established
-    # the impact of adding the mapping for the Widgets extension, which is
-    # something we haven't had up to this point.
-    #
-    # simplenote_app_identifiers(root_bundle_id: root_bundle_id)
-    [root_bundle_id, "#{root_bundle_id}.Share", "#{root_bundle_id}.Intents"]
-      .map { |key| [key, "match #{match_type} #{key}"] }
-      .to_h
-  end
+# Compiles the dictionary mapping of the bundle identifiers and provisioning
+# profiles to be used in the `export_options > provisioningProfiles`
+# parameter for the `build_app`/`gym` action.
+def simplenote_provisioning_profiles(root_bundle_id: APP_STORE_BUNDLE_IDENTIFIER, match_type: 'AppStore')
+  # FIXME: replace the array below with the following call once established
+  # the impact of adding the mapping for the Widgets extension, which is
+  # something we haven't had up to this point.
+  #
+  # simplenote_app_identifiers(root_bundle_id: root_bundle_id)
+  [root_bundle_id, "#{root_bundle_id}.Share", "#{root_bundle_id}.Intents"]
+    .map { |key| [key, "match #{match_type} #{key}"] }
+    .to_h
+end
 
 ########################################################################
 # Localization Lanes
@@ -1011,7 +1005,8 @@ lane :generate_strings_file_for_glotpress do
     paths: ['Simplenote/', 'SimplenoteIntents/', 'SimplenoteShare/',
             'SimplenoteWidgets/', 'Pods/Simperium/Simperium/',
             'Pods/Simperium/Simperium-iOS'],
-    output_dir: en_lproj_path)
+    output_dir: en_lproj_path
+  )
 
   git_commit(
     path: en_lproj_path,
@@ -1040,40 +1035,40 @@ def trigger_buildkite_release_build(branch:, beta:)
   )
 end
 
-def fastlane_directory()
-  File.expand_path File.dirname(__FILE__)
+def fastlane_directory
+  __dir__
 end
 
 def derived_data_directory
-  File.join(fastlane_directory, "DerivedData")
+  File.join(fastlane_directory, 'DerivedData')
 end
 
 def workspace_name
-  "Simplenote.xcworkspace"
+  'Simplenote.xcworkspace'
 end
 
 def screenshots_scheme
-  "SimplenoteScreenshots"
+  'SimplenoteScreenshots'
 end
 
 def workspace_path
   File.join(fastlane_directory, "../#{workspace_name}")
 end
 
-def screenshots_directory()
-  File.join(fastlane_directory, "screenshots")
+def screenshots_directory
+  File.join(fastlane_directory, 'screenshots')
 end
 
 def promo_screenshots_directory
-  File.join(fastlane_directory, "promo_screenshots")
+  File.join(fastlane_directory, 'promo_screenshots')
 end
 
-def screenshot_devices()
+def screenshot_devices
   [
-    "iPhone X",
-    "iPhone 8",
-    "iPad Pro (12.9-inch) (2nd generation)",
-    "iPad Pro (12.9-inch) (3rd generation)",
+    'iPhone X',
+    'iPhone 8',
+    'iPad Pro (12.9-inch) (2nd generation)',
+    'iPad Pro (12.9-inch) (3rd generation)'
   ]
 end
 
@@ -1082,9 +1077,10 @@ def simulator_version
 end
 
 def deoccupy_test_account
-  return if $used_test_account_index == nil
+  return if $used_test_account_index.nil?
+
   UI.message("Freeing used test account #{$used_test_account_index}")
-  change_test_account_availability("free")
+  change_test_account_availability('free')
   $used_test_account_index = nil
 end
 
@@ -1095,7 +1091,7 @@ end
 #   get_test_accounts_hash
 #     => {"0"=>"4079", "1"=>"free", "2"=>"free", "3"=>"free"}
 def get_test_accounts_hash
-  uri = URI.parse(get_required_env("UI_TESTS_ACCOUNTS_JSON_URL"))
+  uri = URI.parse(get_required_env('UI_TESTS_ACCOUNTS_JSON_URL'))
   response = Net::HTTP.get_response(uri)
   accounts_state = response.body.chomp
   JSON.parse(accounts_state)
@@ -1105,14 +1101,14 @@ end
 # Crashed fastlane if free account was not found.
 def find_free_test_account
   accounts_hash = get_test_accounts_hash
-  UI.message("Looking for a free test account...")
+  UI.message('Looking for a free test account...')
   UI.message("Accounts state: #{accounts_hash}")
 
   $used_test_account_index = accounts_hash.key('free')
 
-  UI.user_error!("Could not find free UI Test account. Quitting.") if $used_test_account_index.nil?
+  UI.user_error!('Could not find free UI Test account. Quitting.') if $used_test_account_index.nil?
   UI.message("Free account index: #{$used_test_account_index}")
-  change_test_account_availability("#{get_required_env("BUILDKITE_BUILD_NUMBER")}")
+  change_test_account_availability("#{get_required_env('BUILDKITE_BUILD_NUMBER')}")
 end
 
 # Replace a value in a key which is equal to $used_test_account_index global variable
@@ -1130,39 +1126,38 @@ end
 
 def sanitize_test_accounts
   accounts_hash = get_test_accounts_hash
-  UI.message("Sanitizing stale test accounts...")
+  UI.message('Sanitizing stale test accounts...')
   UI.message("Accounts before sanitizing: #{accounts_hash}")
 
   accounts_hash.each do |key, value|
-    next if value == "free" || is_job_running(value)
-    accounts_hash[key] = "free"
+    next if value == 'free' || is_job_running(value)
+
+    accounts_hash[key] = 'free'
     submit_accounts_hash(accounts_hash)
   end
 end
 
 def is_job_running(job_number)
-  begin
-    client = Buildkit.new(token: get_required_env('BUILDKITE_TOKEN'))
-    build = client.build('automattic', 'simplenote-ios', job_number)
+  client = Buildkit.new(token: get_required_env('BUILDKITE_TOKEN'))
+  build = client.build('automattic', 'simplenote-ios', job_number)
 
-    state = build['state']
+  state = build['state']
 
-    UI.message("Status of Job Number #{job_number} is #{state}")
+  UI.message("Status of Job Number #{job_number} is #{state}")
 
-    build['state'] == 'running'
-  rescue
-    false
-  end
+  build['state'] == 'running'
+rescue StandardError
+  false
 end
 
 def submit_accounts_hash(accounts_hash)
   UI.message("Writing new accounts state: #{accounts_hash}")
-  uri = URI.parse(get_required_env("UI_TESTS_ACCOUNTS_JSON_URL"))
+  uri = URI.parse(get_required_env('UI_TESTS_ACCOUNTS_JSON_URL'))
   request = Net::HTTP::Post.new(uri)
   request.body = accounts_hash.to_json
 
   req_options = {
-    use_ssl: uri.scheme == "https",
+    use_ssl: uri.scheme == 'https'
   }
 
   response = Net::HTTP.start(uri.hostname, uri.port, req_options) do |http|

From 3041cf959d62c9594fa83df34adc9cdccf534285 Mon Sep 17 00:00:00 2001
From: Ian Maia <ian.maia@automattic.com>
Date: Tue, 20 Feb 2024 16:54:00 +0100
Subject: [PATCH 036/547] Run RuboCop -A

---
 Podfile                          |  2 ++
 Rakefile                         | 13 ++++++++-----
 Scripts/extract_release_notes.rb |  2 ++
 Scripts/update-translations.rb   | 10 ++++++----
 fastlane/Fastfile                | 19 ++++++++++---------
 5 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/Podfile b/Podfile
index d9e7ff13e..d9dd0091f 100644
--- a/Podfile
+++ b/Podfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://cdn.cocoapods.org/'
 
 raise 'Please run CocoaPods via `bundle exec`' unless %w[BUNDLE_BIN_PATH BUNDLE_GEMFILE].any? { |k| ENV.key?(k) }
diff --git a/Rakefile b/Rakefile
index 556dd6342..3f9ce58f7 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+require 'English'
 SWIFTLINT_VERSION = '0.41.0'
 XCODE_WORKSPACE = 'Simplenote.xcworkspace'
 XCODE_SCHEME = 'Simplenote'
@@ -107,7 +110,7 @@ namespace :dependencies do
             Dir.chdir(tmpdir) do
               sh "git checkout --quiet #{SWIFTLINT_VERSION}"
               sh 'git submodule --quiet update --init --recursive'
-              FileUtils.remove_entry_secure(swiftlint_path) if Dir.exist?(swiftlint_path)
+              FileUtils.rm_rf(swiftlint_path)
               FileUtils.mkdir_p(swiftlint_path)
               sh "make prefix_install PREFIX='#{swiftlint_path}'"
             end
@@ -173,8 +176,8 @@ namespace :git do
       source = hook_source(hook)
       backup = hook_backup(hook)
 
-      next if File.symlink?(target) and File.readlink(target) == source
-      next if File.file?(target) and File.identical?(target, source)
+      next if File.symlink?(target) && (File.readlink(target) == source)
+      next if File.file?(target) && File.identical?(target, source)
 
       if File.exist?(target)
         puts "Existing hook for #{hook}. Creating backup at #{target} -> #{backup}"
@@ -192,7 +195,7 @@ namespace :git do
       source = hook_source(hook)
       backup = hook_backup(hook)
 
-      next unless File.symlink?(target) and File.readlink(target) == source
+      next unless File.symlink?(target) && (File.readlink(target) == source)
 
       puts "Removing hook for #{hook}"
       File.unlink(target)
@@ -220,7 +223,7 @@ namespace :git do
   task pre_commit: %(dependencies:lint:check) do
     swiftlint %w[lint --quiet --strict]
   rescue StandardError
-    exit $?.exitstatus
+    exit $CHILD_STATUS.exitstatus
   end
 
   task :post_merge do
diff --git a/Scripts/extract_release_notes.rb b/Scripts/extract_release_notes.rb
index 52a29db5a..2cfd40ae5 100644
--- a/Scripts/extract_release_notes.rb
+++ b/Scripts/extract_release_notes.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Parses the release notes file to extract the current version information and
 # puts it to STDOUT.
 #
diff --git a/Scripts/update-translations.rb b/Scripts/update-translations.rb
index 425d9e71d..2a3b11a30 100755
--- a/Scripts/update-translations.rb
+++ b/Scripts/update-translations.rb
@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 # Supported languages:
 # ar,cy,zh-Hans,zh-Hant,nl,fa,fr,de,el,he,id,ko,pt,ru,es,sv,tr,ja,it
 # * Arabic
@@ -47,7 +49,7 @@
   'tr' => 'tr',         # Turkish
   'zh-cn' => 'zh-Hans-CN', # Chinese (China)
   'zh-tw' => 'zh-Hant-TW' # Chinese (Taiwan)
-}
+}.freeze
 
 def copy_header(target_file, trans_strings)
   trans_strings.each_line do |line|
@@ -72,9 +74,9 @@ def copy_comment(f, trans_strings, value)
 end
 
 langs = {}
-if ARGV.count > 0
-  for key in ARGV
-    unless local = ALL_LANGS[key]
+if ARGV.count.positive?
+  ARGV.each do |key|
+    unless (local = ALL_LANGS[key])
       puts "Unknown language #{key}"
       exit 1
     end
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 554351855..6386aa6c5 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 default_platform(:ios)
 fastlane_require 'xcodeproj'
 fastlane_require 'dotenv'
@@ -55,7 +57,7 @@ platform :ios do
   ENV['DOWNLOAD_METADATA'] = './fastlane/download_metadata.swift'
   ENV['FL_RELEASE_TOOLKIT_DEFAULT_BRANCH'] = 'trunk'
   REPOSITORY_NAME = 'simplenote-ios'
-  APP_STORE_BUNDLE_IDENTIFIER = 'com.codality.NotationalFlow'.freeze
+  APP_STORE_BUNDLE_IDENTIFIER = 'com.codality.NotationalFlow'
 
   # List of locales used for the app strings (GlotPress code => `*.lproj` folder name`)
   #
@@ -107,7 +109,7 @@ platform :ios do
   #####################################################################################
   desc 'Creates a new release branch from the current trunk'
   lane :code_freeze do |options|
-    old_version = ios_codefreeze_prechecks(options)
+    ios_codefreeze_prechecks(options)
 
     ios_bump_version_release
     new_version = ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
@@ -149,7 +151,7 @@ platform :ios do
     }
 
     ios_update_metadata_source(
-      po_file_path: prj_folder + '/Simplenote/Resources/AppStoreStrings.pot',
+      po_file_path: "#{prj_folder}/Simplenote/Resources/AppStoreStrings.pot",
       source_files: files,
       release_version: options[:version]
     )
@@ -467,7 +469,7 @@ platform :ios do
     )
 
     sh('rm ../Simplenote.ipa')
-    dSYM_PATH = File.dirname(Dir.pwd) + '/Simplenote.app.dSYM.zip'
+    dSYM_PATH = "#{File.dirname(Dir.pwd)}/Simplenote.app.dSYM.zip"
 
     sentry_upload_dsym(
       dsym_path: dSYM_PATH,
@@ -479,7 +481,7 @@ platform :ios do
     sh("rm #{dSYM_PATH}")
 
     if options[:create_release]
-      archive_zip_path = File.dirname(Dir.pwd) + '/Simplenote.xarchive.zip'
+      archive_zip_path = "#{File.dirname(Dir.pwd)}/Simplenote.xarchive.zip"
       zip(path: lane_context[SharedValues::XCODEBUILD_ARCHIVE], output_path: archive_zip_path)
 
       version = options[:beta_release] ? ios_get_build_version : ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
@@ -990,8 +992,7 @@ def simplenote_provisioning_profiles(root_bundle_id: APP_STORE_BUNDLE_IDENTIFIER
   #
   # simplenote_app_identifiers(root_bundle_id: root_bundle_id)
   [root_bundle_id, "#{root_bundle_id}.Share", "#{root_bundle_id}.Intents"]
-    .map { |key| [key, "match #{match_type} #{key}"] }
-    .to_h
+    .to_h { |key| [key, "match #{match_type} #{key}"] }
 end
 
 ########################################################################
@@ -1108,7 +1109,7 @@ def find_free_test_account
 
   UI.user_error!('Could not find free UI Test account. Quitting.') if $used_test_account_index.nil?
   UI.message("Free account index: #{$used_test_account_index}")
-  change_test_account_availability("#{get_required_env('BUILDKITE_BUILD_NUMBER')}")
+  change_test_account_availability(get_required_env('BUILDKITE_BUILD_NUMBER').to_s)
 end
 
 # Replace a value in a key which is equal to $used_test_account_index global variable
@@ -1160,7 +1161,7 @@ def submit_accounts_hash(accounts_hash)
     use_ssl: uri.scheme == 'https'
   }
 
-  response = Net::HTTP.start(uri.hostname, uri.port, req_options) do |http|
+  Net::HTTP.start(uri.hostname, uri.port, req_options) do |http|
     http.request(request)
   end
 

From 8976795822dc903f804dadaddc9f7d3620713219 Mon Sep 17 00:00:00 2001
From: Ian Maia <ian.maia@automattic.com>
Date: Tue, 20 Feb 2024 19:19:27 +0100
Subject: [PATCH 037/547] Fix some RuboCop violations manually

---
 Rakefile          |  8 ++++----
 fastlane/Fastfile | 22 +++++++++++-----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Rakefile b/Rakefile
index 3f9ce58f7..3fc87114e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -241,12 +241,12 @@ task xcode: [:dependencies] do
 end
 
 def fold(label)
-  puts "travis_fold:start:#{label}" if is_travis?
+  puts "travis_fold:start:#{label}" if travis?
   yield
-  puts "travis_fold:end:#{label}" if is_travis?
+  puts "travis_fold:end:#{label}" if travis?
 end
 
-def is_travis?
+def travis?
   !ENV['TRAVIS'].nil?
 end
 
@@ -322,7 +322,7 @@ def check_dependencies_hook
   ENV['DRY_RUN'] = '1'
   begin
     Rake::Task['dependencies'].invoke
-  rescue Exception => e
+  rescue StandardError => e
     puts e.message
     exit 1
   end
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 6386aa6c5..54a897b55 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -469,16 +469,16 @@ platform :ios do
     )
 
     sh('rm ../Simplenote.ipa')
-    dSYM_PATH = "#{File.dirname(Dir.pwd)}/Simplenote.app.dSYM.zip"
+    dsym_path = "#{File.dirname(Dir.pwd)}/Simplenote.app.dSYM.zip"
 
     sentry_upload_dsym(
-      dsym_path: dSYM_PATH,
+      dsym_path: dsym_path,
       auth_token: ENV.fetch('SENTRY_AUTH_TOKEN', nil),
       org_slug: 'a8c',
       project_slug: 'simplenote-ios'
     )
 
-    sh("rm #{dSYM_PATH}")
+    sh("rm #{dsym_path}")
 
     if options[:create_release]
       archive_zip_path = "#{File.dirname(Dir.pwd)}/Simplenote.xarchive.zip"
@@ -1089,9 +1089,9 @@ end
 # the account index, and values are either "free" or BUILDKITE_BUILD_NUMBER, in case if account
 # was occupied by a build. Returns the hash.
 # Example:
-#   get_test_accounts_hash
+#   fetch_test_accounts_hash
 #     => {"0"=>"4079", "1"=>"free", "2"=>"free", "3"=>"free"}
-def get_test_accounts_hash
+def fetch_test_accounts_hash
   uri = URI.parse(get_required_env('UI_TESTS_ACCOUNTS_JSON_URL'))
   response = Net::HTTP.get_response(uri)
   accounts_state = response.body.chomp
@@ -1101,7 +1101,7 @@ end
 # Finds the index of first free account in accounts hash, and marks it as accupied by current build.
 # Crashed fastlane if free account was not found.
 def find_free_test_account
-  accounts_hash = get_test_accounts_hash
+  accounts_hash = fetch_test_accounts_hash
   UI.message('Looking for a free test account...')
   UI.message("Accounts state: #{accounts_hash}")
 
@@ -1120,25 +1120,25 @@ end
 #   change_test_account_availability("4820")
 #     => {"0"=>"4820", "1"=>"free", "2"=>"free", "3"=>"free"}
 def change_test_account_availability(availability)
-  accounts_hash = get_test_accounts_hash
+  accounts_hash = fetch_test_accounts_hash
   accounts_hash[$used_test_account_index.to_s] = availability
   submit_accounts_hash(accounts_hash)
 end
 
 def sanitize_test_accounts
-  accounts_hash = get_test_accounts_hash
+  accounts_hash = fetch_test_accounts_hash
   UI.message('Sanitizing stale test accounts...')
   UI.message("Accounts before sanitizing: #{accounts_hash}")
 
   accounts_hash.each do |key, value|
-    next if value == 'free' || is_job_running(value)
+    next if value == 'free' || job_running?(value)
 
     accounts_hash[key] = 'free'
     submit_accounts_hash(accounts_hash)
   end
 end
 
-def is_job_running(job_number)
+def job_running?(job_number)
   client = Buildkit.new(token: get_required_env('BUILDKITE_TOKEN'))
   build = client.build('automattic', 'simplenote-ios', job_number)
 
@@ -1165,7 +1165,7 @@ def submit_accounts_hash(accounts_hash)
     http.request(request)
   end
 
-  UI.message("Accounts state after write: #{get_test_accounts_hash}")
+  UI.message("Accounts state after write: #{fetch_test_accounts_hash}")
 end
 
 def apply_build_number(build_number)

From cded6382d05cfc49eac38cfbe8317f8d968c6444 Mon Sep 17 00:00:00 2001
From: Ian Maia <ian.maia@automattic.com>
Date: Tue, 20 Feb 2024 19:19:43 +0100
Subject: [PATCH 038/547] Generate RuboCop TODO file

---
 .rubocop.yml      |  2 ++
 .rubocop_todo.yml | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 .rubocop_todo.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index ad146a0a1..cc096ac7b 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,3 +1,5 @@
+inherit_from: .rubocop_todo.yml
+
 AllCops:
   NewCops: enable
   SuggestExtensions:
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
new file mode 100644
index 000000000..3a2a1e13e
--- /dev/null
+++ b/.rubocop_todo.yml
@@ -0,0 +1,40 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2024-02-20 18:18:24 UTC using RuboCop version 1.60.2.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Exclude:
+    - 'fastlane/Fastfile'
+
+# Offense count: 6
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: enums
+Lint/ConstantDefinitionInBlock:
+  Exclude:
+    - 'fastlane/Fastfile'
+
+# Offense count: 2
+Lint/NonLocalExitFromIterator:
+  Exclude:
+    - 'Scripts/update-translations.rb'
+
+# Offense count: 1
+# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
+# AllowedNames: as, at, by, cc, db, id, if, in, io, ip, of, on, os, pp, to
+Naming/MethodParameterName:
+  Exclude:
+    - 'Scripts/update-translations.rb'
+
+# Offense count: 9
+# Configuration parameters: AllowedVariables.
+Style/GlobalVars:
+  Exclude:
+    - 'fastlane/Fastfile'

From 9c4d8f04e3b9da2fca8c289c6057faa86a941411 Mon Sep 17 00:00:00 2001
From: Ian Maia <ian.maia@automattic.com>
Date: Tue, 20 Feb 2024 20:04:19 +0100
Subject: [PATCH 039/547] Update Podfile.lock

---
 Podfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Podfile.lock b/Podfile.lock
index e590a298d..e7d572490 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -47,6 +47,6 @@ SPEC CHECKSUMS:
   WordPress-Ratings-iOS: 9f83dbba6e728c5121b1fd21b5683cf2fd120646
   ZIPFoundation: 063163dc828bf699c5be160eb4f58f676322d94f
 
-PODFILE CHECKSUM: 0663a4b2a1777f0957be7a40d3b2f7bf92a7fb64
+PODFILE CHECKSUM: 0310d57af0efbf50954ff46d578bc70b455981c4
 
 COCOAPODS: 1.14.1

From 7f20135d99fa7e9df8c5b162db55df1f77c4f8f3 Mon Sep 17 00:00:00 2001
From: Ian Maia <ian.maia@automattic.com>
Date: Tue, 20 Feb 2024 20:11:35 +0100
Subject: [PATCH 040/547] Add Ruby as platform for dependencies

---
 Gemfile.lock | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Gemfile.lock b/Gemfile.lock
index a17c35f6a..5999fee29 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -405,6 +405,7 @@ PLATFORMS
   arm64-darwin-21
   arm64-darwin-22
   arm64-darwin-23
+  ruby
 
 DEPENDENCIES
   cocoapods (~> 1.14)

From 9da2ad72e67160065ae3198ebcea8eb8b8b30360 Mon Sep 17 00:00:00 2001
From: Ian Maia <ian.maia@automattic.com>
Date: Mon, 26 Feb 2024 19:14:21 +0100
Subject: [PATCH 041/547] Configure SwiftLint on CI

---
 .buildkite/pipeline.yml      | 14 +++++++++++++-
 .buildkite/release-build.yml |  2 +-
 .swiftlint.yml               |  8 ++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 9acc5b91b..2105546bf 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -2,7 +2,7 @@
 common_params:
   # Common plugin settings to use with the `plugins` key.
   - &common_plugins
-    - automattic/a8c-ci-toolkit#3.0.1
+    - automattic/a8c-ci-toolkit#3.1.0
   # Common environment values to use with the `env` key.
   - &common_env
     IMAGE_ID: xcode-15.1
@@ -20,6 +20,18 @@ steps:
     artifact_paths:
       - "build/results/*"
 
+  #################
+  # Linters
+  #################
+  - label: ":swift: SwiftLint"
+    command: run_swiftlint --strict
+    plugins: *common_plugins
+    notify:
+      - github_commit_status:
+          context: "SwiftLint"
+    agents:
+      queue: "default"
+
   #################
   # Create Installable Build
   #################
diff --git a/.buildkite/release-build.yml b/.buildkite/release-build.yml
index 085d1bcf6..f728cdcb0 100644
--- a/.buildkite/release-build.yml
+++ b/.buildkite/release-build.yml
@@ -4,7 +4,7 @@
 common_params:
   # Common plugin settings to use with the `plugins` key.
   - &common_plugins
-    - automattic/a8c-ci-toolkit#3.0.1
+    - automattic/a8c-ci-toolkit#3.1.0
   # Common environment values to use with the `env` key.
   - &common_env
     IMAGE_ID: xcode-15.1
diff --git a/.swiftlint.yml b/.swiftlint.yml
index 604062415..cf03a5a91 100644
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@@ -1,3 +1,5 @@
+swiftlint_version: 0.54.0
+
 # Project configuration
 excluded:
   - Pods
@@ -15,6 +17,10 @@ only_rules:
   # if,for,while,do statements shouldn't wrap their conditionals in parentheses.
   - control_statement
 
+  - discarded_notification_center_observer
+
+  - duplicate_imports
+
   # Arguments can be omitted when matching enums with associated types if they
   # are not used.
   - empty_enum_arguments
@@ -38,6 +44,8 @@ only_rules:
   # Lines should not have trailing whitespace.
   - trailing_whitespace
 
+  - vertical_whitespace
+
   - custom_rules
 
 # Rules configuration

From 175001b698fe386f495b15eed21cad7db8a37b93 Mon Sep 17 00:00:00 2001
From: Ian Maia <ian.maia@automattic.com>
Date: Mon, 26 Feb 2024 19:48:58 +0100
Subject: [PATCH 042/547] Configure SwiftLint via Podfile

---
 Podfile      | 14 ++++++++++++++
 Podfile.lock |  6 +++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/Podfile b/Podfile
index d9dd0091f..d6548d74f 100644
--- a/Podfile
+++ b/Podfile
@@ -43,6 +43,20 @@ abstract_target 'Automattic' do
   end
 end
 
+## Tools
+## ===================
+##
+
+def swiftlint_version
+  require 'yaml'
+
+  YAML.load_file('.swiftlint.yml')['swiftlint_version']
+end
+
+abstract_target 'Tools' do
+  pod 'SwiftLint', swiftlint_version
+end
+
 # Post Install
 #
 post_install do |installer|
diff --git a/Podfile.lock b/Podfile.lock
index e7d572490..14f4c6907 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -21,6 +21,7 @@ PODS:
   - Simperium/SocketTrust (1.9.0)
   - Simperium/SPReachability (1.9.0)
   - Simperium/SSKeychain (1.9.0)
+  - SwiftLint (0.54.0)
   - WordPress-Ratings-iOS (0.0.2)
   - ZIPFoundation (0.9.15)
 
@@ -29,6 +30,7 @@ DEPENDENCIES:
   - AppCenter/Distribute (~> 4.4.3)
   - Gridicons (~> 0.18)
   - Simperium (= 1.9.0)
+  - SwiftLint (= 0.54.0)
   - WordPress-Ratings-iOS (= 0.0.2)
   - ZIPFoundation (~> 0.9.9)
 
@@ -37,6 +39,7 @@ SPEC REPOS:
     - AppCenter
     - Gridicons
     - Simperium
+    - SwiftLint
     - WordPress-Ratings-iOS
     - ZIPFoundation
 
@@ -44,9 +47,10 @@ SPEC CHECKSUMS:
   AppCenter: 3fd04aa1b166e16fdb03ec81dabe488aece83fbd
   Gridicons: dc92efbe5fd60111d2e8ea051d84a60cca552abc
   Simperium: 45d828d68aad71f3449371346f270013943eff78
+  SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211
   WordPress-Ratings-iOS: 9f83dbba6e728c5121b1fd21b5683cf2fd120646
   ZIPFoundation: 063163dc828bf699c5be160eb4f58f676322d94f
 
-PODFILE CHECKSUM: 0310d57af0efbf50954ff46d578bc70b455981c4
+PODFILE CHECKSUM: 6fc187e283b4fb7f9f4a0ef73a27632724c90845
 
 COCOAPODS: 1.14.1

From c3325747b2b22ee4c89a6f76af7685a1bce4e61b Mon Sep 17 00:00:00 2001
From: Ian Maia <ian.maia@automattic.com>
Date: Mon, 26 Feb 2024 19:50:37 +0100
Subject: [PATCH 043/547] Configure SwiftLint as a Build phase, removing Rake
 config

---
 Rakefile                             | 79 +---------------------------
 Scripts/swiftlint.sh                 | 54 -------------------
 Simplenote.xcodeproj/project.pbxproj |  2 +-
 3 files changed, 3 insertions(+), 132 deletions(-)
 delete mode 100755 Scripts/swiftlint.sh

diff --git a/Rakefile b/Rakefile
index 3fc87114e..090686846 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'English'
-SWIFTLINT_VERSION = '0.41.0'
 XCODE_WORKSPACE = 'Simplenote.xcworkspace'
 XCODE_SCHEME = 'Simplenote'
 XCODE_CONFIGURATION = 'Debug'
@@ -19,7 +18,7 @@ desc 'Install required dependencies'
 task dependencies: %w[dependencies:check]
 
 namespace :dependencies do
-  task check: %w[bundler:check bundle:check credentials:apply pod:check lint:check]
+  task check: %w[bundler:check bundle:check credentials:apply pod:check]
 
   namespace :bundler do
     task :check do
@@ -84,42 +83,6 @@ namespace :dependencies do
     end
     CLOBBER << 'Pods'
   end
-
-  namespace :lint do
-    task :check do
-      if swiftlint_needs_install
-        dependency_failed('SwiftLint')
-        Rake::Task['dependencies:lint:install'].invoke
-      end
-    end
-
-    task :install do
-      fold('install.swiftlint') do
-        puts "Installing SwiftLint #{SWIFTLINT_VERSION} into #{swiftlint_path}"
-        Dir.mktmpdir do |tmpdir|
-          # Try first using a binary release
-          zipfile = "#{tmpdir}/swiftlint-#{SWIFTLINT_VERSION}.zip"
-          sh "curl --fail --location -o #{zipfile} https://github.com/realm/SwiftLint/releases/download/#{SWIFTLINT_VERSION}/portable_swiftlint.zip || true"
-          if File.exist?(zipfile)
-            extracted_dir = "#{tmpdir}/swiftlint-#{SWIFTLINT_VERSION}"
-            sh "unzip #{zipfile} -d #{extracted_dir}"
-            FileUtils.mkdir_p("#{swiftlint_path}/bin")
-            FileUtils.cp("#{extracted_dir}/swiftlint", "#{swiftlint_path}/bin/swiftlint")
-          else
-            sh "git clone --quiet https://github.com/realm/SwiftLint.git #{tmpdir}"
-            Dir.chdir(tmpdir) do
-              sh "git checkout --quiet #{SWIFTLINT_VERSION}"
-              sh 'git submodule --quiet update --init --recursive'
-              FileUtils.rm_rf(swiftlint_path)
-              FileUtils.mkdir_p(swiftlint_path)
-              sh "make prefix_install PREFIX='#{swiftlint_path}'"
-            end
-          end
-        end
-      end
-    end
-    CLOBBER << 'vendor/swiftlint'
-  end
 end
 
 CLOBBER << 'vendor'
@@ -154,20 +117,8 @@ task :clean do
   xcodebuild(:clean)
 end
 
-desc 'Checks the source for style errors'
-task lint: %w[dependencies:lint:check] do
-  swiftlint %w[lint --quiet]
-end
-
-namespace :lint do
-  desc 'Automatically corrects style errors where possible'
-  task autocorrect: %w[dependencies:lint:check] do
-    swiftlint %w[autocorrect]
-  end
-end
-
 namespace :git do
-  hooks = %w[pre-commit post-checkout post-merge]
+  hooks = %w[post-checkout post-merge]
 
   desc 'Install git hooks'
   task :install_hooks do
@@ -220,12 +171,6 @@ namespace :git do
 end
 
 namespace :git do
-  task pre_commit: %(dependencies:lint:check) do
-    swiftlint %w[lint --quiet --strict]
-  rescue StandardError
-    exit $CHILD_STATUS.exitstatus
-  end
-
   task :post_merge do
     check_dependencies_hook
   end
@@ -266,26 +211,6 @@ def podfile_locked?
   podfile_checksum == lockfile_checksum
 end
 
-def swiftlint_path
-  "#{PROJECT_DIR}/vendor/swiftlint"
-end
-
-def swiftlint(args)
-  args = [swiftlint_bin] + args
-  sh(*args)
-end
-
-def swiftlint_bin
-  "#{swiftlint_path}/bin/swiftlint"
-end
-
-def swiftlint_needs_install
-  return true unless File.exist?(swiftlint_bin)
-
-  installed_version = `"#{swiftlint_bin}" version`.chomp
-  (installed_version != SWIFTLINT_VERSION)
-end
-
 def xcodebuild(*build_cmds)
   cmd = 'xcodebuild'
   cmd += " -destination 'platform=iOS Simulator,name=iPhone 6s'"
diff --git a/Scripts/swiftlint.sh b/Scripts/swiftlint.sh
deleted file mode 100755
index 2e8098e02..000000000
--- a/Scripts/swiftlint.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-#
-# Runs SwiftLint on the whole workspace.
-#
-# This does not run in Continuous Integration.
-#
-
-# Abort if we are running in CI
-# See https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables
-if [ "$CI" = true ] ; then
-  echo "warning: skipping SwiftLint build phase because running on CI."
-  exit 0
-fi
-
-# Get the directory of this file.
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-
-# Temporarily move to the root directory so that SwiftLint can correctly
-# find the paths returned from the `git` commands below.
-pushd $DIR/../ > /dev/null
-
-# Paths relative to the root directory
-SWIFTLINT="./vendor/swiftlint/bin/swiftlint"
-CONFIG_FILE=".swiftlint.yml"
-if ! which $SWIFTLINT >/dev/null; then
-  echo "error: SwiftLint is not installed. Install by running `rake dependencies`."
-  exit 1
-fi
-
-# Run SwiftLint on the modified files.
-#
-# The `|| true` at the end is to stop `grep` from returning a non-zero exit if there
-# are no matches. Xcode's build will fail if we don't do this.
-#
-MODIFIED_FILES=`git diff --name-only --diff-filter=d HEAD | grep -G "\.swift$" || true`
-echo $MODIFIED_FILES | xargs $SWIFTLINT --config $CONFIG_FILE --quiet
-MODIFIED_FILES_LINT_RESULT=$?
-
-# Run SwiftLint on the added files
-ADDED_FILES=`git ls-files --others --exclude-standard | grep -G "\.swift$" || true`
-echo $ADDED_FILES | xargs $SWIFTLINT --config $CONFIG_FILE --quiet
-ADDED_FILES_LINT_RESULT=$?
-
-# Restore the previous directory
-popd > /dev/null
-
-# Exit with non-zero if SwiftLint found a serious violation in the linted files. 
-#
-# This stops Xcode from complaining about "...did not return a nonzero exit code...".
-#
-if [ $MODIFIED_FILES_LINT_RESULT -ne 0 ] || [ $ADDED_FILES_LINT_RESULT -ne 0 ] ; then 
-  exit 1
-fi
diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index 95d1ed3ac..83c24fd3e 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -3230,7 +3230,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"$SRCROOT/Scripts/swiftlint.sh\"\n";
+			shellScript = "[ $CI ] && exit 0\n./Pods/SwiftLint/swiftlint\n";
 		};
 		B553F5A11D10474600F7E397 /* Delete Frameworks folder (temporary fix for CocoaPods) */ = {
 			isa = PBXShellScriptBuildPhase;

From 4f8cbac8827ce6e5ad86a821f97dbc09007568d4 Mon Sep 17 00:00:00 2001
From: Ian Maia <ian.maia@automattic.com>
Date: Mon, 26 Feb 2024 19:51:12 +0100
Subject: [PATCH 044/547] Fix SwiftLint violations

---
 Simplenote/AuthenticationValidator.swift      |  4 ----
 Simplenote/Classes/ActivityType.swift         |  1 -
 Simplenote/Classes/Bundle+Simplenote.swift    |  2 --
 Simplenote/Classes/CGRect+Simplenote.swift    |  1 -
 Simplenote/Classes/ColorStudio.swift          |  1 -
 .../Classes/DateFormatter+Simplenote.swift    |  1 -
 Simplenote/Classes/EditorFactory.swift        |  2 --
 Simplenote/Classes/IndexPath+Simplenote.swift |  1 -
 Simplenote/Classes/InterlinkProcessor.swift   |  6 -----
 .../Classes/InterlinkResultsController.swift  |  4 ----
 .../Classes/InterlinkViewController.swift     |  8 +------
 Simplenote/Classes/KeyboardObservable.swift   |  2 --
 Simplenote/Classes/KeychainManager.swift      |  5 ----
 .../Classes/MagicLinkAuthenticator.swift      |  2 --
 Simplenote/Classes/MigrationsHandler.swift    |  2 --
 .../NSAttributedString+AuthError.swift        |  3 ---
 .../NSAttributedString+Simplenote.swift       |  1 -
 ...NSMutableAttributedString+Simplenote.swift |  1 -
 .../NSMutableParagraphStyle+Simplenote.swift  |  1 -
 .../NSRegularExpression+Simplenote.swift      |  2 --
 .../Classes/NSSortDescriptor+Simplenote.swift |  1 -
 Simplenote/Classes/NSString+Simplenote.swift  |  1 -
 Simplenote/Classes/NSURL+Extensions.swift     |  1 -
 Simplenote/Classes/NSURL+Links.swift          |  1 -
 .../Classes/NSUserActivity+Shortcuts.swift    |  1 -
 .../Classes/NSUserActivity+Simplenote.swift   |  2 --
 Simplenote/Classes/Note+Properties.swift      |  1 -
 Simplenote/Classes/NotesListController.swift  |  7 ------
 Simplenote/Classes/NotesListFilter.swift      |  3 ---
 Simplenote/Classes/NotesListSection.swift     |  1 -
 Simplenote/Classes/NotesListState.swift       |  1 -
 .../Classes/OptionsViewController.swift       | 13 -----------
 Simplenote/Classes/PassthruView.swift         |  1 -
 .../Classes/PopoverViewController.swift       |  4 ----
 .../Classes/SPAboutViewController.swift       |  5 ----
 Simplenote/Classes/SPAuthError.swift          |  3 ---
 Simplenote/Classes/SPAuthHandler.swift        |  6 -----
 Simplenote/Classes/SPAuthViewController.swift | 20 ----------------
 Simplenote/Classes/SPBlurEffectView.swift     |  4 ----
 Simplenote/Classes/SPContactsManager.swift    |  4 ----
 .../Classes/SPDefaultTableViewCell.swift      |  2 --
 .../Classes/SPDiagnosticsViewController.swift |  3 ---
 .../SPEditorTapRecognizerDelegate.swift       |  2 --
 Simplenote/Classes/SPFeedbackManager.swift    |  2 --
 Simplenote/Classes/SPLabel.swift              |  2 --
 ...PNoteEditorViewController+Extensions.swift | 23 -------------------
 .../SPNoteListViewController+Extensions.swift | 15 ------------
 Simplenote/Classes/SPNoteTableViewCell.swift  | 11 ---------
 .../Classes/SPOnboardingViewController.swift  |  8 -------
 Simplenote/Classes/SPPlaceholderView.swift    |  4 ----
 Simplenote/Classes/SPRatingsPromptView.swift  |  8 -------
 Simplenote/Classes/SPSectionHeaderView.swift  |  3 ---
 .../SPSettingsViewController+Extensions.swift |  3 ---
 Simplenote/Classes/SPSheetController.swift    |  8 -------
 Simplenote/Classes/SPSortBar.swift            |  5 ----
 .../Classes/SPSortOrderViewController.swift   |  4 ----
 Simplenote/Classes/SPSquaredButton.swift      |  2 --
 Simplenote/Classes/SPTagHeaderView.swift      |  3 ---
 Simplenote/Classes/SPTagTableViewCell.swift   |  7 ------
 Simplenote/Classes/SPTextInputView.swift      |  8 -------
 .../Classes/SPThemeViewController.swift       |  5 ----
 Simplenote/Classes/SPUserInterface.swift      |  3 ---
 .../Classes/SearchDisplayController.swift     |  7 ------
 Simplenote/Classes/ShortcutsHandler.swift     |  1 -
 .../SignupVerificationViewController.swift    |  1 -
 Simplenote/Classes/Simperium+Simplenote.swift |  3 ---
 .../SimplenoteActivityItemSource.swift        |  1 -
 Simplenote/Classes/SimplenoteConstants.swift  |  1 -
 Simplenote/Classes/SortMode.swift             |  1 -
 .../SortModePickerViewController.swift        |  2 --
 Simplenote/Classes/String+Simplenote.swift    |  2 --
 Simplenote/Classes/SwitchTableViewCell.swift  |  4 ----
 Simplenote/Classes/TagView.swift              |  8 -------
 Simplenote/Classes/TagViewCell.swift          |  4 ----
 Simplenote/Classes/Theme.swift                |  3 ---
 .../Classes/UIActivity+Simplenote.swift       |  1 -
 .../Classes/UIAlertController+Helpers.swift   |  1 -
 .../Classes/UIApplication+Simplenote.swift    |  6 ++---
 .../Classes/UIBarButtonItem+Appearance.swift  |  1 -
 .../Classes/UIBezierPath+Simplenote.swift     |  1 -
 .../Classes/UIBlurEffect+Simplenote.swift     |  1 -
 Simplenote/Classes/UIColor+Helpers.swift      |  2 --
 Simplenote/Classes/UIColor+Studio.swift       |  2 --
 .../UIContextualAction+Simplenote.swift       |  1 -
 Simplenote/Classes/UIDevice+Simplenote.swift  |  1 -
 Simplenote/Classes/UIFont+Simplenote.swift    |  4 ----
 .../UIGestureRecognizer+Simplenote.swift      |  1 -
 Simplenote/Classes/UIImage+Dynamic.swift      |  2 --
 Simplenote/Classes/UIImage+Simplenote.swift   |  1 -
 Simplenote/Classes/UIImageName.swift          |  2 --
 .../UIKeyboardAppearance+Simplenote.swift     |  1 -
 Simplenote/Classes/UIKitConstants.swift       |  1 -
 .../Classes/UINavigationBar+Appearance.swift  |  1 -
 .../Classes/UINavigationBar+Simplenote.swift  |  1 -
 .../UINavigationController+Simplenote.swift   |  1 -
 Simplenote/Classes/UIPasteboard+Note.swift    |  1 -
 Simplenote/Classes/UIScreen+Simplenote.swift  |  1 -
 .../Classes/UISearchBar+Simplenote.swift      |  1 -
 .../Classes/UITableView+Simplenote.swift      |  1 -
 .../Classes/UITableViewCell+Simplenote.swift  |  1 -
 ...TableViewHeaderFooterView+Simplenote.swift |  1 -
 .../Classes/UITextView+Simplenote.swift       |  6 -----
 .../UITraitCollection+Simplenote.swift        |  1 -
 Simplenote/Classes/UIView+Animations.swift    |  1 -
 .../Classes/UIView+ImageRepresentation.swift  |  1 -
 Simplenote/Classes/UIView+Simplenote.swift    |  2 --
 .../Classes/UIViewController+Helpers.swift    |  1 -
 .../Classes/UIViewController+Simplenote.swift |  2 --
 .../Classes/UserDefaults+Simplenote.swift     |  2 --
 Simplenote/Color+Simplenote.swift             |  1 -
 .../Controllers/VersionsController.swift      |  4 ----
 Simplenote/Controllers/WidgetController.swift |  1 -
 Simplenote/CrashLogging.swift                 |  1 -
 Simplenote/EmailVerification.swift            |  1 -
 .../NoteInformationViewController.swift       |  1 -
 Simplenote/KeychainPasswordItem.swift         |  1 -
 ...SAttributedStringToMarkdownConverter.swift |  2 --
 Simplenote/NSObject+Helpers.swift             |  1 -
 Simplenote/NSPredicate+Email.swift            |  1 -
 Simplenote/Note+Links.swift                   |  1 -
 Simplenote/NoteMetrics.swift                  |  1 -
 Simplenote/Notice.swift                       |  2 +-
 Simplenote/NoticeView.swift                   |  1 -
 Simplenote/Options.swift                      |  7 ------
 Simplenote/PopoverPresenter.swift             |  6 -----
 Simplenote/Preferences+IAP.swift              |  1 -
 Simplenote/SPAppDelegate+Extensions.swift     |  7 ------
 Simplenote/SPCardPresentationController.swift |  2 --
 Simplenote/SPEditorTextView+Simplenote.swift  |  1 -
 Simplenote/SPHistoryVersion.swift             |  1 -
 Simplenote/SPNoteHistoryController.swift      |  1 -
 Simplenote/SPPrivacyViewController.swift      |  4 ----
 Simplenote/SPTextAttachment.swift             |  3 ---
 Simplenote/SPTracker+Extensions.swift         |  2 --
 Simplenote/SearchQuery+Simplenote.swift       |  1 -
 Simplenote/SeparatorsView.swift               |  2 --
 Simplenote/SpinnerViewController.swift        |  2 --
 Simplenote/StoreConstants.swift               |  1 -
 Simplenote/StoreManager.swift                 | 10 --------
 Simplenote/StoreProduct.swift                 |  1 -
 Simplenote/SubtitleTableViewCell.swift        |  3 ---
 Simplenote/SustainerView.swift                |  6 -----
 Simplenote/TableHeaderViewCell.swift          |  2 --
 Simplenote/TagListViewController.swift        |  3 ---
 .../NoteEditorTagListViewController.swift     |  5 ----
 ...teEditorTagSuggestionsViewController.swift |  4 ----
 .../UIActivityViewController+Simplenote.swift |  1 -
 Simplenote/UIAlertController+Sustainer.swift  |  2 --
 Simplenote/Value1TableViewCell.swift          |  3 ---
 .../NSExtensionContext+Simplenote.swift       |  1 -
 ...NSURLSessionConfiguration+Extensions.swift |  1 -
 SimplenoteShare/Extractors/Extractor.swift    |  1 -
 SimplenoteShare/Extractors/Extractors.swift   |  1 -
 .../Extractors/PlainTextExtractor.swift       |  1 -
 SimplenoteShare/Extractors/URLExtractor.swift |  4 ----
 .../ExtensionPresentationAnimator.swift       |  4 ----
 .../ExtensionPresentationController.swift     |  5 ----
 .../ExtensionTransitioningManager.swift       |  2 --
 SimplenoteShare/Simperium/Note.swift          |  2 --
 SimplenoteShare/Simperium/Uploader.swift      |  5 ----
 SimplenoteShare/Themes/SPUserInterface.swift  |  1 -
 .../SharePresentationController.swift         |  3 ---
 .../ViewControllers/ShareViewController.swift |  7 ------
 .../AuthenticationValidatorTests.swift        |  3 ---
 SimplenoteTests/CGRectSimplenoteTests.swift   |  1 -
 SimplenoteTests/Constants.swift               |  1 -
 SimplenoteTests/EmailVerificationTests.swift  |  1 -
 .../InterlinkResultsControllerTests.swift     |  5 ----
 SimplenoteTests/MockupStorage+Sample.swift    |  1 -
 SimplenoteTests/MockupStorage.swift           |  3 ---
 ...SMutableAttributedStringStylingTests.swift |  1 -
 SimplenoteTests/NSPredicateEmailTests.swift   |  1 -
 SimplenoteTests/NSStringCondensingTests.swift |  1 -
 SimplenoteTests/NSStringSimplenoteTests.swift |  1 -
 SimplenoteTests/NoteBodyExcerptTests.swift    |  1 -
 SimplenoteTests/NoteContentHelperTests.swift  |  1 -
 SimplenoteTests/NoteContentPreviewTests.swift |  1 -
 SimplenoteTests/NoteLinkTests.swift           |  1 -
 .../NotesListControllerTests.swift            | 12 ----------
 SimplenoteTests/OptionsTests.swift            |  1 -
 SimplenoteTests/StringContentSliceTests.swift |  1 -
 SimplenoteTests/StringSimplenoteTests.swift   |  1 -
 .../TagTextFieldInputValidatorTests.swift     |  9 ++++----
 SimplenoteTests/UIColorSimplenoteTests.swift  |  2 --
 SimplenoteTests/UIImageSimplenoteTests.swift  |  1 -
 SimplenoteTests/UserDefaults+Tests.swift      |  1 -
 SimplenoteUITests/NoteEditor.swift            |  1 -
 SimplenoteWidgets/SimplenoteWidgets.swift     |  1 -
 SimplenoteWidgets/Tools/WidgetsState.swift    |  1 -
 SimplenoteWidgets/ViewModifiers/Filling.swift |  1 -
 .../Views/ListWidgetHeaderView.swift          |  1 -
 SimplenoteWidgets/Views/ListWidgetView.swift  |  1 -
 SimplenoteWidgets/Views/NoteListRow.swift     |  1 -
 UITestsFoundation/PasscodeScreen.swift        |  6 +----
 194 files changed, 10 insertions(+), 545 deletions(-)

diff --git a/Simplenote/AuthenticationValidator.swift b/Simplenote/AuthenticationValidator.swift
index 4b3642e40..b922fd899 100644
--- a/Simplenote/AuthenticationValidator.swift
+++ b/Simplenote/AuthenticationValidator.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - AuthenticationValidator
 //
 struct AuthenticationValidator {
@@ -13,7 +12,6 @@ struct AuthenticationValidator {
     ///
     private let strongPasswordLength = UInt(8)
 
-
     /// Returns the Validation Result for a given Username
     ///
     func performUsernameValidation(username: String) -> Result {
@@ -52,7 +50,6 @@ struct AuthenticationValidator {
     }
 }
 
-
 // MARK: - Nested Types
 //
 extension AuthenticationValidator {
@@ -71,7 +68,6 @@ extension AuthenticationValidator {
     }
 }
 
-
 // MARK: - Validation Results: String Conversion
 //
 extension AuthenticationValidator.Result: CustomStringConvertible {
diff --git a/Simplenote/Classes/ActivityType.swift b/Simplenote/Classes/ActivityType.swift
index 88a5cc8d2..f115d11e6 100644
--- a/Simplenote/Classes/ActivityType.swift
+++ b/Simplenote/Classes/ActivityType.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - Simplenote's User Activities
 //
 enum ActivityType: String {
diff --git a/Simplenote/Classes/Bundle+Simplenote.swift b/Simplenote/Classes/Bundle+Simplenote.swift
index cc8abbff2..3c9beacc4 100644
--- a/Simplenote/Classes/Bundle+Simplenote.swift
+++ b/Simplenote/Classes/Bundle+Simplenote.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - Bundle: Simplenote Methods
 //
 extension Bundle {
@@ -33,7 +32,6 @@ extension Bundle {
     }
 }
 
-
 // MARK: - Private Helpers
 //
 private extension Bundle {
diff --git a/Simplenote/Classes/CGRect+Simplenote.swift b/Simplenote/Classes/CGRect+Simplenote.swift
index 2d574c154..62148df79 100644
--- a/Simplenote/Classes/CGRect+Simplenote.swift
+++ b/Simplenote/Classes/CGRect+Simplenote.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - CGRect Methods
 //
 extension CGRect {
diff --git a/Simplenote/Classes/ColorStudio.swift b/Simplenote/Classes/ColorStudio.swift
index 5c6d518df..5cb0cc500 100644
--- a/Simplenote/Classes/ColorStudio.swift
+++ b/Simplenote/Classes/ColorStudio.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - Color Studio Constants
 //         Ref. https://github.com/Automattic/color-studio
 //
diff --git a/Simplenote/Classes/DateFormatter+Simplenote.swift b/Simplenote/Classes/DateFormatter+Simplenote.swift
index c97771d29..2d26c2791 100644
--- a/Simplenote/Classes/DateFormatter+Simplenote.swift
+++ b/Simplenote/Classes/DateFormatter+Simplenote.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - Simplenote Extension
 //
 extension DateFormatter {
diff --git a/Simplenote/Classes/EditorFactory.swift b/Simplenote/Classes/EditorFactory.swift
index db0818718..f5a9eaaa7 100644
--- a/Simplenote/Classes/EditorFactory.swift
+++ b/Simplenote/Classes/EditorFactory.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - Editor Factory (!)
 //
 @objcMembers
@@ -48,7 +47,6 @@ class EditorFactory: NSObject {
     }
 }
 
-
 // MARK: - Constants
 //
 private struct Constants {
diff --git a/Simplenote/Classes/IndexPath+Simplenote.swift b/Simplenote/Classes/IndexPath+Simplenote.swift
index f373ea0f6..34cb5721b 100644
--- a/Simplenote/Classes/IndexPath+Simplenote.swift
+++ b/Simplenote/Classes/IndexPath+Simplenote.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - IndexPath
 //
 extension IndexPath {
diff --git a/Simplenote/Classes/InterlinkProcessor.swift b/Simplenote/Classes/InterlinkProcessor.swift
index 4f6db1c0f..2580dcc2f 100644
--- a/Simplenote/Classes/InterlinkProcessor.swift
+++ b/Simplenote/Classes/InterlinkProcessor.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - InterlinkProcessorDelegate
 //
 protocol InterlinkProcessorDelegate: NSObjectProtocol {
@@ -10,7 +9,6 @@ protocol InterlinkProcessorDelegate: NSObjectProtocol {
     func interlinkProcessor(_ processor: InterlinkProcessor, insert text: String, in range: Range<String.Index>)
 }
 
-
 // MARK: - InterlinkProcessor
 //
 class InterlinkProcessor: NSObject {
@@ -77,7 +75,6 @@ class InterlinkProcessor: NSObject {
     }
 }
 
-
 // MARK: - Presenting
 //
 private extension InterlinkProcessor {
@@ -117,7 +114,6 @@ private extension InterlinkProcessor {
     }
 }
 
-
 // MARK: - Scrolling
 //
 extension InterlinkProcessor {
@@ -152,7 +148,6 @@ extension InterlinkProcessor {
     }
 }
 
-
 // MARK: - State
 //
 private extension InterlinkProcessor {
@@ -162,7 +157,6 @@ private extension InterlinkProcessor {
     }
 }
 
-
 // MARK: - Settings
 //
 private enum Settings {
diff --git a/Simplenote/Classes/InterlinkResultsController.swift b/Simplenote/Classes/InterlinkResultsController.swift
index dbc7f1280..19933bbdd 100644
--- a/Simplenote/Classes/InterlinkResultsController.swift
+++ b/Simplenote/Classes/InterlinkResultsController.swift
@@ -1,7 +1,6 @@
 import Foundation
 import SimplenoteFoundation
 
-
 // MARK: - InterlinkResultsController
 //
 class InterlinkResultsController {
@@ -14,7 +13,6 @@ class InterlinkResultsController {
     ///
     var maximumNumberOfResults = Settings.defaultMaximumResults
 
-
     /// Designated Initializer
     ///
     init(viewContext: NSManagedObjectContext) {
@@ -34,7 +32,6 @@ class InterlinkResultsController {
     }
 }
 
-
 // MARK: - Private
 //
 private extension InterlinkResultsController {
@@ -71,7 +68,6 @@ private extension InterlinkResultsController {
     }
 }
 
-
 // MARK: - Settings!
 //
 private enum Settings {
diff --git a/Simplenote/Classes/InterlinkViewController.swift b/Simplenote/Classes/InterlinkViewController.swift
index c2910cf75..df41f31f3 100644
--- a/Simplenote/Classes/InterlinkViewController.swift
+++ b/Simplenote/Classes/InterlinkViewController.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - InterlinkViewController
 //
 class InterlinkViewController: UIViewController {
@@ -25,7 +24,7 @@ class InterlinkViewController: UIViewController {
     var desiredHeight: CGFloat {
         return Metrics.maximumTableHeight
     }
-    
+
     // MARK: - Overridden API(s)
 
     override func viewDidLoad() {
@@ -35,7 +34,6 @@ class InterlinkViewController: UIViewController {
     }
 }
 
-
 // MARK: - Initialization
 //
 private extension InterlinkViewController {
@@ -56,7 +54,6 @@ private extension InterlinkViewController {
     }
 }
 
-
 // MARK: - UITableViewDataSource
 //
 extension InterlinkViewController: UITableViewDataSource {
@@ -83,7 +80,6 @@ extension InterlinkViewController: UITableViewDataSource {
     }
 }
 
-
 // MARK: - UITableViewDelegate
 //
 extension InterlinkViewController: UITableViewDelegate {
@@ -94,7 +90,6 @@ extension InterlinkViewController: UITableViewDelegate {
     }
 }
 
-
 // MARK: - Private API(s)
 //
 private extension InterlinkViewController {
@@ -108,7 +103,6 @@ private extension InterlinkViewController {
     }
 }
 
-
 // MARK: - Metrics
 //
 private enum Metrics {
diff --git a/Simplenote/Classes/KeyboardObservable.swift b/Simplenote/Classes/KeyboardObservable.swift
index 07285baab..13a3cd2d4 100644
--- a/Simplenote/Classes/KeyboardObservable.swift
+++ b/Simplenote/Classes/KeyboardObservable.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 /// Adopters of this protocol will recieve interactive keyboard-based notifications
 /// by implmenting the provided functions within.
 ///
@@ -69,7 +68,6 @@ extension KeyboardObservable {
     }
 }
 
-
 // MARK: - Notification + UIKeyboardInfo
 //
 private extension Notification {
diff --git a/Simplenote/Classes/KeychainManager.swift b/Simplenote/Classes/KeychainManager.swift
index 3fb3c3236..b3b2346c4 100644
--- a/Simplenote/Classes/KeychainManager.swift
+++ b/Simplenote/Classes/KeychainManager.swift
@@ -1,7 +1,5 @@
 import Foundation
 
-
-
 // MARK: - KeychainManager
 //
 enum KeychainManager {
@@ -22,8 +20,6 @@ enum KeychainManager {
     static var timestamp: String?
 }
 
-
-
 // MARK: - KeychainItemWrapper
 //
 @propertyWrapper
@@ -64,7 +60,6 @@ struct KeychainItemWrapper {
     }
 }
 
-
 // MARK: - Keychain Constants
 //
 enum SimplenoteKeychain {
diff --git a/Simplenote/Classes/MagicLinkAuthenticator.swift b/Simplenote/Classes/MagicLinkAuthenticator.swift
index bbd23d883..38c97012a 100644
--- a/Simplenote/Classes/MagicLinkAuthenticator.swift
+++ b/Simplenote/Classes/MagicLinkAuthenticator.swift
@@ -24,7 +24,6 @@ struct MagicLinkAuthenticator {
     }
 }
 
-
 // MARK: - [URLQueryItem] Helper
 //
 private extension Array where Element == URLQueryItem {
@@ -42,7 +41,6 @@ private extension Array where Element == URLQueryItem {
     }
 }
 
-
 // MARK: - Constants
 //
 private struct Constants {
diff --git a/Simplenote/Classes/MigrationsHandler.swift b/Simplenote/Classes/MigrationsHandler.swift
index adaae6aa0..c78b9c792 100644
--- a/Simplenote/Classes/MigrationsHandler.swift
+++ b/Simplenote/Classes/MigrationsHandler.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - Simplenote's Upgrade handling flows
 //
 class MigrationsHandler: NSObject {
@@ -33,7 +32,6 @@ class MigrationsHandler: NSObject {
     }
 }
 
-
 // MARK: - Private Methods
 //
 private extension MigrationsHandler {
diff --git a/Simplenote/Classes/NSAttributedString+AuthError.swift b/Simplenote/Classes/NSAttributedString+AuthError.swift
index 7e43a173c..c037668ad 100644
--- a/Simplenote/Classes/NSAttributedString+AuthError.swift
+++ b/Simplenote/Classes/NSAttributedString+AuthError.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - NSAttributedString + AuthError Helpers
 //
 extension NSAttributedString {
@@ -49,7 +48,6 @@ extension NSAttributedString {
     }
 }
 
-
 // MARK: - Diagnostic Title(s)
 //
 private enum Title {
@@ -58,7 +56,6 @@ private enum Title {
     static let response     = NSLocalizedString("Response", comment: "Response Title")
 }
 
-
 // MARK: - Text Styles
 //
 private enum Style {
diff --git a/Simplenote/Classes/NSAttributedString+Simplenote.swift b/Simplenote/Classes/NSAttributedString+Simplenote.swift
index a7a13aec6..1bb358653 100644
--- a/Simplenote/Classes/NSAttributedString+Simplenote.swift
+++ b/Simplenote/Classes/NSAttributedString+Simplenote.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - NSMutableAttributedString Simplenote Methods
 //
 extension NSAttributedString {
diff --git a/Simplenote/Classes/NSMutableAttributedString+Simplenote.swift b/Simplenote/Classes/NSMutableAttributedString+Simplenote.swift
index 1b5cb2b6c..7e5327f0c 100644
--- a/Simplenote/Classes/NSMutableAttributedString+Simplenote.swift
+++ b/Simplenote/Classes/NSMutableAttributedString+Simplenote.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - NSMutableAttributedString Methods
 //
 extension NSMutableAttributedString {
diff --git a/Simplenote/Classes/NSMutableParagraphStyle+Simplenote.swift b/Simplenote/Classes/NSMutableParagraphStyle+Simplenote.swift
index 1d5eafa8a..fd4c431ea 100644
--- a/Simplenote/Classes/NSMutableParagraphStyle+Simplenote.swift
+++ b/Simplenote/Classes/NSMutableParagraphStyle+Simplenote.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - NSMutableParagraphStyle
 //
 extension NSMutableParagraphStyle {
diff --git a/Simplenote/Classes/NSRegularExpression+Simplenote.swift b/Simplenote/Classes/NSRegularExpression+Simplenote.swift
index 4fa1981e8..49501f7ba 100644
--- a/Simplenote/Classes/NSRegularExpression+Simplenote.swift
+++ b/Simplenote/Classes/NSRegularExpression+Simplenote.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - NSRegularExpression (Checklists)
 //
 extension NSRegularExpression {
@@ -19,7 +18,6 @@ extension NSRegularExpression {
         try! NSRegularExpression(pattern: "\\s*(-[ \t]+\\[[xX\\s]?\\])", options: .anchorsMatchLines)
     }()
 
-
     /// Both our Checklist regexes look like this: `"^\\s*(EXPRESSION)"`
     /// This will produce two resulting NSRange(s): a top level one, including the full match, and a "capture group"
     /// By requesting the Range for `EXPRESSION` we'd be able to track **exactly** the location of our list marker `- [ ]` (disregarding, thus, the leading space).
diff --git a/Simplenote/Classes/NSSortDescriptor+Simplenote.swift b/Simplenote/Classes/NSSortDescriptor+Simplenote.swift
index bd9a756d4..74f64de1b 100644
--- a/Simplenote/Classes/NSSortDescriptor+Simplenote.swift
+++ b/Simplenote/Classes/NSSortDescriptor+Simplenote.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - SortMode List Methods
 //
 extension NSSortDescriptor {
diff --git a/Simplenote/Classes/NSString+Simplenote.swift b/Simplenote/Classes/NSString+Simplenote.swift
index 6ed0f4a6e..a2301ed3e 100644
--- a/Simplenote/Classes/NSString+Simplenote.swift
+++ b/Simplenote/Classes/NSString+Simplenote.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - NSString Simplenote Helpers
 //
 extension NSString {
diff --git a/Simplenote/Classes/NSURL+Extensions.swift b/Simplenote/Classes/NSURL+Extensions.swift
index 48e0ac5bd..de264c410 100644
--- a/Simplenote/Classes/NSURL+Extensions.swift
+++ b/Simplenote/Classes/NSURL+Extensions.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 /// This extension contains several helper-additions to Cocoa NSURL class.
 ///
 extension NSURL {
diff --git a/Simplenote/Classes/NSURL+Links.swift b/Simplenote/Classes/NSURL+Links.swift
index 0840ebb76..491e8c20b 100644
--- a/Simplenote/Classes/NSURL+Links.swift
+++ b/Simplenote/Classes/NSURL+Links.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - NSURL + Interlink
 //
 extension NSURL {
diff --git a/Simplenote/Classes/NSUserActivity+Shortcuts.swift b/Simplenote/Classes/NSUserActivity+Shortcuts.swift
index efb9ed8f0..0cb027b0d 100644
--- a/Simplenote/Classes/NSUserActivity+Shortcuts.swift
+++ b/Simplenote/Classes/NSUserActivity+Shortcuts.swift
@@ -1,7 +1,6 @@
 import Foundation
 import CoreSpotlight
 
-
 // MARK: - Simplenote's NSUserActivities
 //
 extension NSUserActivity {
diff --git a/Simplenote/Classes/NSUserActivity+Simplenote.swift b/Simplenote/Classes/NSUserActivity+Simplenote.swift
index 18b50d549..109283911 100644
--- a/Simplenote/Classes/NSUserActivity+Simplenote.swift
+++ b/Simplenote/Classes/NSUserActivity+Simplenote.swift
@@ -3,8 +3,6 @@ import CoreSpotlight
 import Intents
 import MobileCoreServices
 
-
-
 // MARK: - NSUserActivity Convenience Methods
 //
 extension NSUserActivity {
diff --git a/Simplenote/Classes/Note+Properties.swift b/Simplenote/Classes/Note+Properties.swift
index 67378f5b3..e871ec6a3 100644
--- a/Simplenote/Classes/Note+Properties.swift
+++ b/Simplenote/Classes/Note+Properties.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - Note
 //
 extension Note {
diff --git a/Simplenote/Classes/NotesListController.swift b/Simplenote/Classes/NotesListController.swift
index a841f2732..53f828b37 100644
--- a/Simplenote/Classes/NotesListController.swift
+++ b/Simplenote/Classes/NotesListController.swift
@@ -2,7 +2,6 @@ import Foundation
 import SimplenoteFoundation
 import SimplenoteSearch
 
-
 // MARK: - NotesListController
 //
 class NotesListController: NSObject {
@@ -72,7 +71,6 @@ class NotesListController: NSObject {
     ///
     var onBatchChanges: ((_ sectionsChangeset: ResultsSectionsChangeset, _ rowsChangeset: ResultsObjectsChangeset) -> Void)?
 
-
     /// Designated Initializer
     ///
     init(viewContext: NSManagedObjectContext) {
@@ -83,7 +81,6 @@ class NotesListController: NSObject {
     }
 }
 
-
 // MARK: - Public API
 //
 extension NotesListController {
@@ -168,7 +165,6 @@ extension NotesListController {
     }
 }
 
-
 // MARK: - Search API
 //
 extension NotesListController {
@@ -202,7 +198,6 @@ extension NotesListController {
     }
 }
 
-
 // MARK: - Convenience APIs
 //
 extension NotesListController {
@@ -217,7 +212,6 @@ extension NotesListController {
     }
 }
 
-
 // MARK: - Private API: ResultsController Refreshing
 //
 private extension NotesListController {
@@ -239,7 +233,6 @@ private extension NotesListController {
     }
 }
 
-
 // MARK: - Private API: Realtime Refreshing
 //
 private extension NotesListController {
diff --git a/Simplenote/Classes/NotesListFilter.swift b/Simplenote/Classes/NotesListFilter.swift
index bf1522765..43584ecd3 100644
--- a/Simplenote/Classes/NotesListFilter.swift
+++ b/Simplenote/Classes/NotesListFilter.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - NotesListFilter
 //
 enum NotesListFilter: Equatable {
@@ -10,7 +9,6 @@ enum NotesListFilter: Equatable {
     case tag(name: String)
 }
 
-
 // MARK: - NotesListFilter: Public API
 //
 extension NotesListFilter {
@@ -36,7 +34,6 @@ extension NotesListFilter {
         }
     }
 
-
     /// Filter's visible Title
     ///
     var title: String {
diff --git a/Simplenote/Classes/NotesListSection.swift b/Simplenote/Classes/NotesListSection.swift
index dcb3e5240..819cbae8b 100644
--- a/Simplenote/Classes/NotesListSection.swift
+++ b/Simplenote/Classes/NotesListSection.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - NotesListSection
 //
 struct NotesListSection {
diff --git a/Simplenote/Classes/NotesListState.swift b/Simplenote/Classes/NotesListState.swift
index 61f9a4375..5faee6aed 100644
--- a/Simplenote/Classes/NotesListState.swift
+++ b/Simplenote/Classes/NotesListState.swift
@@ -8,7 +8,6 @@ enum NotesListState: Equatable {
     case searching(query: SearchQuery)
 }
 
-
 // MARK: - NotesListState: Public API
 //
 extension NotesListState {
diff --git a/Simplenote/Classes/OptionsViewController.swift b/Simplenote/Classes/OptionsViewController.swift
index a7c7a7a6b..c433b70ba 100644
--- a/Simplenote/Classes/OptionsViewController.swift
+++ b/Simplenote/Classes/OptionsViewController.swift
@@ -2,7 +2,6 @@ import Foundation
 import UIKit
 import SimplenoteFoundation
 
-
 // MARK: - OptionsControllerDelegate
 //
 protocol OptionsControllerDelegate: AnyObject {
@@ -11,7 +10,6 @@ protocol OptionsControllerDelegate: AnyObject {
     func optionsControllerDidPressTrash(_ sender: OptionsViewController)
 }
 
-
 // MARK: - OptionsViewController
 //
 class OptionsViewController: UIViewController {
@@ -77,7 +75,6 @@ class OptionsViewController: UIViewController {
     }
 }
 
-
 // MARK: - Initialization
 //
 private extension OptionsViewController {
@@ -113,7 +110,6 @@ private extension OptionsViewController {
     }
 }
 
-
 // MARK: - EntityObserverDelegate
 //
 extension OptionsViewController: EntityObserverDelegate {
@@ -128,7 +124,6 @@ extension OptionsViewController: EntityObserverDelegate {
     }
 }
 
-
 // MARK: - UITableViewDelegate
 //
 extension OptionsViewController: UITableViewDelegate {
@@ -143,7 +138,6 @@ extension OptionsViewController: UITableViewDelegate {
     }
 }
 
-
 // MARK: - UITableViewDataSource
 //
 extension OptionsViewController: UITableViewDataSource {
@@ -158,7 +152,6 @@ extension OptionsViewController: UITableViewDataSource {
     }
 }
 
-
 // MARK: - Helper API(s)
 //
 private extension OptionsViewController {
@@ -172,7 +165,6 @@ private extension OptionsViewController {
     }
 }
 
-
 // MARK: - Building Cells
 //
 private extension OptionsViewController {
@@ -288,7 +280,6 @@ private extension OptionsViewController {
     }
 }
 
-
 // MARK: - Publishing
 //
 extension OptionsViewController {
@@ -311,7 +302,6 @@ extension OptionsViewController {
 
 }
 
-
 // MARK: - Action Handlers
 //
 private extension OptionsViewController {
@@ -412,7 +402,6 @@ private extension OptionsViewController {
     }
 }
 
-
 // MARK: - SPCollaboratorDelegate
 //
 extension OptionsViewController: SPCollaboratorDelegate {
@@ -431,14 +420,12 @@ extension OptionsViewController: SPCollaboratorDelegate {
     }
 }
 
-
 // MARK: - Section: Defines a TableView Section
 //
 private struct Section {
     let rows: [Row]
 }
 
-
 // MARK: - TableView Rows
 //
 private enum Row {
diff --git a/Simplenote/Classes/PassthruView.swift b/Simplenote/Classes/PassthruView.swift
index c7e0dd146..8299aa0bd 100644
--- a/Simplenote/Classes/PassthruView.swift
+++ b/Simplenote/Classes/PassthruView.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - PassthruView: Doesn't capture tap events performed over itself!
 //
 class PassthruView: UIView {
diff --git a/Simplenote/Classes/PopoverViewController.swift b/Simplenote/Classes/PopoverViewController.swift
index a4e3af352..4e7894a46 100644
--- a/Simplenote/Classes/PopoverViewController.swift
+++ b/Simplenote/Classes/PopoverViewController.swift
@@ -1,6 +1,5 @@
 import UIKit
 
-
 // MARK: - PopoverViewController
 //
 class PopoverViewController: UIViewController {
@@ -43,7 +42,6 @@ class PopoverViewController: UIViewController {
     ///
     var onViewSizeChange: (() -> Void)?
 
-
     init(viewController: UIViewController) {
         self.viewController = viewController
         super.init(nibName: nil, bundle: nil)
@@ -72,7 +70,6 @@ class PopoverViewController: UIViewController {
     }
 }
 
-
 // MARK: - Initialization
 //
 private extension PopoverViewController {
@@ -108,7 +105,6 @@ private extension PopoverViewController {
     }
 }
 
-
 // MARK: - Metrics
 //
 private enum Metrics {
diff --git a/Simplenote/Classes/SPAboutViewController.swift b/Simplenote/Classes/SPAboutViewController.swift
index b3ce35f12..22798c719 100644
--- a/Simplenote/Classes/SPAboutViewController.swift
+++ b/Simplenote/Classes/SPAboutViewController.swift
@@ -1,6 +1,5 @@
 import UIKit
 
-
 class SPAboutViewController: UIViewController {
 
     private let tableView = HuggableTableView(frame: .zero, style: .grouped)
@@ -31,7 +30,6 @@ class SPAboutViewController: UIViewController {
     }
 }
 
-
 // MARK: - Configuration
 //
 private extension SPAboutViewController {
@@ -212,7 +210,6 @@ private extension SPAboutViewController {
     }
 }
 
-
 // MARK: - UITableViewDataSource Conformance
 //
 extension SPAboutViewController: UITableViewDataSource {
@@ -249,7 +246,6 @@ extension SPAboutViewController: UITableViewDataSource {
     }
 }
 
-
 // MARK: - UITableViewDelegate Conformance
 //
 extension SPAboutViewController: UITableViewDelegate {
@@ -315,7 +311,6 @@ private extension SPAboutViewController {
     }
 }
 
-
 // MARK: - Constants
 //
 private enum Constants {
diff --git a/Simplenote/Classes/SPAuthError.swift b/Simplenote/Classes/SPAuthError.swift
index 8f3dbdf64..21d3e61a3 100644
--- a/Simplenote/Classes/SPAuthError.swift
+++ b/Simplenote/Classes/SPAuthError.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - SPAuthError
 //
 enum SPAuthError: Error {
@@ -14,7 +13,6 @@ enum SPAuthError: Error {
     case unknown(statusCode: Int, response: String?, error: Error?)
 }
 
-
 // MARK: - SPAuthError Convenience Initializers
 //
 extension SPAuthError {
@@ -52,7 +50,6 @@ extension SPAuthError {
     }
 }
 
-
 // MARK: - SPAuthError Public Methods
 //
 extension SPAuthError {
diff --git a/Simplenote/Classes/SPAuthHandler.swift b/Simplenote/Classes/SPAuthHandler.swift
index 6f655d441..bf0a85a4a 100644
--- a/Simplenote/Classes/SPAuthHandler.swift
+++ b/Simplenote/Classes/SPAuthHandler.swift
@@ -1,7 +1,6 @@
 import Foundation
 import SafariServices
 
-
 // MARK: - SPAuthHandler
 //
 class SPAuthHandler {
@@ -10,7 +9,6 @@ class SPAuthHandler {
     ///
     private let simperiumService: SPAuthenticator
 
-
     /// Designated Initializer.
     ///
     /// - Parameter simperiumService: Reference to a valid SPAuthenticator instance.
@@ -19,8 +17,6 @@ class SPAuthHandler {
         self.simperiumService = simperiumService
     }
 
-
-
     /// Authenticates against the Simperium Backend.
     ///
     /// - Note: Errors are mapped into SPAuthError Instances
@@ -39,7 +35,6 @@ class SPAuthHandler {
         })
     }
 
-
     /// Validates a set of credentials against the Simperium Backend.
     ///
     /// - Note: This API is meant to be used to verify an unsecured set of credentials, before presenting the Reset Password UI.
@@ -58,7 +53,6 @@ class SPAuthHandler {
         })
     }
 
-
     /// Registers a new user in the Simperium Backend.
     ///
     /// - Note: Errors are mapped into SPAuthError Instances
diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index a293f0f16..f6e27223e 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -2,7 +2,6 @@ import Foundation
 import UIKit
 import SafariServices
 
-
 // MARK: - SPAuthViewController
 //
 class SPAuthViewController: UIViewController {
@@ -166,15 +165,12 @@ class SPAuthViewController: UIViewController {
     ///
     var debugEnabled = false
 
-
-
     /// NSCodable Required Initializer
     ///
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 
-
     /// Designated Initializer
     ///
     init(controller: SPAuthHandler, mode: AuthenticationMode = .login) {
@@ -183,7 +179,6 @@ class SPAuthViewController: UIViewController {
         super.init(nibName: nil, bundle: nil)
     }
 
-
     // MARK: - Overridden Methods
 
     override func viewDidLoad() {
@@ -213,7 +208,6 @@ class SPAuthViewController: UIViewController {
     }
 }
 
-
 // MARK: - Actions
 //
 extension SPAuthViewController {
@@ -225,7 +219,6 @@ extension SPAuthViewController {
     }
 }
 
-
 // MARK: - Interface
 //
 private extension SPAuthViewController {
@@ -276,7 +269,6 @@ private extension SPAuthViewController {
     }
 }
 
-
 // MARK: - Actions
 //
 private extension SPAuthViewController {
@@ -347,7 +339,6 @@ private extension SPAuthViewController {
     }
 }
 
-
 // MARK: - Simperium Services
 //
 private extension SPAuthViewController {
@@ -380,7 +371,6 @@ private extension SPAuthViewController {
     }
 }
 
-
 // MARK: - Password Reset Flow
 //
 private extension SPAuthViewController {
@@ -401,7 +391,6 @@ private extension SPAuthViewController {
     }
 }
 
-
 // MARK: - Error Handling
 //
 private extension SPAuthViewController {
@@ -502,7 +491,6 @@ private extension SPAuthViewController {
     }
 }
 
-
 // MARK: - Warning Labels
 //
 private extension SPAuthViewController {
@@ -536,7 +524,6 @@ private extension SPAuthViewController {
     }
 }
 
-
 // MARK: - Validation
 //
 private extension SPAuthViewController {
@@ -588,7 +575,6 @@ private extension SPAuthViewController {
     }
 }
 
-
 // MARK: - UITextFieldDelegate Conformance
 //
 extension SPAuthViewController: SPTextInputViewDelegate {
@@ -630,7 +616,6 @@ extension SPAuthViewController: SPTextInputViewDelegate {
     }
 }
 
-
 // MARK: - AuthenticationMode: Signup / Login
 //
 struct AuthenticationMode {
@@ -644,7 +629,6 @@ struct AuthenticationMode {
     let isPasswordHidden: Bool
 }
 
-
 // MARK: - Default Operation Modes
 //
 extension AuthenticationMode {
@@ -676,7 +660,6 @@ extension AuthenticationMode {
     }
 }
 
-
 // MARK: - Authentication Strings
 //
 private enum AuthenticationStrings {
@@ -702,7 +685,6 @@ private enum AuthenticationStrings {
     static let verificationSentTemplate     = NSLocalizedString("We’ve sent a verification email to %1$@. Please check your inbox and follow the instructions.", comment: "Confirmation that an email has been sent")
 }
 
-
 // MARK: - PasswordInsecure Alert Strings
 //
 private enum PasswordInsecureString {
@@ -718,7 +700,6 @@ private enum PasswordInsecureString {
     ].joined(separator: .newline)
 }
 
-
 // MARK: - Strings >> Authenticated Strings Convenience Properties
 //
 private extension AuthenticationStrings {
@@ -738,7 +719,6 @@ private extension AuthenticationStrings {
     }
 }
 
-
 // MARK: - Authentication Constants
 //
 private enum AuthenticationConstants {
diff --git a/Simplenote/Classes/SPBlurEffectView.swift b/Simplenote/Classes/SPBlurEffectView.swift
index aaa63f9cf..627be38ce 100644
--- a/Simplenote/Classes/SPBlurEffectView.swift
+++ b/Simplenote/Classes/SPBlurEffectView.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - SPBlurEffectView: Reacts automatically to UserInterfaceStyle Changes
 //
 @objc
@@ -24,7 +23,6 @@ class SPBlurEffectView: UIVisualEffectView {
         }
     }
 
-
     // MARK: - Initializers
 
     convenience init() {
@@ -41,7 +39,6 @@ class SPBlurEffectView: UIVisualEffectView {
     }
 }
 
-
 // MARK: - Private Methods
 //
 private extension SPBlurEffectView {
@@ -65,7 +62,6 @@ private extension SPBlurEffectView {
     }
 }
 
-
 // MARK: - Static Methods
 //
 extension SPBlurEffectView {
diff --git a/Simplenote/Classes/SPContactsManager.swift b/Simplenote/Classes/SPContactsManager.swift
index 2ee4e2d6b..ed995f809 100644
--- a/Simplenote/Classes/SPContactsManager.swift
+++ b/Simplenote/Classes/SPContactsManager.swift
@@ -9,7 +9,6 @@
 import Foundation
 import Contacts
 
-
 /// Contacts Helper
 ///
 class SPContactsManager: NSObject {
@@ -34,7 +33,6 @@ class SPContactsManager: NSObject {
         return CNContactStore.authorizationStatus(for: .contacts)
     }
 
-
     /// Deinitializer
     ///
     deinit {
@@ -75,8 +73,6 @@ class SPContactsManager: NSObject {
     }
 }
 
-
-
 /// Contacts Helper
 ///
 private extension SPContactsManager {
diff --git a/Simplenote/Classes/SPDefaultTableViewCell.swift b/Simplenote/Classes/SPDefaultTableViewCell.swift
index 83283a099..f7e0e1652 100644
--- a/Simplenote/Classes/SPDefaultTableViewCell.swift
+++ b/Simplenote/Classes/SPDefaultTableViewCell.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 // MARK: - UITableViewCell with the `.default` Style
 //
 class SPDefaultTableViewCell: UITableViewCell {
@@ -31,7 +30,6 @@ class SPDefaultTableViewCell: UITableViewCell {
     }
 }
 
-
 // MARK: - Private
 //
 private extension SPDefaultTableViewCell {
diff --git a/Simplenote/Classes/SPDiagnosticsViewController.swift b/Simplenote/Classes/SPDiagnosticsViewController.swift
index a7be9be7e..aae96be78 100644
--- a/Simplenote/Classes/SPDiagnosticsViewController.swift
+++ b/Simplenote/Classes/SPDiagnosticsViewController.swift
@@ -17,7 +17,6 @@ class SPDiagnosticsViewController: UIViewController {
     ///
     var attributedText: NSAttributedString?
 
-
     // MARK: - Overridden Methods
 
     override func viewDidLoad() {
@@ -28,7 +27,6 @@ class SPDiagnosticsViewController: UIViewController {
     }
 }
 
-
 // MARK: - Interface
 //
 private extension SPDiagnosticsViewController {
@@ -55,7 +53,6 @@ private extension SPDiagnosticsViewController {
     }
 }
 
-
 // MARK: - Actions
 //
 private extension SPDiagnosticsViewController {
diff --git a/Simplenote/Classes/SPEditorTapRecognizerDelegate.swift b/Simplenote/Classes/SPEditorTapRecognizerDelegate.swift
index 784afc656..f08beb2f7 100644
--- a/Simplenote/Classes/SPEditorTapRecognizerDelegate.swift
+++ b/Simplenote/Classes/SPEditorTapRecognizerDelegate.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - SPEditorTapRecognizerDelegate
 //  Since the dawn of time, UITextView itself was set as (our own) TapGestureRecognizer delegate.
 //  As per iOS 14, the new (superclass) implementation is not allowing our Tap recognizer to work simultaneously with its (internal)
@@ -21,7 +20,6 @@ class SPEditorTapRecognizerDelegate: NSObject, UIGestureRecognizerDelegate {
     @objc
     weak var excludedView: UIView?
 
-
     /// TextView only performs linkification when the `editable` flag is disabled.
     /// We're allowing Edition by means of a TapGestureRecognizer, which also allows us to deal with Tap events performed over TextAttachments
     ///
diff --git a/Simplenote/Classes/SPFeedbackManager.swift b/Simplenote/Classes/SPFeedbackManager.swift
index 574a71cd3..9dff32fc9 100644
--- a/Simplenote/Classes/SPFeedbackManager.swift
+++ b/Simplenote/Classes/SPFeedbackManager.swift
@@ -2,7 +2,6 @@ import Foundation
 import MessageUI
 import SafariServices
 
-
 // MARK: - SPFeedbackManager
 //
 @objcMembers
@@ -36,7 +35,6 @@ class SPFeedbackManager: NSObject {
     }
 }
 
-
 // MARK: - MFMailComposeViewControllerDelegate
 //
 extension SPFeedbackManager: MFMailComposeViewControllerDelegate {
diff --git a/Simplenote/Classes/SPLabel.swift b/Simplenote/Classes/SPLabel.swift
index d82950dc0..6f2490f6b 100644
--- a/Simplenote/Classes/SPLabel.swift
+++ b/Simplenote/Classes/SPLabel.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - SPLabel: Standard UIKit Label with extra properties. And batteries!
 //
 @IBDesignable
@@ -11,7 +10,6 @@ class SPLabel: UILabel {
     ///
     @IBInspectable var textInsets = UIEdgeInsets.zero
 
-
     // MARK: - Overrides
 
     override func drawText(in rect: CGRect) {
diff --git a/Simplenote/Classes/SPNoteEditorViewController+Extensions.swift b/Simplenote/Classes/SPNoteEditorViewController+Extensions.swift
index 9774d4dc3..48fc05943 100644
--- a/Simplenote/Classes/SPNoteEditorViewController+Extensions.swift
+++ b/Simplenote/Classes/SPNoteEditorViewController+Extensions.swift
@@ -1,7 +1,6 @@
 import Foundation
 import CoreSpotlight
 
-
 // MARK: - Overridden Methods
 //
 extension SPNoteEditorViewController {
@@ -26,7 +25,6 @@ extension SPNoteEditorViewController {
     }
 }
 
-
 // MARK: - Interface Initialization
 //
 extension SPNoteEditorViewController {
@@ -120,7 +118,6 @@ extension SPNoteEditorViewController {
     }
 }
 
-
 // MARK: - Layout
 //
 extension SPNoteEditorViewController {
@@ -241,7 +238,6 @@ extension SPNoteEditorViewController: KeyboardObservable {
     }
 }
 
-
 // MARK: - Voiceover Support
 //
 extension SPNoteEditorViewController {
@@ -277,7 +273,6 @@ extension SPNoteEditorViewController {
     }
 }
 
-
 // MARK: - State Restoration
 //
 extension SPNoteEditorViewController {
@@ -304,7 +299,6 @@ extension SPNoteEditorViewController {
     }
 }
 
-
 // MARK: - History
 //
 extension SPNoteEditorViewController {
@@ -354,7 +348,6 @@ extension SPNoteEditorViewController {
     }
 }
 
-
 // MARK: - History Delegate
 //
 extension SPNoteEditorViewController: SPNoteHistoryControllerDelegate {
@@ -375,7 +368,6 @@ extension SPNoteEditorViewController: SPNoteHistoryControllerDelegate {
     }
 }
 
-
 // MARK: - SPCardPresentationControllerDelegate
 //
 extension SPNoteEditorViewController: SPCardPresentationControllerDelegate {
@@ -500,8 +492,6 @@ private extension SPNoteEditorViewController {
     }
 }
 
-
-
 // MARK: - Services
 //
 extension SPNoteEditorViewController {
@@ -581,7 +571,6 @@ extension SPNoteEditorViewController {
     }
 }
 
-
 // MARK: - Editor
 //
 private extension SPNoteEditorViewController {
@@ -629,7 +618,6 @@ private extension SPNoteEditorViewController {
     }
 }
 
-
 // MARK: - OptionsControllerDelegate
 //
 extension SPNoteEditorViewController: OptionsControllerDelegate {
@@ -663,7 +651,6 @@ extension SPNoteEditorViewController: OptionsControllerDelegate {
     }
 }
 
-
 // MARK: - Accessibility
 //
 private extension SPNoteEditorViewController {
@@ -673,7 +660,6 @@ private extension SPNoteEditorViewController {
     }
 }
 
-
 // MARK: - Actions
 //
 extension SPNoteEditorViewController {
@@ -717,7 +703,6 @@ extension SPNoteEditorViewController {
     }
 }
 
-
 // MARK: - InterlinkProcessorDelegate
 //
 extension SPNoteEditorViewController: InterlinkProcessorDelegate {
@@ -727,7 +712,6 @@ extension SPNoteEditorViewController: InterlinkProcessorDelegate {
     }
 }
 
-
 // MARK: - Tags
 //
 extension SPNoteEditorViewController {
@@ -777,7 +761,6 @@ extension SPNoteEditorViewController {
     }
 }
 
-
 // MARK: - NoteEditorTagListViewControllerDelegate
 //
 extension SPNoteEditorViewController: NoteEditorTagListViewControllerDelegate {
@@ -799,7 +782,6 @@ extension SPNoteEditorViewController: NoteEditorTagListViewControllerDelegate {
     }
 }
 
-
 // MARK: - Style
 //
 extension SPNoteEditorViewController {
@@ -961,8 +943,6 @@ extension SPNoteEditorViewController {
                                          title: Localization.Shortcuts.toggleMarkdown))
         }
 
-
-
         if searching {
             commands.append(contentsOf: [
                 UIKeyCommand(input: "g",
@@ -1038,7 +1018,6 @@ extension SPNoteEditorViewController {
     }
 }
 
-
 // MARK: - Scroll position
 //
 extension SPNoteEditorViewController {
@@ -1066,7 +1045,6 @@ extension SPNoteEditorViewController {
     }
 }
 
-
 // MARK: - Metrics
 //
 private enum Metrics {
@@ -1081,7 +1059,6 @@ private enum Metrics {
     static let additionalTagViewAndEditorCollisionDistance: CGFloat = 16.0
 }
 
-
 // MARK: - Localization
 //
 private enum Localization {
diff --git a/Simplenote/Classes/SPNoteListViewController+Extensions.swift b/Simplenote/Classes/SPNoteListViewController+Extensions.swift
index 08ee2a98e..8c0677a3c 100644
--- a/Simplenote/Classes/SPNoteListViewController+Extensions.swift
+++ b/Simplenote/Classes/SPNoteListViewController+Extensions.swift
@@ -149,7 +149,6 @@ extension SPNoteListViewController {
     }
 }
 
-
 // MARK: - Internal Methods
 //
 extension SPNoteListViewController {
@@ -403,7 +402,6 @@ extension SPNoteListViewController {
     }
 }
 
-
 // MARK: - UIScrollViewDelegate
 //
 extension SPNoteListViewController: UIScrollViewDelegate {
@@ -417,7 +415,6 @@ extension SPNoteListViewController: UIScrollViewDelegate {
     }
 }
 
-
 // MARK: - UITableViewDataSource
 //
 extension SPNoteListViewController: UITableViewDataSource {
@@ -467,7 +464,6 @@ extension SPNoteListViewController: UITableViewDataSource {
     }
 }
 
-
 // MARK: - UITableViewDelegate
 //
 extension SPNoteListViewController: UITableViewDelegate {
@@ -583,7 +579,6 @@ extension SPNoteListViewController: UITableViewDelegate {
     }
 }
 
-
 // MARK: - TableViewCell(s) Initialization
 //
 private extension SPNoteListViewController {
@@ -641,7 +636,6 @@ private extension SPNoteListViewController {
     }
 }
 
-
 // MARK: - Table
 //
 extension SPNoteListViewController {
@@ -772,12 +766,10 @@ private extension SPNoteListViewController {
             }
         shareAction.accessibilityLabel = ActionTitle.share
 
-
         return [trashAction, pinAction, copyAction, shareAction]
     }
 }
 
-
 // MARK: - UIMenu
 //
 private extension SPNoteListViewController {
@@ -826,7 +818,6 @@ private extension SPNoteListViewController {
     }
 }
 
-
 // MARK: - Services
 //
 private extension SPNoteListViewController {
@@ -893,7 +884,6 @@ private extension SPNoteListViewController {
     }
 }
 
-
 // MARK: - Services (Internal)
 //
 extension SPNoteListViewController {
@@ -908,7 +898,6 @@ extension SPNoteListViewController {
     }
 }
 
-
 // MARK: - Keyboard Handling
 //
 extension SPNoteListViewController {
@@ -957,7 +946,6 @@ extension SPNoteListViewController {
     }
 }
 
-
 // MARK: - Search Action Handlers
 //
 extension SPNoteListViewController {
@@ -981,7 +969,6 @@ extension SPNoteListViewController {
     }
 }
 
-
 // MARK: - Keyboard
 //
 extension SPNoteListViewController {
@@ -1047,7 +1034,6 @@ private extension SPNoteListViewController {
     }
 }
 
-
 // MARK: - Private Types
 //
 private enum ActionTitle {
@@ -1092,7 +1078,6 @@ private enum Localization {
 
         static let untagged = NSLocalizedString("No untagged notes", comment: "Message shown in note list when no notes are untagged")
 
-
         static func tagged(with tag: String) -> String {
             return String(format: NSLocalizedString("No notes tagged “%@”", comment: "Message shown in note list when no notes are tagged with the provided tag. Parameter: %@ - tag"), tag)
         }
diff --git a/Simplenote/Classes/SPNoteTableViewCell.swift b/Simplenote/Classes/SPNoteTableViewCell.swift
index d1cb75cff..1f9fde988 100644
--- a/Simplenote/Classes/SPNoteTableViewCell.swift
+++ b/Simplenote/Classes/SPNoteTableViewCell.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - SPNoteTableViewCell
 //
 @objcMembers
@@ -137,8 +136,6 @@ class SPNoteTableViewCell: UITableViewCell {
         .zero
     }
 
-
-
     /// Deinitializer
     ///
     deinit {
@@ -152,7 +149,6 @@ class SPNoteTableViewCell: UITableViewCell {
         startListeningToNotifications()
     }
 
-
     // MARK: - Overridden Methods
 
     override func awakeFromNib() {
@@ -222,7 +218,6 @@ class SPNoteTableViewCell: UITableViewCell {
     }
 }
 
-
 // MARK: - Private Methods: Initialization
 //
 private extension SPNoteTableViewCell {
@@ -262,7 +257,6 @@ private extension SPNoteTableViewCell {
     }
 }
 
-
 // MARK: - Notifications
 //
 private extension SPNoteTableViewCell {
@@ -284,7 +278,6 @@ private extension SPNoteTableViewCell {
     }
 }
 
-
 // MARK: - Private Methods: Skinning
 //
 private extension SPNoteTableViewCell {
@@ -317,7 +310,6 @@ private extension SPNoteTableViewCell {
     }
 }
 
-
 // MARK: - SPNoteTableViewCell
 //
 extension SPNoteTableViewCell {
@@ -355,7 +347,6 @@ extension SPNoteTableViewCell {
     }
 }
 
-
 // MARK: - Cell Styles
 //
 private enum Style {
@@ -445,8 +436,6 @@ private enum Style {
     }
 }
 
-
-
 // MARK: - NSAttributedString Private Methods
 //
 private extension NSAttributedString {
diff --git a/Simplenote/Classes/SPOnboardingViewController.swift b/Simplenote/Classes/SPOnboardingViewController.swift
index 5914ab578..c80e9a0f5 100644
--- a/Simplenote/Classes/SPOnboardingViewController.swift
+++ b/Simplenote/Classes/SPOnboardingViewController.swift
@@ -2,7 +2,6 @@ import Foundation
 import UIKit
 import SafariServices
 
-
 // MARK: - SPOnboardingViewController
 //
 class SPOnboardingViewController: UIViewController, SPAuthenticationInterface {
@@ -43,7 +42,6 @@ class SPOnboardingViewController: UIViewController, SPAuthenticationInterface {
     ///
     var authenticator: SPAuthenticator?
 
-
     // MARK: - Overriden Properties
 
     override var supportedInterfaceOrientations: UIInterfaceOrientationMask {
@@ -54,7 +52,6 @@ class SPOnboardingViewController: UIViewController, SPAuthenticationInterface {
         return false
     }
 
-
     // MARK: - Overridden Methods
 
     override func viewDidLoad() {
@@ -74,7 +71,6 @@ class SPOnboardingViewController: UIViewController, SPAuthenticationInterface {
     }
 }
 
-
 // MARK: - Private
 //
 private extension SPOnboardingViewController {
@@ -141,7 +137,6 @@ private extension SPOnboardingViewController {
     }
 }
 
-
 // MARK: - Actions
 //
 private extension SPOnboardingViewController {
@@ -195,7 +190,6 @@ private extension SPOnboardingViewController {
     }
 }
 
-
 // MARK: - Actions
 //
 private extension SPOnboardingViewController {
@@ -219,7 +213,6 @@ private extension SPOnboardingViewController {
 
 }
 
-
 // MARK: - Private Types
 //
 private struct OnboardingStrings {
@@ -233,7 +226,6 @@ private struct OnboardingStrings {
     static let loginWithWpcomText = NSLocalizedString("Log in with WordPress.com", comment: "Allows the user to SignIn using their WPCOM Account")
 }
 
-
 private struct SignInError {
     static let title = NSLocalizedString("Couldn't Sign In", comment: "Alert dialog title displayed on sign in error")
     static let genericErrorText = NSLocalizedString("An error was encountered while signing in.", comment: "Sign in error message")
diff --git a/Simplenote/Classes/SPPlaceholderView.swift b/Simplenote/Classes/SPPlaceholderView.swift
index 2d8d1d506..ce5867cf3 100644
--- a/Simplenote/Classes/SPPlaceholderView.swift
+++ b/Simplenote/Classes/SPPlaceholderView.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - SPPlaceholderView
 //
 @objc
@@ -23,7 +22,6 @@ class SPPlaceholderView: UIView {
         }
     }
 
-
     /// Placeholder Image
     ///
     private lazy var imageView: UIImageView = {
@@ -61,7 +59,6 @@ class SPPlaceholderView: UIView {
         return stackView
     }()
 
-
     // MARK: - Initializers
 
     init() {
@@ -83,7 +80,6 @@ class SPPlaceholderView: UIView {
     }
 }
 
-
 // MARK: - Private Methods
 //
 private extension SPPlaceholderView {
diff --git a/Simplenote/Classes/SPRatingsPromptView.swift b/Simplenote/Classes/SPRatingsPromptView.swift
index 2a84e7877..b3b7dd8e1 100644
--- a/Simplenote/Classes/SPRatingsPromptView.swift
+++ b/Simplenote/Classes/SPRatingsPromptView.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - SPRatingsPromptDelegate
 //
 @objc
@@ -13,7 +12,6 @@ protocol SPRatingsPromptDelegate: AnyObject {
     func dismissRatingsUI()
 }
 
-
 // MARK: - SPRatingsPromptView
 //
 class SPRatingsPromptView: UIView {
@@ -55,7 +53,6 @@ class SPRatingsPromptView: UIView {
     @objc
     weak var delegate: SPRatingsPromptDelegate?
 
-
     // MARK: - Lifecycle
 
     deinit {
@@ -74,7 +71,6 @@ class SPRatingsPromptView: UIView {
     }
 }
 
-
 // MARK: - Private Methods
 //
 private extension SPRatingsPromptView {
@@ -126,7 +122,6 @@ private extension SPRatingsPromptView {
     }
 }
 
-
 // MARK: - Notifications
 //
 private extension SPRatingsPromptView {
@@ -175,7 +170,6 @@ private extension SPRatingsPromptView {
     }
 }
 
-
 // MARK: - Constants
 //
 private struct Settings {
@@ -183,7 +177,6 @@ private struct Settings {
     static let buttonCornerRAdius = CGFloat(4)
 }
 
-
 // MARK: - Ratings State
 //
 private enum State {
@@ -192,7 +185,6 @@ private enum State {
     case disliked
 }
 
-
 private extension State {
 
     var title: String {
diff --git a/Simplenote/Classes/SPSectionHeaderView.swift b/Simplenote/Classes/SPSectionHeaderView.swift
index 4b53e363c..489219844 100644
--- a/Simplenote/Classes/SPSectionHeaderView.swift
+++ b/Simplenote/Classes/SPSectionHeaderView.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - SPSectionHeaderView
 //
 @objcMembers
@@ -29,7 +28,6 @@ class SPSectionHeaderView: UITableViewHeaderFooterView {
     ///
     private lazy var nib = UINib(nibName: type(of: self).classNameWithoutNamespaces, bundle: nil)
 
-
     // MARK: - Overridden Methods
 
     override init(reuseIdentifier: String?) {
@@ -50,7 +48,6 @@ class SPSectionHeaderView: UITableViewHeaderFooterView {
     }
 }
 
-
 // MARK: - Private Methods
 //
 private extension SPSectionHeaderView {
diff --git a/Simplenote/Classes/SPSettingsViewController+Extensions.swift b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
index 964772b94..596d03cb0 100644
--- a/Simplenote/Classes/SPSettingsViewController+Extensions.swift
+++ b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
@@ -1,6 +1,5 @@
 import UIKit
 
-
 // MARK: - Subscriber UI
 //
 extension SPSettingsViewController {
@@ -62,7 +61,6 @@ extension SPSettingsViewController {
     }
 }
 
-
 // MARK: - Pin
 //
 extension SPSettingsViewController {
@@ -237,7 +235,6 @@ private struct AccountDeletion {
     }
 }
 
-
 // MARK: - RestorationAlert
 //
 struct RestorationAlert {
diff --git a/Simplenote/Classes/SPSheetController.swift b/Simplenote/Classes/SPSheetController.swift
index 68de0a83f..dc9feb8d2 100644
--- a/Simplenote/Classes/SPSheetController.swift
+++ b/Simplenote/Classes/SPSheetController.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - Renders a customized Action Sheet
 //
 class SPSheetController: UIViewController {
@@ -42,8 +41,6 @@ class SPSheetController: UIViewController {
     ///
     var onClickButton1: (() -> Void)?
 
-
-
     /// Designated Initializer
     ///
     init() {
@@ -57,7 +54,6 @@ class SPSheetController: UIViewController {
         fatalError("init(coder:) has not been implemented")
     }
 
-
     // MARK: - Required Methods
 
     override func viewWillAppear(_ animated: Bool) {
@@ -70,7 +66,6 @@ class SPSheetController: UIViewController {
         performSlideUpAnimation()
     }
 
-
     // MARK: - Public Methods
 
     func present(from viewController: UIViewController) {
@@ -93,7 +88,6 @@ class SPSheetController: UIViewController {
     }
 }
 
-
 // MARK: - Private Methods
 //
 private extension SPSheetController {
@@ -117,7 +111,6 @@ private extension SPSheetController {
     }
 }
 
-
 // MARK: - Actions
 //
 private extension SPSheetController {
@@ -137,7 +130,6 @@ private extension SPSheetController {
     }
 }
 
-
 // MARK: - Animations
 //
 private extension SPSheetController {
diff --git a/Simplenote/Classes/SPSortBar.swift b/Simplenote/Classes/SPSortBar.swift
index f4b42953d..c1580d4e6 100644
--- a/Simplenote/Classes/SPSortBar.swift
+++ b/Simplenote/Classes/SPSortBar.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - SPSortBar
 //
 class SPSortBar: UIView {
@@ -45,7 +44,6 @@ class SPSortBar: UIView {
     ///
     var onSortModePress: (() -> Void)?
 
-
     // MARK: - Lifecycle
 
     deinit {
@@ -67,7 +65,6 @@ class SPSortBar: UIView {
     }
 }
 
-
 // MARK: - Private Methods
 //
 private extension SPSortBar {
@@ -111,7 +108,6 @@ private extension SPSortBar {
     }
 }
 
-
 // MARK: - Notifications
 //
 private extension SPSortBar {
@@ -130,7 +126,6 @@ private extension SPSortBar {
     }
 }
 
-
 // MARK: - Action Handlers
 //
 private extension SPSortBar {
diff --git a/Simplenote/Classes/SPSortOrderViewController.swift b/Simplenote/Classes/SPSortOrderViewController.swift
index 850ba1888..94bf9ba6d 100644
--- a/Simplenote/Classes/SPSortOrderViewController.swift
+++ b/Simplenote/Classes/SPSortOrderViewController.swift
@@ -8,7 +8,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - Settings: Sort Order
 //
 class SPSortOrderViewController: UITableViewController {
@@ -49,7 +48,6 @@ class SPSortOrderViewController: UITableViewController {
     }
 }
 
-
 // MARK: - UITableViewDelegate Conformance
 //
 extension SPSortOrderViewController {
@@ -78,7 +76,6 @@ extension SPSortOrderViewController {
     }
 }
 
-
 // MARK: - Private
 //
 private extension SPSortOrderViewController {
@@ -124,7 +121,6 @@ private extension SPSortOrderViewController {
     }
 }
 
-
 extension SPSortOrderViewController {
 
     @objc
diff --git a/Simplenote/Classes/SPSquaredButton.swift b/Simplenote/Classes/SPSquaredButton.swift
index 160b0cc0e..7564dc1c3 100644
--- a/Simplenote/Classes/SPSquaredButton.swift
+++ b/Simplenote/Classes/SPSquaredButton.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - SPSquaredButton: Simple convenience UIButton subclass, with a default corner radius
 //
 @IBDesignable
@@ -34,7 +33,6 @@ class SPSquaredButton: UIButton {
     }
 }
 
-
 // MARK: - Private Methods
 //
 private extension SPSquaredButton {
diff --git a/Simplenote/Classes/SPTagHeaderView.swift b/Simplenote/Classes/SPTagHeaderView.swift
index 4d4fa0f23..a46c3fb5e 100644
--- a/Simplenote/Classes/SPTagHeaderView.swift
+++ b/Simplenote/Classes/SPTagHeaderView.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - SPTagHeaderView
 //
 @objc @objcMembers
@@ -19,7 +18,6 @@ class SPTagHeaderView: UIView {
         }
     }
 
-
     // MARK: - Overriden Methods
 
     override func awakeFromNib() {
@@ -27,7 +25,6 @@ class SPTagHeaderView: UIView {
         refreshStyle()
     }
 
-
     /// Updates the receiver's colors
     ///
     func refreshStyle() {
diff --git a/Simplenote/Classes/SPTagTableViewCell.swift b/Simplenote/Classes/SPTagTableViewCell.swift
index 3af45d283..9aa88322a 100644
--- a/Simplenote/Classes/SPTagTableViewCell.swift
+++ b/Simplenote/Classes/SPTagTableViewCell.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - SPTagTableViewCell
 //
 @objcMembers
@@ -56,7 +55,6 @@ class SPTagTableViewCell: UITableViewCell {
         }
     }
 
-
     /// Deinitializer
     ///
     deinit {
@@ -70,7 +68,6 @@ class SPTagTableViewCell: UITableViewCell {
         startListeningToNotifications()
     }
 
-
     // MARK: - Overridden Methods
 
     override func awakeFromNib() {
@@ -87,7 +84,6 @@ class SPTagTableViewCell: UITableViewCell {
     }
 }
 
-
 // MARK: - Private Methods
 //
 private extension SPTagTableViewCell {
@@ -124,7 +120,6 @@ private extension SPTagTableViewCell {
     }
 }
 
-
 // MARK: - Notifications
 //
 private extension SPTagTableViewCell {
@@ -146,7 +141,6 @@ private extension SPTagTableViewCell {
     }
 }
 
-
 // MARK: - Static!
 //
 extension SPTagTableViewCell {
@@ -164,7 +158,6 @@ extension SPTagTableViewCell {
     }
 }
 
-
 // MARK: - Cell Styles
 //
 private enum Style {
diff --git a/Simplenote/Classes/SPTextInputView.swift b/Simplenote/Classes/SPTextInputView.swift
index f85b72bd8..2f1d32b6e 100644
--- a/Simplenote/Classes/SPTextInputView.swift
+++ b/Simplenote/Classes/SPTextInputView.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - SPTextInputViewDelegate
 //
 @objc
@@ -22,7 +21,6 @@ protocol SPTextInputViewDelegate: NSObjectProtocol {
     func textInput(_ textInput: SPTextInputView, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool
 }
 
-
 // MARK: - SPTextInputView:
 //         Renders a custom UITextView with bezel. When becomes the first responder, the border color will be refreshed.
 //
@@ -239,7 +237,6 @@ class SPTextInputView: UIView {
     ///
     weak var delegate: SPTextInputViewDelegate?
 
-
     // MARK: - Initializers
 
     override init(frame: CGRect) {
@@ -258,7 +255,6 @@ class SPTextInputView: UIView {
         refreshBorderStyle()
     }
 
-
     // MARK: - Public Methods
 
     @discardableResult
@@ -267,7 +263,6 @@ class SPTextInputView: UIView {
     }
 }
 
-
 // MARK: - Private
 //
 private extension SPTextInputView {
@@ -310,7 +305,6 @@ private extension SPTextInputView {
     }
 }
 
-
 // MARK: - Relaying editingChanged Events
 //
 extension SPTextInputView {
@@ -320,7 +314,6 @@ extension SPTextInputView {
     }
 }
 
-
 // MARK: - UITextFieldDelegate
 //
 extension SPTextInputView: UITextFieldDelegate {
@@ -344,7 +337,6 @@ extension SPTextInputView: UITextFieldDelegate {
     }
 }
 
-
 // MARK: - Default Settings
 //
 private enum Defaults {
diff --git a/Simplenote/Classes/SPThemeViewController.swift b/Simplenote/Classes/SPThemeViewController.swift
index fd9733df3..3955afef7 100644
--- a/Simplenote/Classes/SPThemeViewController.swift
+++ b/Simplenote/Classes/SPThemeViewController.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - Settings: Theme
 //
 class SPThemeViewController: UITableViewController {
@@ -32,7 +31,6 @@ class SPThemeViewController: UITableViewController {
     ///
     var displaysDismissButton = false
 
-
     /// Designated Initializer
     ///
     init() {
@@ -50,7 +48,6 @@ class SPThemeViewController: UITableViewController {
     }
 }
 
-
 // MARK: - UITableViewDelegate Conformance
 //
 extension SPThemeViewController {
@@ -79,7 +76,6 @@ extension SPThemeViewController {
     }
 }
 
-
 // MARK: - Private
 //
 private extension SPThemeViewController {
@@ -128,7 +124,6 @@ private extension SPThemeViewController {
     }
 }
 
-
 extension SPThemeViewController {
 
     @objc
diff --git a/Simplenote/Classes/SPUserInterface.swift b/Simplenote/Classes/SPUserInterface.swift
index 6d8b058b5..46a056ed8 100644
--- a/Simplenote/Classes/SPUserInterface.swift
+++ b/Simplenote/Classes/SPUserInterface.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - Simplenote's Theme
 //
 @objc
@@ -41,7 +40,6 @@ class SPUserInterface: NSObject {
     }
 }
 
-
 // MARK: - Private Methods
 //
 private extension SPUserInterface {
@@ -66,7 +64,6 @@ private extension SPUserInterface {
     }
 }
 
-
 // MARK: - Private Theme Methods
 //
 private extension Theme {
diff --git a/Simplenote/Classes/SearchDisplayController.swift b/Simplenote/Classes/SearchDisplayController.swift
index 876648008..28610cfec 100644
--- a/Simplenote/Classes/SearchDisplayController.swift
+++ b/Simplenote/Classes/SearchDisplayController.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - SearchDisplayController Delegate Methods
 //
 @objc
@@ -12,7 +11,6 @@ protocol SearchDisplayControllerDelegate: NSObjectProtocol {
     func searchDisplayControllerDidEndSearch(_ controller: SearchDisplayController)
 }
 
-
 // MARK: - SearchControllerPresentationContextProvider Methods
 //
 @objc
@@ -20,7 +18,6 @@ protocol SearchControllerPresentationContextProvider: NSObjectProtocol {
     func navigationControllerForSearchDisplayController(_ controller: SearchDisplayController) -> UINavigationController
 }
 
-
 // MARK: - Simplenote's Search Controller: Because UIKit's Search Controller is simply unusable
 //
 @objcMembers
@@ -42,7 +39,6 @@ class SearchDisplayController: NSObject {
     ///
     weak var presenter: SearchControllerPresentationContextProvider?
 
-
     /// Designated Initializer
     ///
     override init() {
@@ -86,7 +82,6 @@ class SearchDisplayController: NSObject {
     }
 }
 
-
 // MARK: - Private Methods
 //
 private extension SearchDisplayController {
@@ -141,7 +136,6 @@ private extension SearchDisplayController {
     }
 }
 
-
 // MARK: - UISearchBar Delegate Methods
 //
 extension SearchDisplayController: UISearchBarDelegate {
@@ -169,7 +163,6 @@ extension SearchDisplayController: UISearchBarDelegate {
     }
 }
 
-
 // MARK: - SPSearchBar
 //
 class SPSearchBar: UISearchBar {
diff --git a/Simplenote/Classes/ShortcutsHandler.swift b/Simplenote/Classes/ShortcutsHandler.swift
index edc27f57e..6ec70ace4 100644
--- a/Simplenote/Classes/ShortcutsHandler.swift
+++ b/Simplenote/Classes/ShortcutsHandler.swift
@@ -1,7 +1,6 @@
 import Foundation
 import CoreSpotlight
 
-
 // MARK: - AppDelegate Shortcuts Methods
 //
 class ShortcutsHandler: NSObject {
diff --git a/Simplenote/Classes/SignupVerificationViewController.swift b/Simplenote/Classes/SignupVerificationViewController.swift
index b38dc1b56..ca6d2adaf 100644
--- a/Simplenote/Classes/SignupVerificationViewController.swift
+++ b/Simplenote/Classes/SignupVerificationViewController.swift
@@ -66,7 +66,6 @@ class SignupVerificationViewController: UIViewController {
     }
 }
 
-
 // MARK: - Localization
 //
 private struct Localization {
diff --git a/Simplenote/Classes/Simperium+Simplenote.swift b/Simplenote/Classes/Simperium+Simplenote.swift
index a0450575a..6e15cbcfd 100644
--- a/Simplenote/Classes/Simperium+Simplenote.swift
+++ b/Simplenote/Classes/Simperium+Simplenote.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - Simperium + Buckets
 //
 extension Simperium {
@@ -46,7 +45,6 @@ extension Simperium {
     }
 }
 
-
 // MARK: - Public API(s)
 //
 extension Simperium {
@@ -59,7 +57,6 @@ extension Simperium {
     }
 }
 
-
 // MARK: - Constants
 //
 extension Simperium {
diff --git a/Simplenote/Classes/SimplenoteActivityItemSource.swift b/Simplenote/Classes/SimplenoteActivityItemSource.swift
index 39ee83f17..8999edd9c 100644
--- a/Simplenote/Classes/SimplenoteActivityItemSource.swift
+++ b/Simplenote/Classes/SimplenoteActivityItemSource.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - UIActivityItem With Special Treatment for WordPress iOS
 //
 class SimplenoteActivityItemSource: NSObject, UIActivityItemSource {
diff --git a/Simplenote/Classes/SimplenoteConstants.swift b/Simplenote/Classes/SimplenoteConstants.swift
index 7e753cee6..f273e382e 100644
--- a/Simplenote/Classes/SimplenoteConstants.swift
+++ b/Simplenote/Classes/SimplenoteConstants.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - Simplenote Constants!
 //
 @objcMembers
diff --git a/Simplenote/Classes/SortMode.swift b/Simplenote/Classes/SortMode.swift
index 120daaaa3..a623ff8a9 100644
--- a/Simplenote/Classes/SortMode.swift
+++ b/Simplenote/Classes/SortMode.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - Represents all of the possible Sort Modes
 //
 @objc
diff --git a/Simplenote/Classes/SortModePickerViewController.swift b/Simplenote/Classes/SortModePickerViewController.swift
index ed898dab2..58f06bf21 100644
--- a/Simplenote/Classes/SortModePickerViewController.swift
+++ b/Simplenote/Classes/SortModePickerViewController.swift
@@ -43,7 +43,6 @@ class SortModePickerViewController: UIViewController {
     }
 }
 
-
 // MARK: - UITableViewDelegate
 //
 extension SortModePickerViewController: UITableViewDelegate {
@@ -53,7 +52,6 @@ extension SortModePickerViewController: UITableViewDelegate {
     }
 }
 
-
 // MARK: - UITableViewDataSource
 //
 extension SortModePickerViewController: UITableViewDataSource {
diff --git a/Simplenote/Classes/String+Simplenote.swift b/Simplenote/Classes/String+Simplenote.swift
index edd977525..750d31869 100644
--- a/Simplenote/Classes/String+Simplenote.swift
+++ b/Simplenote/Classes/String+Simplenote.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - String
 //
 extension String {
@@ -18,7 +17,6 @@ extension String {
     static let tab = "\t"
 }
 
-
 // MARK: - Helper API(s)
 //
 extension String {
diff --git a/Simplenote/Classes/SwitchTableViewCell.swift b/Simplenote/Classes/SwitchTableViewCell.swift
index 4ffb5e3e7..ef369c4bc 100644
--- a/Simplenote/Classes/SwitchTableViewCell.swift
+++ b/Simplenote/Classes/SwitchTableViewCell.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - SwitchTableViewCell
 //
 class SwitchTableViewCell: UITableViewCell {
@@ -45,7 +44,6 @@ class SwitchTableViewCell: UITableViewCell {
     ///
     var onChange: ((Bool) -> Void)?
 
-
     // MARK: - Initializers
 
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
@@ -61,7 +59,6 @@ class SwitchTableViewCell: UITableViewCell {
     }
 }
 
-
 // MARK: - Private API(s)
 //
 private extension SwitchTableViewCell {
@@ -90,7 +87,6 @@ private extension SwitchTableViewCell {
     }
 }
 
-
 // MARK: - Action Handlers
 //
 extension SwitchTableViewCell {
diff --git a/Simplenote/Classes/TagView.swift b/Simplenote/Classes/TagView.swift
index 655ae7fab..831fb7da5 100644
--- a/Simplenote/Classes/TagView.swift
+++ b/Simplenote/Classes/TagView.swift
@@ -1,6 +1,5 @@
 import UIKit
 
-
 // MARK: - TagViewDelegate
 //
 protocol TagViewDelegate: AnyObject {
@@ -11,7 +10,6 @@ protocol TagViewDelegate: AnyObject {
     func tagViewDidChange(_ tagView: TagView)
 }
 
-
 // MARK: - TagView
 //
 class TagView: UIView {
@@ -136,7 +134,6 @@ class TagView: UIView {
     }
 }
 
-
 // MARK: - Private
 //
 private extension TagView {
@@ -185,7 +182,6 @@ private extension TagView {
     }
 }
 
-
 // MARK: - Cells
 //
 private extension TagView {
@@ -221,7 +217,6 @@ private extension TagView {
     }
 }
 
-
 // MARK: - Editing
 //
 private extension TagView {
@@ -252,7 +247,6 @@ private extension TagView {
     }
 }
 
-
 // MARK: - Tag processing
 //
 private extension TagView {
@@ -313,7 +307,6 @@ extension TagView: UITextFieldDelegate {
     }
 }
 
-
 // MARK: - SPTagEntryFieldDelegate
 //
 extension TagView: SPTagEntryFieldDelegate {
@@ -328,7 +321,6 @@ extension TagView: SPTagEntryFieldDelegate {
     }
 }
 
-
 // MARK: - Constants
 //
 private struct Constants {
diff --git a/Simplenote/Classes/TagViewCell.swift b/Simplenote/Classes/TagViewCell.swift
index 0bf68eabc..f86762886 100644
--- a/Simplenote/Classes/TagViewCell.swift
+++ b/Simplenote/Classes/TagViewCell.swift
@@ -73,7 +73,6 @@ class TagViewCell: RoundedView {
     }
 }
 
-
 // MARK: - Private
 //
 private extension TagViewCell {
@@ -138,7 +137,6 @@ private extension TagViewCell {
     }
 }
 
-
 // MARK: - Accessibility
 //
 extension TagViewCell {
@@ -157,7 +155,6 @@ extension TagViewCell {
     }
 }
 
-
 // MARK: - Constants
 //
 private struct Constants {
@@ -172,7 +169,6 @@ private struct Constants {
     static let deleteButtonHitAreaInset: CGFloat = -10
 }
 
-
 // MARK: - Localization
 //
 private struct Localization {
diff --git a/Simplenote/Classes/Theme.swift b/Simplenote/Classes/Theme.swift
index 6d2116b06..4b4898435 100644
--- a/Simplenote/Classes/Theme.swift
+++ b/Simplenote/Classes/Theme.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - Represents all of the available Themes
 //
 @objc
@@ -18,7 +17,6 @@ enum Theme: Int, CaseIterable {
     ///
     case system
 
-
     /// Returns a localized Description, matching the current rawValue
     ///
     var description: String {
@@ -33,7 +31,6 @@ enum Theme: Int, CaseIterable {
     }
 }
 
-
 extension Theme {
 
     static var allThemes: [Theme] {
diff --git a/Simplenote/Classes/UIActivity+Simplenote.swift b/Simplenote/Classes/UIActivity+Simplenote.swift
index 77196814c..5f6dc95ce 100644
--- a/Simplenote/Classes/UIActivity+Simplenote.swift
+++ b/Simplenote/Classes/UIActivity+Simplenote.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - UIActivity <> WordPress iOS!
 //
 extension UIActivity.ActivityType {
diff --git a/Simplenote/Classes/UIAlertController+Helpers.swift b/Simplenote/Classes/UIAlertController+Helpers.swift
index 3792fdfe5..58031cc3b 100644
--- a/Simplenote/Classes/UIAlertController+Helpers.swift
+++ b/Simplenote/Classes/UIAlertController+Helpers.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 extension UIAlertController {
 
     @discardableResult @objc
diff --git a/Simplenote/Classes/UIApplication+Simplenote.swift b/Simplenote/Classes/UIApplication+Simplenote.swift
index 65710d440..b573e73ac 100644
--- a/Simplenote/Classes/UIApplication+Simplenote.swift
+++ b/Simplenote/Classes/UIApplication+Simplenote.swift
@@ -15,20 +15,20 @@ extension UIApplication {
 
         return keyWindow.windowScene?.statusBarManager?.statusBarFrame.size ?? .zero
     }
-    
+
     /// Convenience method to return the applications window scene that's activationState is .foregroundActive
     ///
     @objc
     public var foregroundWindowScene: UIWindowScene? {
         connectedScenes.first { $0.activationState == .foregroundActive } as? UIWindowScene
     }
-    
+
     /// Convenience var to return the foreground scene's windows
     ///
     public var foregroundSceneWindows: [UIWindow] {
         foregroundWindowScene?.windows ?? []
     }
-    
+
     /// Returns the first window from the current foregroundActive scene
     ///
     @objc
diff --git a/Simplenote/Classes/UIBarButtonItem+Appearance.swift b/Simplenote/Classes/UIBarButtonItem+Appearance.swift
index fd602043b..7f6713c0a 100644
--- a/Simplenote/Classes/UIBarButtonItem+Appearance.swift
+++ b/Simplenote/Classes/UIBarButtonItem+Appearance.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - UIBarButtonItem + Appearance
 //
 extension UIBarButtonItem {
diff --git a/Simplenote/Classes/UIBezierPath+Simplenote.swift b/Simplenote/Classes/UIBezierPath+Simplenote.swift
index 39b651496..2f1be5e5e 100644
--- a/Simplenote/Classes/UIBezierPath+Simplenote.swift
+++ b/Simplenote/Classes/UIBezierPath+Simplenote.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - UIBezierPath Methods
 //
 extension UIBezierPath {
diff --git a/Simplenote/Classes/UIBlurEffect+Simplenote.swift b/Simplenote/Classes/UIBlurEffect+Simplenote.swift
index d505aee24..34834a681 100644
--- a/Simplenote/Classes/UIBlurEffect+Simplenote.swift
+++ b/Simplenote/Classes/UIBlurEffect+Simplenote.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - UIBlurEffect Simplenote Methods
 //
 extension UIBlurEffect {
diff --git a/Simplenote/Classes/UIColor+Helpers.swift b/Simplenote/Classes/UIColor+Helpers.swift
index 20344cec0..5eacafc19 100644
--- a/Simplenote/Classes/UIColor+Helpers.swift
+++ b/Simplenote/Classes/UIColor+Helpers.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - UIColor Simplenote's Helpers
 //
 extension UIColor {
@@ -29,7 +28,6 @@ extension UIColor {
     }
 }
 
-
 // MARK: - HTML Colors
 //
 extension UIColor {
diff --git a/Simplenote/Classes/UIColor+Studio.swift b/Simplenote/Classes/UIColor+Studio.swift
index d24d5775d..13f621a85 100644
--- a/Simplenote/Classes/UIColor+Studio.swift
+++ b/Simplenote/Classes/UIColor+Studio.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - UIColor + Studio API(s)
 //
 extension UIColor {
@@ -33,7 +32,6 @@ extension UIColor {
     }
 }
 
-
 // MARK: - Simplenote colors!
 //
 extension UIColor {
diff --git a/Simplenote/Classes/UIContextualAction+Simplenote.swift b/Simplenote/Classes/UIContextualAction+Simplenote.swift
index c26a1863f..85d3a9dba 100644
--- a/Simplenote/Classes/UIContextualAction+Simplenote.swift
+++ b/Simplenote/Classes/UIContextualAction+Simplenote.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - Simplenote Methods
 //
 extension UIContextualAction {
diff --git a/Simplenote/Classes/UIDevice+Simplenote.swift b/Simplenote/Classes/UIDevice+Simplenote.swift
index e49b50daf..cd66e3343 100644
--- a/Simplenote/Classes/UIDevice+Simplenote.swift
+++ b/Simplenote/Classes/UIDevice+Simplenote.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - Simplenote Methods
 //
 extension UIDevice {
diff --git a/Simplenote/Classes/UIFont+Simplenote.swift b/Simplenote/Classes/UIFont+Simplenote.swift
index 89cccb2ab..c3fdab3c6 100644
--- a/Simplenote/Classes/UIFont+Simplenote.swift
+++ b/Simplenote/Classes/UIFont+Simplenote.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - UIFont Simplenote Helpers
 //
 extension UIFont {
@@ -50,7 +49,6 @@ extension UIFont {
     }
 }
 
-
 // MARK: - FontCache: Performance Helper!
 //
 private class FontCache {
@@ -63,7 +61,6 @@ private class FontCache {
     ///
     static let shared = FontCache()
 
-
     /// (Private) Initializer
     ///
     private init() {
@@ -91,7 +88,6 @@ private class FontCache {
     }
 }
 
-
 // MARK: - Private Methods
 //
 private extension FontCache {
diff --git a/Simplenote/Classes/UIGestureRecognizer+Simplenote.swift b/Simplenote/Classes/UIGestureRecognizer+Simplenote.swift
index 443ddea54..dbcd32bd5 100644
--- a/Simplenote/Classes/UIGestureRecognizer+Simplenote.swift
+++ b/Simplenote/Classes/UIGestureRecognizer+Simplenote.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - UIGestureRecognizer Simplenote Methods
 //
 extension UIGestureRecognizer {
diff --git a/Simplenote/Classes/UIImage+Dynamic.swift b/Simplenote/Classes/UIImage+Dynamic.swift
index 3ed501b00..aebc16761 100644
--- a/Simplenote/Classes/UIImage+Dynamic.swift
+++ b/Simplenote/Classes/UIImage+Dynamic.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - Dynamic Images
 //
 extension UIImage {
@@ -15,7 +14,6 @@ extension UIImage {
     }
 }
 
-
 // MARK: - Constants
 //
 private enum SearchBackgroundMetrics {
diff --git a/Simplenote/Classes/UIImage+Simplenote.swift b/Simplenote/Classes/UIImage+Simplenote.swift
index ae42409df..b258b622d 100644
--- a/Simplenote/Classes/UIImage+Simplenote.swift
+++ b/Simplenote/Classes/UIImage+Simplenote.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - Simplenote's UIImage Static Methods
 //
 extension UIImage {
diff --git a/Simplenote/Classes/UIImageName.swift b/Simplenote/Classes/UIImageName.swift
index e65d36d9f..b2b7541cc 100644
--- a/Simplenote/Classes/UIImageName.swift
+++ b/Simplenote/Classes/UIImageName.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - Simplenote Named Images
 //
 @objc
@@ -58,7 +57,6 @@ enum UIImageName: Int, CaseIterable {
     case warning
 }
 
-
 // MARK: - Public Methods
 //
 extension UIImageName {
diff --git a/Simplenote/Classes/UIKeyboardAppearance+Simplenote.swift b/Simplenote/Classes/UIKeyboardAppearance+Simplenote.swift
index a48378097..808866fda 100644
--- a/Simplenote/Classes/UIKeyboardAppearance+Simplenote.swift
+++ b/Simplenote/Classes/UIKeyboardAppearance+Simplenote.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - UIKeyboardAppearance
 //
 extension UIKeyboardAppearance {
diff --git a/Simplenote/Classes/UIKitConstants.swift b/Simplenote/Classes/UIKitConstants.swift
index d399adbda..f6ec2f8d6 100644
--- a/Simplenote/Classes/UIKitConstants.swift
+++ b/Simplenote/Classes/UIKitConstants.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - UIKit Constants, so that we don't repeat ourselves forever!
 //
 @objcMembers
diff --git a/Simplenote/Classes/UINavigationBar+Appearance.swift b/Simplenote/Classes/UINavigationBar+Appearance.swift
index 5deeb6adc..47106d6b9 100644
--- a/Simplenote/Classes/UINavigationBar+Appearance.swift
+++ b/Simplenote/Classes/UINavigationBar+Appearance.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - UINavigationBar + Appearance
 //
 extension UINavigationBar {
diff --git a/Simplenote/Classes/UINavigationBar+Simplenote.swift b/Simplenote/Classes/UINavigationBar+Simplenote.swift
index d6a58192d..6fb14bea0 100644
--- a/Simplenote/Classes/UINavigationBar+Simplenote.swift
+++ b/Simplenote/Classes/UINavigationBar+Simplenote.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - UINavigationBar Simplenote Methods
 //
 extension UINavigationBar {
diff --git a/Simplenote/Classes/UINavigationController+Simplenote.swift b/Simplenote/Classes/UINavigationController+Simplenote.swift
index 377457f35..6649ece75 100644
--- a/Simplenote/Classes/UINavigationController+Simplenote.swift
+++ b/Simplenote/Classes/UINavigationController+Simplenote.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - UINavigationController Simplenote API
 //
 extension UINavigationController {
diff --git a/Simplenote/Classes/UIPasteboard+Note.swift b/Simplenote/Classes/UIPasteboard+Note.swift
index ac9f3dfef..ad89753fe 100644
--- a/Simplenote/Classes/UIPasteboard+Note.swift
+++ b/Simplenote/Classes/UIPasteboard+Note.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - UIPasteboard + Interlink
 //
 extension UIPasteboard {
diff --git a/Simplenote/Classes/UIScreen+Simplenote.swift b/Simplenote/Classes/UIScreen+Simplenote.swift
index f86af4b85..993b7472c 100644
--- a/Simplenote/Classes/UIScreen+Simplenote.swift
+++ b/Simplenote/Classes/UIScreen+Simplenote.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - UIScreen Simplenote Methods
 //
 extension UIScreen {
diff --git a/Simplenote/Classes/UISearchBar+Simplenote.swift b/Simplenote/Classes/UISearchBar+Simplenote.swift
index 2bc531d46..34765dbd8 100644
--- a/Simplenote/Classes/UISearchBar+Simplenote.swift
+++ b/Simplenote/Classes/UISearchBar+Simplenote.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - UISearchBar Simplenote Methods
 //
 extension UISearchBar {
diff --git a/Simplenote/Classes/UITableView+Simplenote.swift b/Simplenote/Classes/UITableView+Simplenote.swift
index f852ae889..286a60408 100644
--- a/Simplenote/Classes/UITableView+Simplenote.swift
+++ b/Simplenote/Classes/UITableView+Simplenote.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - UITableView Simplenote Methods
 //
 extension UITableView {
diff --git a/Simplenote/Classes/UITableViewCell+Simplenote.swift b/Simplenote/Classes/UITableViewCell+Simplenote.swift
index d26003cf1..01737f431 100644
--- a/Simplenote/Classes/UITableViewCell+Simplenote.swift
+++ b/Simplenote/Classes/UITableViewCell+Simplenote.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 /// UITableViewCell Helpers
 ///
 extension UITableViewCell {
diff --git a/Simplenote/Classes/UITableViewHeaderFooterView+Simplenote.swift b/Simplenote/Classes/UITableViewHeaderFooterView+Simplenote.swift
index d81209d1d..a78f4f34c 100644
--- a/Simplenote/Classes/UITableViewHeaderFooterView+Simplenote.swift
+++ b/Simplenote/Classes/UITableViewHeaderFooterView+Simplenote.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 /// UITableViewHeaderFooterView Helpers
 ///
 extension UITableViewHeaderFooterView {
diff --git a/Simplenote/Classes/UITextView+Simplenote.swift b/Simplenote/Classes/UITextView+Simplenote.swift
index 046769265..ba65e2998 100644
--- a/Simplenote/Classes/UITextView+Simplenote.swift
+++ b/Simplenote/Classes/UITextView+Simplenote.swift
@@ -2,7 +2,6 @@ import Foundation
 import UIKit
 import SimplenoteInterlinks
 
-
 // MARK: - UITextView State
 //
 extension UITextView {
@@ -21,7 +20,6 @@ extension UITextView {
     }
 }
 
-
 // MARK: - Updating!
 //
 extension UITextView {
@@ -40,7 +38,6 @@ extension UITextView {
     }
 }
 
-
 // MARK: - Undo Stack
 //
 private extension UITextView {
@@ -93,7 +90,6 @@ private extension UITextView {
     }
 }
 
-
 // MARK: - Interlinks
 //
 extension UITextView {
@@ -109,7 +105,6 @@ extension UITextView {
     }
 }
 
-
 // MARK: - Attachments
 //
 extension UITextView {
@@ -125,7 +120,6 @@ extension UITextView {
     }
 }
 
-
 // MARK: - Geometry
 //
 extension UITextView {
diff --git a/Simplenote/Classes/UITraitCollection+Simplenote.swift b/Simplenote/Classes/UITraitCollection+Simplenote.swift
index 050f5b92b..62b7a02ba 100644
--- a/Simplenote/Classes/UITraitCollection+Simplenote.swift
+++ b/Simplenote/Classes/UITraitCollection+Simplenote.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - UITraitCollection Simplenote Methods
 //
 extension UITraitCollection {
diff --git a/Simplenote/Classes/UIView+Animations.swift b/Simplenote/Classes/UIView+Animations.swift
index 207eec515..fb5137f81 100644
--- a/Simplenote/Classes/UIView+Animations.swift
+++ b/Simplenote/Classes/UIView+Animations.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - UIView's Animation Methods
 //
 extension UIView {
diff --git a/Simplenote/Classes/UIView+ImageRepresentation.swift b/Simplenote/Classes/UIView+ImageRepresentation.swift
index e42a6e8b1..398f34c26 100644
--- a/Simplenote/Classes/UIView+ImageRepresentation.swift
+++ b/Simplenote/Classes/UIView+ImageRepresentation.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - UIView: Image Representation Helpers
 //
 extension UIView {
diff --git a/Simplenote/Classes/UIView+Simplenote.swift b/Simplenote/Classes/UIView+Simplenote.swift
index c1da0a339..ec3ff2e54 100644
--- a/Simplenote/Classes/UIView+Simplenote.swift
+++ b/Simplenote/Classes/UIView+Simplenote.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - UIView's Simplenote Methods
 //
 extension UIView {
@@ -62,7 +61,6 @@ extension UIView {
     }
 }
 
-
 // MARK: - UIView Class Methods
 //
 extension UIView {
diff --git a/Simplenote/Classes/UIViewController+Helpers.swift b/Simplenote/Classes/UIViewController+Helpers.swift
index 90e29bfe6..c9d7152e1 100644
--- a/Simplenote/Classes/UIViewController+Helpers.swift
+++ b/Simplenote/Classes/UIViewController+Helpers.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - UIViewController Helpers
 //
 extension UIViewController {
diff --git a/Simplenote/Classes/UIViewController+Simplenote.swift b/Simplenote/Classes/UIViewController+Simplenote.swift
index 3c50decdc..e693735f8 100644
--- a/Simplenote/Classes/UIViewController+Simplenote.swift
+++ b/Simplenote/Classes/UIViewController+Simplenote.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - UIAlertController's Simplenote Methods
 //
 extension UIViewController {
@@ -33,7 +32,6 @@ extension UIViewController {
         leafViewController.present(self, animated: true, completion: nil)
     }
 
-
     /// Attaches a children ViewController (if needed) below the specified sibling view
     ///
     func attach(to parent: UIViewController, attachmentView: AttachmentView? = nil, animated: Bool = false) {
diff --git a/Simplenote/Classes/UserDefaults+Simplenote.swift b/Simplenote/Classes/UserDefaults+Simplenote.swift
index 444ab985b..8867d4ad8 100644
--- a/Simplenote/Classes/UserDefaults+Simplenote.swift
+++ b/Simplenote/Classes/UserDefaults+Simplenote.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - Simplenote UserDefaults Keys
 //
 extension UserDefaults {
@@ -19,7 +18,6 @@ extension UserDefaults {
     }
 }
 
-
 // MARK: - Convenience Methods
 //
 extension UserDefaults {
diff --git a/Simplenote/Color+Simplenote.swift b/Simplenote/Color+Simplenote.swift
index c546cfcab..825accf4f 100644
--- a/Simplenote/Color+Simplenote.swift
+++ b/Simplenote/Color+Simplenote.swift
@@ -1,6 +1,5 @@
 import SwiftUI
 
-
 extension Color {
     /// Convenience initializers to get and use Simplenote color studio colors
     ///
diff --git a/Simplenote/Controllers/VersionsController.swift b/Simplenote/Controllers/VersionsController.swift
index b1663cf5b..23779136e 100644
--- a/Simplenote/Controllers/VersionsController.swift
+++ b/Simplenote/Controllers/VersionsController.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - VersionsController
 //
 class VersionsController: NSObject {
@@ -10,7 +9,6 @@ class VersionsController: NSObject {
     ///
     private let callbackMap = NSMapTable<NSString, ListenerWrapper>(keyOptions: .copyIn, valueOptions: .weakMemory)
 
-
     /// Designated Initializer
     ///
     /// - Parameters:
@@ -21,7 +19,6 @@ class VersionsController: NSObject {
         super.init()
     }
 
-
     /// Requests the specified number of versions of Notes for a given SimperiumKey.
     ///
     /// - Parameters:
@@ -48,7 +45,6 @@ class VersionsController: NSObject {
     }
 }
 
-
 // MARK: - Simperium
 //
 extension VersionsController {
diff --git a/Simplenote/Controllers/WidgetController.swift b/Simplenote/Controllers/WidgetController.swift
index c5bb8a0aa..2a49e0948 100644
--- a/Simplenote/Controllers/WidgetController.swift
+++ b/Simplenote/Controllers/WidgetController.swift
@@ -1,7 +1,6 @@
 import WidgetKit
 import Intents
 
-
 struct WidgetController {
     @available(iOS 14.0, *)
     static func resetWidgetTimelines() {
diff --git a/Simplenote/CrashLogging.swift b/Simplenote/CrashLogging.swift
index 18a1a8486..8dea7fb47 100644
--- a/Simplenote/CrashLogging.swift
+++ b/Simplenote/CrashLogging.swift
@@ -1,7 +1,6 @@
 import Foundation
 import AutomatticTracks
 
-
 /// This exists to bridge CrashLogging with Objective-C. Once the App Delegate is moved over to Swift,
 /// this shim can be removed, and the cache methods moved to a `CrashLogging` extension. At that time,
 /// you, future developer, can just set up the Crash Logging system in the App Delegate using `SNCrashLoggingDataProvider`.
diff --git a/Simplenote/EmailVerification.swift b/Simplenote/EmailVerification.swift
index 194d16798..9ff8f62d6 100644
--- a/Simplenote/EmailVerification.swift
+++ b/Simplenote/EmailVerification.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - EmailVerification
 //
 struct EmailVerification {
diff --git a/Simplenote/Information/NoteInformationViewController.swift b/Simplenote/Information/NoteInformationViewController.swift
index b8a4e6ada..5a999f7a8 100644
--- a/Simplenote/Information/NoteInformationViewController.swift
+++ b/Simplenote/Information/NoteInformationViewController.swift
@@ -173,7 +173,6 @@ extension NoteInformationViewController: UITableViewDelegate {
     }
 }
 
-
 // MARK: - UITableViewDataSource
 //
 extension NoteInformationViewController: UITableViewDataSource {
diff --git a/Simplenote/KeychainPasswordItem.swift b/Simplenote/KeychainPasswordItem.swift
index 24c3c4b01..cc7ae4cbc 100644
--- a/Simplenote/KeychainPasswordItem.swift
+++ b/Simplenote/KeychainPasswordItem.swift
@@ -8,7 +8,6 @@
 
 import Foundation
 
-
 enum KeychainError: Error {
     case noPassword
     case unexpectedPasswordData
diff --git a/Simplenote/NSAttributedStringToMarkdownConverter.swift b/Simplenote/NSAttributedStringToMarkdownConverter.swift
index ca1fb53e1..8c9bc4ba9 100644
--- a/Simplenote/NSAttributedStringToMarkdownConverter.swift
+++ b/Simplenote/NSAttributedStringToMarkdownConverter.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - NSAttributedString to Markdown Converter
 //
 struct NSAttributedStringToMarkdownConverter {
@@ -13,7 +12,6 @@ struct NSAttributedStringToMarkdownConverter {
     ///
     private static let checked = "- [x]"
 
-
     /// Returns the NSString representation of a given NSAttributedString.
     ///
     static func convert(string: NSAttributedString) -> String {
diff --git a/Simplenote/NSObject+Helpers.swift b/Simplenote/NSObject+Helpers.swift
index 88c9eb366..257c557f4 100644
--- a/Simplenote/NSObject+Helpers.swift
+++ b/Simplenote/NSObject+Helpers.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 /// NSObject: Helper Methods
 ///
 extension NSObject {
diff --git a/Simplenote/NSPredicate+Email.swift b/Simplenote/NSPredicate+Email.swift
index 83e68052f..f815b5725 100644
--- a/Simplenote/NSPredicate+Email.swift
+++ b/Simplenote/NSPredicate+Email.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - NSPredicate Validation Methods
 //
 extension NSPredicate {
diff --git a/Simplenote/Note+Links.swift b/Simplenote/Note+Links.swift
index b3b9261a6..4d6fbffc7 100644
--- a/Simplenote/Note+Links.swift
+++ b/Simplenote/Note+Links.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - Note + Links
 //
 extension Note {
diff --git a/Simplenote/NoteMetrics.swift b/Simplenote/NoteMetrics.swift
index 49f7e4737..e6f5dba4d 100644
--- a/Simplenote/NoteMetrics.swift
+++ b/Simplenote/NoteMetrics.swift
@@ -20,7 +20,6 @@ struct NoteMetrics {
     ///
     let modifiedDate: Date
 
-
     /// Designed Initializer
     /// - Parameter note: Note from which we should extract metrics
     ///
diff --git a/Simplenote/Notice.swift b/Simplenote/Notice.swift
index d3041783f..a83966602 100644
--- a/Simplenote/Notice.swift
+++ b/Simplenote/Notice.swift
@@ -1,7 +1,7 @@
 import Foundation
 
 struct Notice {
-    
+
     let message: String
     let action: NoticeAction?
 
diff --git a/Simplenote/NoticeView.swift b/Simplenote/NoticeView.swift
index e9ed9935d..1b3c3d763 100644
--- a/Simplenote/NoticeView.swift
+++ b/Simplenote/NoticeView.swift
@@ -36,7 +36,6 @@ class NoticeView: UIView {
 
     weak var delegate: NoticeInteractionDelegate?
 
-
     // MARK: Initialization
     //
     override func awakeFromNib() {
diff --git a/Simplenote/Options.swift b/Simplenote/Options.swift
index 445529956..ccea36890 100644
--- a/Simplenote/Options.swift
+++ b/Simplenote/Options.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - Wraps access to all of the UserDefault Values
 //
 class Options: NSObject {
@@ -14,8 +13,6 @@ class Options: NSObject {
     ///
     private let defaults: UserDefaults
 
-
-
     /// Designated Initializer
     ///
     /// - Note: Should be *private*, but for unit testing purposes, we're opening this up.
@@ -28,7 +25,6 @@ class Options: NSObject {
     }
 }
 
-
 // MARK: - Actual Options!
 //
 extension Options {
@@ -115,7 +111,6 @@ extension Options {
     }
 }
 
-
 // MARK: - ObjC Convenience Methods
 //
 extension Options {
@@ -152,7 +147,6 @@ extension Options {
     }
 }
 
-
 // MARK: - Private
 //
 private extension Options {
@@ -179,7 +173,6 @@ private extension Options {
     }
 }
 
-
 // MARK: - Constants!
 //
 private enum Settings {
diff --git a/Simplenote/PopoverPresenter.swift b/Simplenote/PopoverPresenter.swift
index c71575383..0c2340730 100644
--- a/Simplenote/PopoverPresenter.swift
+++ b/Simplenote/PopoverPresenter.swift
@@ -1,6 +1,5 @@
 import UIKit
 
-
 // MARK: - PopoverPresenter
 //
 final class PopoverPresenter {
@@ -23,12 +22,10 @@ final class PopoverPresenter {
     ///
     var dismissOnInteractionWithPassthruView: Bool = false
 
-
     /// Dismiss on container frame change
     ///
     var dismissOnContainerFrameChange: Bool = false
 
-
     /// Center content relative to anchor
     ///
     var centerContentRelativeToAnchor: Bool = false
@@ -115,7 +112,6 @@ final class PopoverPresenter {
     }
 }
 
-
 // MARK: - Geometry
 //
 private extension PopoverPresenter {
@@ -177,7 +173,6 @@ private extension PopoverPresenter {
     }
 }
 
-
 // MARK: - Defines the vertical orientation in which we'll display Popover
 //
 private enum Orientation {
@@ -185,7 +180,6 @@ private enum Orientation {
     case below
 }
 
-
 // MARK: - Metrics
 //
 private enum Metrics {
diff --git a/Simplenote/Preferences+IAP.swift b/Simplenote/Preferences+IAP.swift
index e9e68312f..c670c5952 100644
--- a/Simplenote/Preferences+IAP.swift
+++ b/Simplenote/Preferences+IAP.swift
@@ -8,7 +8,6 @@
 
 import Foundation
 
-
 // MARK: - Preferences Extensions
 //
 extension Preferences {
diff --git a/Simplenote/SPAppDelegate+Extensions.swift b/Simplenote/SPAppDelegate+Extensions.swift
index dcd793697..87b556e46 100644
--- a/Simplenote/SPAppDelegate+Extensions.swift
+++ b/Simplenote/SPAppDelegate+Extensions.swift
@@ -1,7 +1,6 @@
 import Foundation
 import WidgetKit
 
-
 // MARK: - Initialization
 //
 extension SPAppDelegate {
@@ -196,7 +195,6 @@ extension SPAppDelegate {
     }
 }
 
-
 // MARK: - UIViewControllerRestoration
 //
 @objc
@@ -259,7 +257,6 @@ extension SPAppDelegate: UIViewControllerRestoration {
     }
 }
 
-
 // MARK: - SimperiumDelegate
 //
 extension SPAppDelegate: SimperiumDelegate {
@@ -320,7 +317,6 @@ extension SPAppDelegate: SimperiumDelegate {
     }
 }
 
-
 // MARK: - Passcode
 //
 extension SPAppDelegate {
@@ -363,7 +359,6 @@ extension SPAppDelegate {
     }
 }
 
-
 // MARK: - PinLockVerifyControllerDelegate
 //
 extension SPAppDelegate: PinLockVerifyControllerDelegate {
@@ -419,7 +414,6 @@ private extension SPAppDelegate {
     }
 }
 
-
 // MARK: - Magic Link authentication
 //
 extension SPAppDelegate {
@@ -429,7 +423,6 @@ extension SPAppDelegate {
     }
 }
 
-
 // MARK: - Scroll position cache
 //
 extension SPAppDelegate {
diff --git a/Simplenote/SPCardPresentationController.swift b/Simplenote/SPCardPresentationController.swift
index 51a4a6f6a..e55e01b1d 100644
--- a/Simplenote/SPCardPresentationController.swift
+++ b/Simplenote/SPCardPresentationController.swift
@@ -12,14 +12,12 @@ enum SPCardDismissalReason {
     case outsideTap
 }
 
-
 // MARK: - SPCardPresentationControllerDelegate
 //
 protocol SPCardPresentationControllerDelegate: AnyObject {
     func cardDidDismiss(_ viewController: UIViewController, reason: SPCardDismissalReason)
 }
 
-
 // MARK: - SPCardPresentationController: Manages presentation and swipe to dismiss
 //
 final class SPCardPresentationController: UIPresentationController {
diff --git a/Simplenote/SPEditorTextView+Simplenote.swift b/Simplenote/SPEditorTextView+Simplenote.swift
index 1c9bb04bb..bc2924e2d 100644
--- a/Simplenote/SPEditorTextView+Simplenote.swift
+++ b/Simplenote/SPEditorTextView+Simplenote.swift
@@ -31,7 +31,6 @@ extension SPEditorTextView {
     }
 }
 
-
 // MARK: - Observer content position
 //
 extension SPEditorTextView {
diff --git a/Simplenote/SPHistoryVersion.swift b/Simplenote/SPHistoryVersion.swift
index 93e81fc85..94f479d3c 100644
--- a/Simplenote/SPHistoryVersion.swift
+++ b/Simplenote/SPHistoryVersion.swift
@@ -15,7 +15,6 @@ struct SPHistoryVersion {
     ///
     let modificationDate: Date
 
-
     /// Designated Initializer
     ///
     init?(version: Int, payload: [AnyHashable: Any]) {
diff --git a/Simplenote/SPNoteHistoryController.swift b/Simplenote/SPNoteHistoryController.swift
index 5418618b4..c761905cd 100644
--- a/Simplenote/SPNoteHistoryController.swift
+++ b/Simplenote/SPNoteHistoryController.swift
@@ -44,7 +44,6 @@ final class SPNoteHistoryController {
     ///
     weak var delegate: SPNoteHistoryControllerDelegate?
 
-
     private let note: Note
     private let versionsController: VersionsController
     private var versionsToken: Any?
diff --git a/Simplenote/SPPrivacyViewController.swift b/Simplenote/SPPrivacyViewController.swift
index 36cd6fde0..c3f744254 100644
--- a/Simplenote/SPPrivacyViewController.swift
+++ b/Simplenote/SPPrivacyViewController.swift
@@ -34,7 +34,6 @@ class SPPrivacyViewController: SPTableViewController {
         return isAnalyticsEnabled.boolValue
     }
 
-
     // MARK: - Overridden Methods
 
     override func viewDidLoad() {
@@ -88,7 +87,6 @@ class SPPrivacyViewController: SPTableViewController {
     }
 }
 
-
 // MARK: - Event Handlers
 //
 extension SPPrivacyViewController {
@@ -114,7 +112,6 @@ extension SPPrivacyViewController {
     }
 }
 
-
 // MARK: - Initialization Methods
 //
 private extension SPPrivacyViewController {
@@ -181,7 +178,6 @@ private extension SPPrivacyViewController {
     }
 }
 
-
 // MARK: - Private Types
 //
 private struct Section {
diff --git a/Simplenote/SPTextAttachment.swift b/Simplenote/SPTextAttachment.swift
index 804135295..f78689c61 100644
--- a/Simplenote/SPTextAttachment.swift
+++ b/Simplenote/SPTextAttachment.swift
@@ -1,6 +1,5 @@
 import UIKit
 
-
 // MARK: - SPTextAttachment
 //
 @objcMembers
@@ -30,7 +29,6 @@ class SPTextAttachment: NSTextAttachment {
     ///
     var sizingFont: UIFont = .preferredFont(forTextStyle: .headline)
 
-
     // MARK: - Overridden Methods
 
     override func attachmentBounds(for textContainer: NSTextContainer?, proposedLineFragment lineFrag: CGRect, glyphPosition position: CGPoint, characterIndex charIndex: Int) -> CGRect {
@@ -41,7 +39,6 @@ class SPTextAttachment: NSTextAttachment {
     }
 }
 
-
 // MARK: - Private
 //
 private extension SPTextAttachment {
diff --git a/Simplenote/SPTracker+Extensions.swift b/Simplenote/SPTracker+Extensions.swift
index 7a3c6a560..eaa370597 100644
--- a/Simplenote/SPTracker+Extensions.swift
+++ b/Simplenote/SPTracker+Extensions.swift
@@ -58,7 +58,6 @@ extension SPTracker {
     }
 }
 
-
 // MARK: - Shortcuts
 //
 extension SPTracker {
@@ -91,7 +90,6 @@ extension SPTracker {
     }
 }
 
-
 // MARK: Account Deletion
 //
 extension SPTracker {
diff --git a/Simplenote/SearchQuery+Simplenote.swift b/Simplenote/SearchQuery+Simplenote.swift
index a947da955..cdca39499 100644
--- a/Simplenote/SearchQuery+Simplenote.swift
+++ b/Simplenote/SearchQuery+Simplenote.swift
@@ -13,4 +13,3 @@ extension SearchQuerySettings {
         return SearchQuerySettings(tagsKeyword: "tag:", localizedTagKeyword: localizedKeyword)
     }
 }
-
diff --git a/Simplenote/SeparatorsView.swift b/Simplenote/SeparatorsView.swift
index b2c8c0755..c6080605e 100644
--- a/Simplenote/SeparatorsView.swift
+++ b/Simplenote/SeparatorsView.swift
@@ -63,8 +63,6 @@ open class SeparatorsView: UIView {
         }
     }
 
-
-
     // MARK: - UIView methods
     convenience init() {
         self.init(frame: CGRect.zero)
diff --git a/Simplenote/SpinnerViewController.swift b/Simplenote/SpinnerViewController.swift
index 340a9d07a..ce8b4a7af 100644
--- a/Simplenote/SpinnerViewController.swift
+++ b/Simplenote/SpinnerViewController.swift
@@ -35,7 +35,6 @@ class SpinnerViewController: UIViewController {
         ])
         alertView.layer.cornerRadius = Constants.cornerRadius
 
-
         alertView.addSubview(activityIndicator)
         alertView.sizeToFit()
         NSLayoutConstraint.activate([
@@ -52,7 +51,6 @@ class SpinnerViewController: UIViewController {
         activityIndicator.stopAnimating()
     }
 
-
     private func setupViewAppearance() {
         modalPresentationStyle = .overFullScreen
         view.backgroundColor = UIColor(lightColor: .black, darkColor: .black, lightColorAlpha: 0.2, darkColorAlpha: 0.43)
diff --git a/Simplenote/StoreConstants.swift b/Simplenote/StoreConstants.swift
index 3eb6e2bd0..536fb7826 100644
--- a/Simplenote/StoreConstants.swift
+++ b/Simplenote/StoreConstants.swift
@@ -8,7 +8,6 @@
 
 import Foundation
 
-
 // MARK: - Settings
 //
 enum StoreConstants {
diff --git a/Simplenote/StoreManager.swift b/Simplenote/StoreManager.swift
index b87bd6780..3ba92acc3 100644
--- a/Simplenote/StoreManager.swift
+++ b/Simplenote/StoreManager.swift
@@ -9,14 +9,12 @@
 import Foundation
 import StoreKit
 
-
 // MARK: - StoreError
 //
 enum StoreError: Error {
     case failedVerification
 }
 
-
 // MARK: - StoreManager
 //
 @available(iOS 15, *)
@@ -26,7 +24,6 @@ class StoreManager {
     //
     static let shared = StoreManager()
 
-
     // MARK: - Aliases
     //
     typealias SubscriptionStatus = Product.SubscriptionInfo.Status
@@ -53,14 +50,12 @@ class StoreManager {
         return subscriptionGroupStatus.isActive
     }
 
-
     // MARK: - Deinit
 
     deinit {
         updateListenerTask?.cancel()
     }
 
-
     // MARK: - Public API(s)
 
     /// Initialization involves three major steps:
@@ -84,7 +79,6 @@ class StoreManager {
         }
     }
 
-
     /// Purchases the specified Product (as long as we don't own it already?)
     ///
     func purchase(storeProduct: StoreProduct) {
@@ -126,7 +120,6 @@ class StoreManager {
     }
 }
 
-
 // MARK: - Private API(s)
 //
 @available(iOS 15, *)
@@ -216,7 +209,6 @@ private extension StoreManager {
     }
 }
 
-
 // MARK: - Private Helpers
 //
 @available(iOS 15, *)
@@ -248,7 +240,6 @@ private extension StoreManager {
     }
 }
 
-
 // MARK: - Simperium Kung Fu
 //
 @available(iOS 15, *)
@@ -307,7 +298,6 @@ private extension StoreManager {
     }
 }
 
-
 // MARK: - SubscriptionStatus Helpers
 //
 @available(iOS 15, *)
diff --git a/Simplenote/StoreProduct.swift b/Simplenote/StoreProduct.swift
index da86964d9..716d0da5d 100644
--- a/Simplenote/StoreProduct.swift
+++ b/Simplenote/StoreProduct.swift
@@ -8,7 +8,6 @@
 
 import Foundation
 
-
 // MARK: - StoreProduct
 //
 enum StoreProduct: String, CaseIterable {
diff --git a/Simplenote/SubtitleTableViewCell.swift b/Simplenote/SubtitleTableViewCell.swift
index 351f4de3b..dc5022398 100644
--- a/Simplenote/SubtitleTableViewCell.swift
+++ b/Simplenote/SubtitleTableViewCell.swift
@@ -1,6 +1,5 @@
 import UIKit
 
-
 // MARK: - SubtitleTableViewCell
 //
 final class SubtitleTableViewCell: UITableViewCell {
@@ -27,7 +26,6 @@ final class SubtitleTableViewCell: UITableViewCell {
         }
     }
 
-
     // MARK: - Initializers
 
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
@@ -48,7 +46,6 @@ final class SubtitleTableViewCell: UITableViewCell {
     }
 }
 
-
 // MARK: - Private API(s)
 //
 private extension SubtitleTableViewCell {
diff --git a/Simplenote/SustainerView.swift b/Simplenote/SustainerView.swift
index 9f84c029f..4c325a921 100644
--- a/Simplenote/SustainerView.swift
+++ b/Simplenote/SustainerView.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - SustainerView
 //
 class SustainerView: UIView {
@@ -53,7 +52,6 @@ class SustainerView: UIView {
         refreshInterface()
     }
 
-
     // MARK: - Actions
 
     @IBAction
@@ -62,7 +60,6 @@ class SustainerView: UIView {
     }
 }
 
-
 // MARK: - Private API(s)
 //
 private extension SustainerView {
@@ -79,7 +76,6 @@ private extension SustainerView {
     }
 }
 
-
 // MARK: - Style
 //
 private struct Style {
@@ -89,7 +85,6 @@ private struct Style {
     let backgroundColor: UIColor
 }
 
-
 private extension Style {
     static var sustainer: Style {
         Style(title: NSLocalizedString("You are a Simplenote Sustainer", comment: "Current Sustainer Title"),
@@ -106,7 +101,6 @@ private extension Style {
     }
 }
 
-
 // MARK: - Metrics
 //
 private enum Metrics {
diff --git a/Simplenote/TableHeaderViewCell.swift b/Simplenote/TableHeaderViewCell.swift
index 2c352f9a9..b7f90960c 100644
--- a/Simplenote/TableHeaderViewCell.swift
+++ b/Simplenote/TableHeaderViewCell.swift
@@ -1,6 +1,5 @@
 import UIKit
 
-
 // MARK: - TableHeaderViewCell
 //
 final class TableHeaderViewCell: UITableViewCell {
@@ -29,7 +28,6 @@ final class TableHeaderViewCell: UITableViewCell {
     }
 }
 
-
 // MARK: - Private API(s)
 //
 private extension TableHeaderViewCell {
diff --git a/Simplenote/TagListViewController.swift b/Simplenote/TagListViewController.swift
index f34801e33..dee5f1339 100644
--- a/Simplenote/TagListViewController.swift
+++ b/Simplenote/TagListViewController.swift
@@ -79,7 +79,6 @@ final class TagListViewController: UIViewController {
     }
 }
 
-
 // MARK: - Configuration
 //
 private extension TagListViewController {
@@ -127,7 +126,6 @@ private extension TagListViewController {
     }
 }
 
-
 // MARK: - Action Handlers
 //
 private extension TagListViewController {
@@ -143,7 +141,6 @@ private extension TagListViewController {
     }
 }
 
-
 // MARK: - Notifications
 //
 private extension TagListViewController {
diff --git a/Simplenote/Tags/NoteEditorTagListViewController.swift b/Simplenote/Tags/NoteEditorTagListViewController.swift
index 54ce7c77e..21198b3a7 100644
--- a/Simplenote/Tags/NoteEditorTagListViewController.swift
+++ b/Simplenote/Tags/NoteEditorTagListViewController.swift
@@ -83,7 +83,6 @@ class NoteEditorTagListViewController: UIViewController {
     }
 }
 
-
 // MARK: - First Responder
 //
 extension NoteEditorTagListViewController {
@@ -100,7 +99,6 @@ extension NoteEditorTagListViewController {
     }
 }
 
-
 // MARK: - Object Manager
 //
 private extension NoteEditorTagListViewController {
@@ -130,7 +128,6 @@ private extension NoteEditorTagListViewController {
     }
 }
 
-
 // MARK: - SPTagViewDelegate
 //
 extension NoteEditorTagListViewController: TagViewDelegate {
@@ -199,14 +196,12 @@ extension NoteEditorTagListViewController: TagViewDelegate {
     }
 }
 
-
 // MARK: - Constants
 //
 private struct Constants {
     static let clearRecentlyCreatedTagTimeout: TimeInterval = 3.5
 }
 
-
 // MARK: - Localization
 //
 private struct Localization {
diff --git a/Simplenote/Tags/NoteEditorTagSuggestionsViewController.swift b/Simplenote/Tags/NoteEditorTagSuggestionsViewController.swift
index 83b73430a..da15a0780 100644
--- a/Simplenote/Tags/NoteEditorTagSuggestionsViewController.swift
+++ b/Simplenote/Tags/NoteEditorTagSuggestionsViewController.swift
@@ -1,6 +1,5 @@
 import UIKit
 
-
 // MARK: - NoteEditorTagSuggestionsViewController
 //
 class NoteEditorTagSuggestionsViewController: UIViewController {
@@ -74,7 +73,6 @@ class NoteEditorTagSuggestionsViewController: UIViewController {
     }
 }
 
-
 // MARK: - UITableViewDelegate
 //
 extension NoteEditorTagSuggestionsViewController: UITableViewDelegate {
@@ -84,7 +82,6 @@ extension NoteEditorTagSuggestionsViewController: UITableViewDelegate {
     }
 }
 
-
 // MARK: - UITableViewDataSource
 //
 extension NoteEditorTagSuggestionsViewController: UITableViewDataSource {
@@ -106,7 +103,6 @@ extension NoteEditorTagSuggestionsViewController: UITableViewDataSource {
     }
 }
 
-
 // MARK: - Metrics
 //
 private struct Metrics {
diff --git a/Simplenote/UIActivityViewController+Simplenote.swift b/Simplenote/UIActivityViewController+Simplenote.swift
index 6e57a3dc8..e33670830 100644
--- a/Simplenote/UIActivityViewController+Simplenote.swift
+++ b/Simplenote/UIActivityViewController+Simplenote.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - ActivityViewController Simplenote Methods
 //
 extension UIActivityViewController {
diff --git a/Simplenote/UIAlertController+Sustainer.swift b/Simplenote/UIAlertController+Sustainer.swift
index 29f591679..9a8bbf904 100644
--- a/Simplenote/UIAlertController+Sustainer.swift
+++ b/Simplenote/UIAlertController+Sustainer.swift
@@ -8,7 +8,6 @@
 
 import Foundation
 
-
 // MARK: - UIAlertController+Sustainer
 //
 @available(iOS 15, *)
@@ -39,7 +38,6 @@ extension UIAlertController {
     }
 }
 
-
 // MARK: - Localization
 //
 private enum Localization {
diff --git a/Simplenote/Value1TableViewCell.swift b/Simplenote/Value1TableViewCell.swift
index 43f3df3ec..33199d3ca 100644
--- a/Simplenote/Value1TableViewCell.swift
+++ b/Simplenote/Value1TableViewCell.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - Value1TableViewCell
 //
 class Value1TableViewCell: UITableViewCell {
@@ -56,7 +55,6 @@ class Value1TableViewCell: UITableViewCell {
         }
     }
 
-
     // MARK: - Initializers
 
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
@@ -78,7 +76,6 @@ class Value1TableViewCell: UITableViewCell {
     }
 }
 
-
 // MARK: - Private API(s)
 //
 private extension Value1TableViewCell {
diff --git a/SimplenoteShare/Extensions/NSExtensionContext+Simplenote.swift b/SimplenoteShare/Extensions/NSExtensionContext+Simplenote.swift
index 6aaaa4b5e..b02df6323 100644
--- a/SimplenoteShare/Extensions/NSExtensionContext+Simplenote.swift
+++ b/SimplenoteShare/Extensions/NSExtensionContext+Simplenote.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - NSExtensionContext's Simplenote Methods
 //
 extension NSExtensionContext {
diff --git a/SimplenoteShare/Extensions/NSURLSessionConfiguration+Extensions.swift b/SimplenoteShare/Extensions/NSURLSessionConfiguration+Extensions.swift
index d633a5e17..55e8b0dac 100644
--- a/SimplenoteShare/Extensions/NSURLSessionConfiguration+Extensions.swift
+++ b/SimplenoteShare/Extensions/NSURLSessionConfiguration+Extensions.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 /// Encapsulates NSURLSessionConfiguration Helpers
 ///
 extension URLSessionConfiguration {
diff --git a/SimplenoteShare/Extractors/Extractor.swift b/SimplenoteShare/Extractors/Extractor.swift
index 5cd70163d..74dac5291 100644
--- a/SimplenoteShare/Extractors/Extractor.swift
+++ b/SimplenoteShare/Extractors/Extractor.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - Extractor
 //
 protocol Extractor {
diff --git a/SimplenoteShare/Extractors/Extractors.swift b/SimplenoteShare/Extractors/Extractors.swift
index 63073ddf7..a72856782 100644
--- a/SimplenoteShare/Extractors/Extractors.swift
+++ b/SimplenoteShare/Extractors/Extractors.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - Extractors: Convenience Struct that manages access to all of the known Extractors.
 //
 struct Extractors {
diff --git a/SimplenoteShare/Extractors/PlainTextExtractor.swift b/SimplenoteShare/Extractors/PlainTextExtractor.swift
index 8d4f7e5a4..b731d7dbf 100644
--- a/SimplenoteShare/Extractors/PlainTextExtractor.swift
+++ b/SimplenoteShare/Extractors/PlainTextExtractor.swift
@@ -2,7 +2,6 @@ import Foundation
 import MobileCoreServices
 import UniformTypeIdentifiers
 
-
 // MARK: - PlainTextExtractor
 //
 struct PlainTextExtractor: Extractor {
diff --git a/SimplenoteShare/Extractors/URLExtractor.swift b/SimplenoteShare/Extractors/URLExtractor.swift
index 8b75cb108..b561f4548 100644
--- a/SimplenoteShare/Extractors/URLExtractor.swift
+++ b/SimplenoteShare/Extractors/URLExtractor.swift
@@ -3,7 +3,6 @@ import MobileCoreServices
 import ZIPFoundation
 import UniformTypeIdentifiers
 
-
 // MARK: - URLExtractor
 //
 struct URLExtractor: Extractor {
@@ -38,7 +37,6 @@ struct URLExtractor: Extractor {
     }
 }
 
-
 // MARK: - Loading Notes from a file!
 //
 private extension URLExtractor {
@@ -109,7 +107,6 @@ private extension URLExtractor {
     }
 }
 
-
 // MARK: - Fallback: Handling external URL(s)
 //
 private extension URLExtractor {
@@ -131,7 +128,6 @@ private extension URLExtractor {
     }
 }
 
-
 // MARK: - Path Extensions
 //
 private enum PathExtension: String {
diff --git a/SimplenoteShare/Presentation/ExtensionPresentationAnimator.swift b/SimplenoteShare/Presentation/ExtensionPresentationAnimator.swift
index 56726ac36..3542487c9 100644
--- a/SimplenoteShare/Presentation/ExtensionPresentationAnimator.swift
+++ b/SimplenoteShare/Presentation/ExtensionPresentationAnimator.swift
@@ -1,6 +1,5 @@
 import UIKit
 
-
 /// Direction to transition from/to.
 ///
 /// - left: Enter/leave screen via the left edge.
@@ -15,7 +14,6 @@ enum Direction {
     case bottom
 }
 
-
 /// Animator that animates the presented View Controller from/to a specific `Direction`.
 ///
 final class ExtensionPresentationAnimator: NSObject {
@@ -29,7 +27,6 @@ final class ExtensionPresentationAnimator: NSObject {
     }
 }
 
-
 // MARK: - UIViewControllerAnimatedTransitioning Conformance
 //
 extension ExtensionPresentationAnimator: UIViewControllerAnimatedTransitioning {
@@ -72,7 +69,6 @@ extension ExtensionPresentationAnimator: UIViewControllerAnimatedTransitioning {
     }
 }
 
-
 // MARK: - Constants
 //
 private struct Constants {
diff --git a/SimplenoteShare/Presentation/ExtensionPresentationController.swift b/SimplenoteShare/Presentation/ExtensionPresentationController.swift
index 69326c811..3017dfcc4 100644
--- a/SimplenoteShare/Presentation/ExtensionPresentationController.swift
+++ b/SimplenoteShare/Presentation/ExtensionPresentationController.swift
@@ -1,6 +1,5 @@
 import UIKit
 
-
 /// Allows certain presented view controllers to request themselves to be
 /// presented at full size instead of inset within the container.
 ///
@@ -8,7 +7,6 @@ protocol ExtensionPresentationTarget {
     var shouldFillContentContainer: Bool { get }
 }
 
-
 final class ExtensionPresentationController: UIPresentationController {
 
     // MARK: - Private Properties
@@ -46,7 +44,6 @@ final class ExtensionPresentationController: UIPresentationController {
         removeKeyboardObservers(with: tokens)
     }
 
-
     // MARK: Presentation Controller Overrides
 
     override var frameOfPresentedViewInContainerView: CGRect {
@@ -103,7 +100,6 @@ final class ExtensionPresentationController: UIPresentationController {
     }
 }
 
-
 // MARK: - KeyboardObservable Conformance
 //
 extension ExtensionPresentationController: KeyboardObservable {
@@ -148,7 +144,6 @@ extension ExtensionPresentationController: KeyboardObservable {
     }
 }
 
-
 // MARK: - Constants
 //
 private extension ExtensionPresentationController {
diff --git a/SimplenoteShare/Presentation/ExtensionTransitioningManager.swift b/SimplenoteShare/Presentation/ExtensionTransitioningManager.swift
index 439110485..eff4f821c 100644
--- a/SimplenoteShare/Presentation/ExtensionTransitioningManager.swift
+++ b/SimplenoteShare/Presentation/ExtensionTransitioningManager.swift
@@ -1,12 +1,10 @@
 import UIKit
 
-
 final class ExtensionTransitioningManager: NSObject {
     var presentDirection = Direction.bottom
     var dismissDirection = Direction.bottom
 }
 
-
 // MARK: - UIViewControllerTransitioningDelegate Conformance
 //
 extension ExtensionTransitioningManager: UIViewControllerTransitioningDelegate {
diff --git a/SimplenoteShare/Simperium/Note.swift b/SimplenoteShare/Simperium/Note.swift
index 3d9956c3a..e585974ae 100644
--- a/SimplenoteShare/Simperium/Note.swift
+++ b/SimplenoteShare/Simperium/Note.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 /// This class encapsulates the Note entity. It's the main project (non core data) counterpart.
 ///
 class Note {
@@ -27,7 +26,6 @@ class Note {
     ///
     let modificationDate = Date()
 
-
     /// Designated Initializer
     ///
     init(content: String, markdown: Bool = false) {
diff --git a/SimplenoteShare/Simperium/Uploader.swift b/SimplenoteShare/Simperium/Uploader.swift
index a12f22c1f..743e918e6 100644
--- a/SimplenoteShare/Simperium/Uploader.swift
+++ b/SimplenoteShare/Simperium/Uploader.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 /// The purpose of this class is to encapsulate NSURLSession's interaction code, required to upload
 /// a note to Simperium's REST endpoint.
 ///
@@ -16,7 +15,6 @@ class Uploader: NSObject {
         token = simperiumToken
     }
 
-
     // MARK: - Public Methods
     func send(_ note: Note) {
         // Build the targetURL
@@ -38,7 +36,6 @@ class Uploader: NSObject {
     }
 }
 
-
 // MARK: - URLSessionDelegate
 //
 extension Uploader: URLSessionDelegate {
@@ -54,7 +51,6 @@ extension Uploader: URLSessionDelegate {
     }
 }
 
-
 // MARK: - URLSessionTaskDelegate
 //
 extension Uploader: URLSessionTaskDelegate {
@@ -65,7 +61,6 @@ extension Uploader: URLSessionTaskDelegate {
     }
 }
 
-
 // MARK: - Settings
 //
 private struct Settings {
diff --git a/SimplenoteShare/Themes/SPUserInterface.swift b/SimplenoteShare/Themes/SPUserInterface.swift
index 8ac4f7fae..0cce96085 100644
--- a/SimplenoteShare/Themes/SPUserInterface.swift
+++ b/SimplenoteShare/Themes/SPUserInterface.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 
-
 // MARK: - Simplenote's Theme
 //
 @objc
diff --git a/SimplenoteShare/ViewControllers/SharePresentationController.swift b/SimplenoteShare/ViewControllers/SharePresentationController.swift
index 061cfea2c..8612aa04c 100644
--- a/SimplenoteShare/ViewControllers/SharePresentationController.swift
+++ b/SimplenoteShare/ViewControllers/SharePresentationController.swift
@@ -1,6 +1,5 @@
 import UIKit
 
-
 class SharePresentationController: UIViewController {
 
     private let extensionTransitioningManager: ExtensionTransitioningManager = {
@@ -25,7 +24,6 @@ class SharePresentationController: UIViewController {
     }
 }
 
-
 // MARK: - Private Helpers
 //
 private extension SharePresentationController {
@@ -44,7 +42,6 @@ private extension SharePresentationController {
     }
 }
 
-
 // MARK: - Appearance Helpers
 //
 private extension SharePresentationController {
diff --git a/SimplenoteShare/ViewControllers/ShareViewController.swift b/SimplenoteShare/ViewControllers/ShareViewController.swift
index da1c26e4e..f770d4845 100644
--- a/SimplenoteShare/ViewControllers/ShareViewController.swift
+++ b/SimplenoteShare/ViewControllers/ShareViewController.swift
@@ -1,7 +1,6 @@
 import UIKit
 import Social
 
-
 typealias CompletionBlock = () -> Void
 
 /// Main VC for Simplenote's Share Extension
@@ -12,7 +11,6 @@ class ShareViewController: UIViewController {
     ///
     @objc var dismissalCompletionBlock: CompletionBlock?
 
-
     // MARK: Private Properties
 
     @IBOutlet private weak var textView: UITextView!
@@ -68,7 +66,6 @@ class ShareViewController: UIViewController {
         fatalError("init(coder:) has not been implemented")
     }
 
-
     // MARK: UIViewController Lifecycle
 
     override func viewDidLoad() {
@@ -89,7 +86,6 @@ class ShareViewController: UIViewController {
     }
 }
 
-
 // MARK: - Actions
 //
 private extension ShareViewController {
@@ -134,7 +130,6 @@ private extension ShareViewController {
     }
 }
 
-
 // MARK: - Token Validation
 //
 private extension ShareViewController {
@@ -166,7 +161,6 @@ private extension ShareViewController {
     }
 }
 
-
 // MARK: - Configuration
 //
 private extension ShareViewController {
@@ -194,7 +188,6 @@ private extension ShareViewController {
     }
 }
 
-
 // MARK: - Constants
 //
 private struct Constants {
diff --git a/SimplenoteTests/AuthenticationValidatorTests.swift b/SimplenoteTests/AuthenticationValidatorTests.swift
index 189197e44..6f986827d 100644
--- a/SimplenoteTests/AuthenticationValidatorTests.swift
+++ b/SimplenoteTests/AuthenticationValidatorTests.swift
@@ -1,8 +1,6 @@
 import XCTest
-import XCTest
 @testable import Simplenote
 
-
 // MARK: - AuthenticationValidator Tests
 //
 class AuthenticationValidatorTests: XCTestCase {
@@ -11,7 +9,6 @@ class AuthenticationValidatorTests: XCTestCase {
     ///
     let validator = AuthenticationValidator()
 
-
     /// Verifies that `performUsernameValidation` returns `true` when the input string is valid
     ///
     func testPerformUsernameValidationReturnsTrueWheneverInputEmailIsValid() {
diff --git a/SimplenoteTests/CGRectSimplenoteTests.swift b/SimplenoteTests/CGRectSimplenoteTests.swift
index 33d1cb6e2..edd4dc319 100644
--- a/SimplenoteTests/CGRectSimplenoteTests.swift
+++ b/SimplenoteTests/CGRectSimplenoteTests.swift
@@ -1,7 +1,6 @@
 import XCTest
 @testable import Simplenote
 
-
 // MARK: - CGRect Tests
 //
 class CGRectSimplenoteTests: XCTestCase {
diff --git a/SimplenoteTests/Constants.swift b/SimplenoteTests/Constants.swift
index 3a37c8b76..a9683ae5c 100644
--- a/SimplenoteTests/Constants.swift
+++ b/SimplenoteTests/Constants.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 /// Unit Tests Constants
 ///
 struct Constants {
diff --git a/SimplenoteTests/EmailVerificationTests.swift b/SimplenoteTests/EmailVerificationTests.swift
index 601a109ef..2b992dfae 100644
--- a/SimplenoteTests/EmailVerificationTests.swift
+++ b/SimplenoteTests/EmailVerificationTests.swift
@@ -1,7 +1,6 @@
 import XCTest
 @testable import Simplenote
 
-
 // MARK: - EmailVerificationTests
 //
 class EmailVerificationTests: XCTestCase {
diff --git a/SimplenoteTests/InterlinkResultsControllerTests.swift b/SimplenoteTests/InterlinkResultsControllerTests.swift
index d93a3ebb7..9894ddadd 100644
--- a/SimplenoteTests/InterlinkResultsControllerTests.swift
+++ b/SimplenoteTests/InterlinkResultsControllerTests.swift
@@ -1,7 +1,6 @@
 import XCTest
 @testable import Simplenote
 
-
 // MARK: - InterlinkResultsController Tests
 //
 class InterlinkResultsControllerTests: XCTestCase {
@@ -14,7 +13,6 @@ class InterlinkResultsControllerTests: XCTestCase {
     ///
     private var resultsController: InterlinkResultsController!
 
-
     // MARK: - Overridden Methods
 
     override func setUp() {
@@ -27,7 +25,6 @@ class InterlinkResultsControllerTests: XCTestCase {
         storage.reset()
     }
 
-
     // MARK: - Tests: Filtering
 
     /// Verifies that only Notes with matching keywords in their title are returned by `searchNotes:byTitleKeyword:`
@@ -107,7 +104,6 @@ class InterlinkResultsControllerTests: XCTestCase {
     }
 }
 
-
 // MARK: - Private
 //
 private extension InterlinkResultsControllerTests {
@@ -132,7 +128,6 @@ private extension InterlinkResultsControllerTests {
     }
 }
 
-
 // MARK: - Constants
 //
 private enum Settings {
diff --git a/SimplenoteTests/MockupStorage+Sample.swift b/SimplenoteTests/MockupStorage+Sample.swift
index 925994a91..c4243ff19 100644
--- a/SimplenoteTests/MockupStorage+Sample.swift
+++ b/SimplenoteTests/MockupStorage+Sample.swift
@@ -1,7 +1,6 @@
 import Foundation
 @testable import Simplenote
 
-
 // MARK: - MockupStorage Sample Entity Insertion Methods
 //
 extension MockupStorageManager {
diff --git a/SimplenoteTests/MockupStorage.swift b/SimplenoteTests/MockupStorage.swift
index 83aab212f..02123fe4e 100644
--- a/SimplenoteTests/MockupStorage.swift
+++ b/SimplenoteTests/MockupStorage.swift
@@ -2,7 +2,6 @@ import Foundation
 import CoreData
 @testable import Simplenote
 
-
 /// MockupStorageManager: InMemory CoreData Stack.
 ///
 class MockupStorageManager {
@@ -73,7 +72,6 @@ class MockupStorageManager {
     }
 }
 
-
 // MARK: - Descriptors
 //
 extension MockupStorageManager {
@@ -97,7 +95,6 @@ extension MockupStorageManager {
     }
 }
 
-
 // MARK: - Stack URL's
 //
 extension MockupStorageManager {
diff --git a/SimplenoteTests/NSMutableAttributedStringStylingTests.swift b/SimplenoteTests/NSMutableAttributedStringStylingTests.swift
index ee3cc22d5..1682fbd1f 100644
--- a/SimplenoteTests/NSMutableAttributedStringStylingTests.swift
+++ b/SimplenoteTests/NSMutableAttributedStringStylingTests.swift
@@ -1,7 +1,6 @@
 import XCTest
 @testable import Simplenote
 
-
 // MARK: - NSMutableAttributedString Styling Tests
 //
 class NSMutableAttributedStringStylingTests: XCTestCase {
diff --git a/SimplenoteTests/NSPredicateEmailTests.swift b/SimplenoteTests/NSPredicateEmailTests.swift
index 2de77a7f3..77692975f 100644
--- a/SimplenoteTests/NSPredicateEmailTests.swift
+++ b/SimplenoteTests/NSPredicateEmailTests.swift
@@ -2,7 +2,6 @@ import Foundation
 import XCTest
 @testable import Simplenote
 
-
 // MARK: - NSPredicate+Email Unit Tests
 //
 class NSPredicateEmailTests: XCTestCase {
diff --git a/SimplenoteTests/NSStringCondensingTests.swift b/SimplenoteTests/NSStringCondensingTests.swift
index 6b73e6599..e9080ae02 100644
--- a/SimplenoteTests/NSStringCondensingTests.swift
+++ b/SimplenoteTests/NSStringCondensingTests.swift
@@ -2,7 +2,6 @@ import Foundation
 import XCTest
 @testable import Simplenote
 
-
 // MARK: - NSString+Condensing Unit Tests
 //
 class NSStringCondensingTests: XCTestCase {
diff --git a/SimplenoteTests/NSStringSimplenoteTests.swift b/SimplenoteTests/NSStringSimplenoteTests.swift
index 1a2dbc2ad..981cc184a 100644
--- a/SimplenoteTests/NSStringSimplenoteTests.swift
+++ b/SimplenoteTests/NSStringSimplenoteTests.swift
@@ -1,7 +1,6 @@
 import XCTest
 @testable import Simplenote
 
-
 // MARK: - NSString Simplenote Tests
 //
 class NSStringSimplenoteTests: XCTestCase {
diff --git a/SimplenoteTests/NoteBodyExcerptTests.swift b/SimplenoteTests/NoteBodyExcerptTests.swift
index 090ea0c6f..569697eae 100644
--- a/SimplenoteTests/NoteBodyExcerptTests.swift
+++ b/SimplenoteTests/NoteBodyExcerptTests.swift
@@ -1,7 +1,6 @@
 import XCTest
 @testable import Simplenote
 
-
 // MARK: - String Truncation Tests
 //
 class NoteBodyExcerptTests: XCTestCase {
diff --git a/SimplenoteTests/NoteContentHelperTests.swift b/SimplenoteTests/NoteContentHelperTests.swift
index 7900c181f..a604c6010 100644
--- a/SimplenoteTests/NoteContentHelperTests.swift
+++ b/SimplenoteTests/NoteContentHelperTests.swift
@@ -1,7 +1,6 @@
 import XCTest
 @testable import Simplenote
 
-
 // MARK: - NoteContentHelperTests Tests
 //
 class NoteContentHelperTests: XCTestCase {
diff --git a/SimplenoteTests/NoteContentPreviewTests.swift b/SimplenoteTests/NoteContentPreviewTests.swift
index f43419856..7484cd41e 100644
--- a/SimplenoteTests/NoteContentPreviewTests.swift
+++ b/SimplenoteTests/NoteContentPreviewTests.swift
@@ -1,7 +1,6 @@
 import XCTest
 @testable import Simplenote
 
-
 // MARK: - NoteContentPreviewTests Tests
 //
 class NoteContentPreviewTests: XCTestCase {
diff --git a/SimplenoteTests/NoteLinkTests.swift b/SimplenoteTests/NoteLinkTests.swift
index 6a0e5ca4c..89067433e 100644
--- a/SimplenoteTests/NoteLinkTests.swift
+++ b/SimplenoteTests/NoteLinkTests.swift
@@ -1,7 +1,6 @@
 import XCTest
 @testable import Simplenote
 
-
 // MARK: - Note+Extension Tests
 //
 class NoteLinkTests: XCTestCase {
diff --git a/SimplenoteTests/NotesListControllerTests.swift b/SimplenoteTests/NotesListControllerTests.swift
index 8e4fbc44a..296f1e8f6 100644
--- a/SimplenoteTests/NotesListControllerTests.swift
+++ b/SimplenoteTests/NotesListControllerTests.swift
@@ -2,7 +2,6 @@ import XCTest
 import SimplenoteFoundation
 @testable import Simplenote
 
-
 // MARK: - NotesListControllerTests
 //
 class NotesListControllerTests: XCTestCase {
@@ -15,7 +14,6 @@ class NotesListControllerTests: XCTestCase {
     ///
     private var noteListController: NotesListController!
 
-
     // MARK: - Overridden Methods
 
     override func setUp() {
@@ -29,7 +27,6 @@ class NotesListControllerTests: XCTestCase {
         storage.reset()
     }
 
-
     // MARK: - Tests: Filters
 
     /// Verifies that the Filter property properly filters out non matching entities
@@ -51,7 +48,6 @@ class NotesListControllerTests: XCTestCase {
         XCTAssertEqual(noteListController.numberOfObjects, 1)
     }
 
-
     // MARK: - Tests: Sorting
 
     /// Verifies that the SortMode property properly applies the specified order mode to the retrieved entities
@@ -73,7 +69,6 @@ class NotesListControllerTests: XCTestCase {
         }
     }
 
-
     // MARK: - Tests: Sections
 
     /// Verifies that the Tag Entities aren't fetched when in Results Mode
@@ -92,7 +87,6 @@ class NotesListControllerTests: XCTestCase {
         XCTAssertEqual(noteListController.sections[0].numberOfObjects, notes.count)
     }
 
-
     // MARK: - Tests: Search
 
     /// Verifies that the Tag Entities are fetched when in search mode
@@ -122,7 +116,6 @@ class NotesListControllerTests: XCTestCase {
         XCTAssertEqual(noteListController.sections.count, 2)
     }
 
-
     /// Verifies that the `endSearch` switches the NotesList back to a single section
     ///
     func testEndSearchSwitchesBackToSingleSectionMode() {
@@ -169,7 +162,6 @@ class NotesListControllerTests: XCTestCase {
         XCTAssert(noteListController.sections[0].numberOfObjects <= noteListController.limitForTagResults)
     }
 
-
     // MARK: - Tests: `object(at:)`
 
     /// Verifies that `object(at: IndexPath)` returns the proper Note when in results mode
@@ -225,7 +217,6 @@ class NotesListControllerTests: XCTestCase {
         XCTAssertEqual(note.content, "055")
     }
 
-
     // MARK: - Tests: `indexPath(forObject:)`
 
     /// Verifies that `indexPath(forObject:)` returns the proper Note when in Results Mode
@@ -476,7 +467,6 @@ class NotesListControllerTests: XCTestCase {
         waitForExpectations(timeout: Constants.expectationTimeout, handler: nil)
     }
 
-
     /// Verifies that `onBatchChanges` does not relay duplicated Changesets
     ///
     func testOnBatchChangesDoesNotRelayDuplicatedEvents() {
@@ -493,7 +483,6 @@ class NotesListControllerTests: XCTestCase {
         waitForExpectations(timeout: Constants.expectationTimeout, handler: nil)
     }
 
-
     /// Verifies that `onBatchChanges` relays move events
     ///
     func testOnBatchChangesRelaysMoveEvents() {
@@ -514,7 +503,6 @@ class NotesListControllerTests: XCTestCase {
     }
 }
 
-
 // MARK: - Private APIs
 //
 private extension NotesListControllerTests {
diff --git a/SimplenoteTests/OptionsTests.swift b/SimplenoteTests/OptionsTests.swift
index 6083362bd..fb58e6d1c 100644
--- a/SimplenoteTests/OptionsTests.swift
+++ b/SimplenoteTests/OptionsTests.swift
@@ -2,7 +2,6 @@ import Foundation
 import XCTest
 @testable import Simplenote
 
-
 // MARK: - Options Unit Tests
 //
 class OptionsTests: XCTestCase {
diff --git a/SimplenoteTests/StringContentSliceTests.swift b/SimplenoteTests/StringContentSliceTests.swift
index a9acdba7c..b90a7e807 100644
--- a/SimplenoteTests/StringContentSliceTests.swift
+++ b/SimplenoteTests/StringContentSliceTests.swift
@@ -1,7 +1,6 @@
 import XCTest
 @testable import Simplenote
 
-
 // MARK: - String Content Slice Tests
 //
 class StringContentSliceTests: XCTestCase {
diff --git a/SimplenoteTests/StringSimplenoteTests.swift b/SimplenoteTests/StringSimplenoteTests.swift
index dde1dd716..34233daa0 100644
--- a/SimplenoteTests/StringSimplenoteTests.swift
+++ b/SimplenoteTests/StringSimplenoteTests.swift
@@ -1,7 +1,6 @@
 import XCTest
 @testable import Simplenote
 
-
 // MARK: - String Truncation Tests
 //
 class StringSimplenoteTests: XCTestCase {
diff --git a/SimplenoteTests/Tags/TagTextFieldInputValidatorTests.swift b/SimplenoteTests/Tags/TagTextFieldInputValidatorTests.swift
index 1e33ec28e..ad20d6507 100644
--- a/SimplenoteTests/Tags/TagTextFieldInputValidatorTests.swift
+++ b/SimplenoteTests/Tags/TagTextFieldInputValidatorTests.swift
@@ -43,7 +43,7 @@ class TagTextFieldInputValidatorTests: XCTestCase {
             XCTAssertEqual(validator.validateInput(originalText: text, range: range, replacement: replacement), expectedResult)
         }
     }
-    
+
     func testValidationFailsWhenReplacementHasComma() {
         let text = "tag"
         let range = text.endIndex..<text.endIndex
@@ -99,14 +99,14 @@ class TagTextFieldInputValidatorTests: XCTestCase {
             XCTAssertEqual(validator.validateInput(originalText: text, range: range, replacement: replacement), expectedResult)
         }
     }
-    
+
     func testReplacingTextWithCommaAtTheEnd() {
         let text = "tag"
         let range = text.endIndex..<text.endIndex
-        
+
         let expectedResult = TagTextFieldInputValidator.Result.endingWithDisallowedCharacter("tagtag")
         let replacement = "tag,"
-        
+
         XCTAssertEqual(validator.validateInput(originalText: text, range: range, replacement: replacement), expectedResult)
     }
 
@@ -119,7 +119,6 @@ class TagTextFieldInputValidatorTests: XCTestCase {
         XCTAssertEqual(validator.validateInput(originalText: text, range: range, replacement: replacement), expectedResult)
     }
 
-
     func testPreprocessingForPastingTrimsWhitespacesAndNewlinesAndReturnsFirstPart() {
         let cases = [
             "tag": "tag",
diff --git a/SimplenoteTests/UIColorSimplenoteTests.swift b/SimplenoteTests/UIColorSimplenoteTests.swift
index 349a2f2a8..882682245 100644
--- a/SimplenoteTests/UIColorSimplenoteTests.swift
+++ b/SimplenoteTests/UIColorSimplenoteTests.swift
@@ -8,7 +8,6 @@ class UIColorSimplenoteTests: XCTestCase {
         //gray5 in RGB is r: 220 g: 220 b: 222
         let gray5 = UIColor(hexString: "dcdcde")
 
-
         let spBlue20RGB = UIColor(red: rgbPercent(132), green: rgbPercent(164), blue: rgbPercent(240), alpha: 1)
         let gray5RGB = UIColor(red: rgbPercent(220), green: rgbPercent(220), blue: rgbPercent(222), alpha: 1)
 
@@ -26,7 +25,6 @@ class UIColorSimplenoteTests: XCTestCase {
         //gray5 in RGB is r: 220 g: 220 b: 222
         let gray5 = UIColor(hexString: "#dcdcde")
 
-
         let spBlue20RGB = UIColor(red: rgbPercent(132), green: rgbPercent(164), blue: rgbPercent(240), alpha: 1)
         let gray5RGB = UIColor(red: rgbPercent(220), green: rgbPercent(220), blue: rgbPercent(222), alpha: 1)
 
diff --git a/SimplenoteTests/UIImageSimplenoteTests.swift b/SimplenoteTests/UIImageSimplenoteTests.swift
index 9be1f1315..fdb1fcce9 100644
--- a/SimplenoteTests/UIImageSimplenoteTests.swift
+++ b/SimplenoteTests/UIImageSimplenoteTests.swift
@@ -1,7 +1,6 @@
 import XCTest
 @testable import Simplenote
 
-
 // MARK: - UIImage+Simplenote Unit Tests
 //
 class UIImageSimplenoteTests: XCTestCase {
diff --git a/SimplenoteTests/UserDefaults+Tests.swift b/SimplenoteTests/UserDefaults+Tests.swift
index 877844c97..488587354 100644
--- a/SimplenoteTests/UserDefaults+Tests.swift
+++ b/SimplenoteTests/UserDefaults+Tests.swift
@@ -1,6 +1,5 @@
 import Foundation
 
-
 // MARK: - UserDefaults Extension Methods
 //
 extension UserDefaults {
diff --git a/SimplenoteUITests/NoteEditor.swift b/SimplenoteUITests/NoteEditor.swift
index 4f5abf4c1..b8117d0a6 100644
--- a/SimplenoteUITests/NoteEditor.swift
+++ b/SimplenoteUITests/NoteEditor.swift
@@ -131,7 +131,6 @@ class NoteEditor {
         toggleMarkdownState()
     }
 
-
     class func getLink(byText linkText: String) -> XCUIElement {
         // As of iOS 16.0, a link in Note Editor is presented by two elements:
         // First is of `link` type and has zero dimensions, the other is its child
diff --git a/SimplenoteWidgets/SimplenoteWidgets.swift b/SimplenoteWidgets/SimplenoteWidgets.swift
index 8658d954d..da94f0cc5 100644
--- a/SimplenoteWidgets/SimplenoteWidgets.swift
+++ b/SimplenoteWidgets/SimplenoteWidgets.swift
@@ -1,7 +1,6 @@
 import SwiftUI
 import WidgetKit
 
-
 @available(iOS 14.0, *)
 @main
 struct SimplenoteWidgets: WidgetBundle {
diff --git a/SimplenoteWidgets/Tools/WidgetsState.swift b/SimplenoteWidgets/Tools/WidgetsState.swift
index 42ac2545b..9be1192ea 100644
--- a/SimplenoteWidgets/Tools/WidgetsState.swift
+++ b/SimplenoteWidgets/Tools/WidgetsState.swift
@@ -7,7 +7,6 @@ enum WidgetsState {
     case loggedOut
 }
 
-
 extension WidgetsState {
     var message: String {
         switch self {
diff --git a/SimplenoteWidgets/ViewModifiers/Filling.swift b/SimplenoteWidgets/ViewModifiers/Filling.swift
index 6ac8cba2d..169c7717d 100644
--- a/SimplenoteWidgets/ViewModifiers/Filling.swift
+++ b/SimplenoteWidgets/ViewModifiers/Filling.swift
@@ -12,4 +12,3 @@ struct Filling: ViewModifier {
               )
     }
 }
-
diff --git a/SimplenoteWidgets/Views/ListWidgetHeaderView.swift b/SimplenoteWidgets/Views/ListWidgetHeaderView.swift
index 369c08ebc..236c653e0 100644
--- a/SimplenoteWidgets/Views/ListWidgetHeaderView.swift
+++ b/SimplenoteWidgets/Views/ListWidgetHeaderView.swift
@@ -1,7 +1,6 @@
 import SwiftUI
 import WidgetKit
 
-
 struct ListWidgetHeaderView: View {
     let tag: WidgetTag
 
diff --git a/SimplenoteWidgets/Views/ListWidgetView.swift b/SimplenoteWidgets/Views/ListWidgetView.swift
index 1447b63ff..8d7b09b92 100644
--- a/SimplenoteWidgets/Views/ListWidgetView.swift
+++ b/SimplenoteWidgets/Views/ListWidgetView.swift
@@ -52,7 +52,6 @@ enum Row {
     case empty
 }
 
-
 private struct Constants {
     static let mediumRows = 3
     static let largeRows = 8
diff --git a/SimplenoteWidgets/Views/NoteListRow.swift b/SimplenoteWidgets/Views/NoteListRow.swift
index ce033493d..5e75ffd98 100644
--- a/SimplenoteWidgets/Views/NoteListRow.swift
+++ b/SimplenoteWidgets/Views/NoteListRow.swift
@@ -29,4 +29,3 @@ struct NoteListRow_Previews: PreviewProvider {
             .previewContext(WidgetPreviewContext(family: .systemLarge))
     }
 }
-
diff --git a/UITestsFoundation/PasscodeScreen.swift b/UITestsFoundation/PasscodeScreen.swift
index a33a0693c..94c36342a 100644
--- a/UITestsFoundation/PasscodeScreen.swift
+++ b/UITestsFoundation/PasscodeScreen.swift
@@ -5,11 +5,7 @@ public class PasscodeScreen: ScreenObject {
 
     public init(app: XCUIApplication = XCUIApplication()) throws {
         try super.init(
-            expectedElementGetters: [
-                { $0.staticTexts["1"].firstMatch },
-                { $0.staticTexts["4"].firstMatch },
-                { $0.staticTexts["7"].firstMatch },
-                { $0.staticTexts["0"].firstMatch }
+            expectedElementGetters: [ { $0.staticTexts["1"].firstMatch }, { $0.staticTexts["4"].firstMatch }, { $0.staticTexts["7"].firstMatch }, { $0.staticTexts["0"].firstMatch }
             ],
             app: app
         )

From c67c63cbe2fff2f4464e833565c7f225a26d3439 Mon Sep 17 00:00:00 2001
From: Ian Maia <ian.maia@automattic.com>
Date: Mon, 26 Feb 2024 20:01:17 +0100
Subject: [PATCH 045/547] Remove Hound configuration

---
 .hound.yml | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 .hound.yml

diff --git a/.hound.yml b/.hound.yml
deleted file mode 100644
index 0d5250000..000000000
--- a/.hound.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-fail_on_violations: true
-
-rubocop:
-  enabled: false
-  
-swiftlint:
-  config_file: .swiftlint.yml

From f63e68a4e11ce717f9a094b216cdea2473a0c6d9 Mon Sep 17 00:00:00 2001
From: Ian Maia <ian.maia@automattic.com>
Date: Mon, 26 Feb 2024 20:06:31 +0100
Subject: [PATCH 046/547] Update README file with SwiftLint instructions

---
 README.md | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 94f4554e9..f73b2862d 100644
--- a/README.md
+++ b/README.md
@@ -20,23 +20,8 @@ Third party libraries and resources managed by CocoaPods will be installed by th
 
 #### SwiftLint
 
-We use [SwiftLint](https://github.com/realm/SwiftLint) to enforce a common style for Swift code. The app should build and work without it, but if you plan to write code, you are encouraged to install it. No commit should have lint warnings or errors.
-
-You can set up a Git [pre-commit hook](https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks) to run SwiftLint automatically when committing by running:
-
-`rake git:install_hooks`
-
-This is the recommended way to include SwiftLint in your workflow, as it catches lint issues locally before your code makes its way to Github.
-
-Alternately, a SwiftLint scheme is exposed within the project; Xcode will show a warning if you don't have SwiftLint installed.
-
-SwiftLint is integrated directly into the Xcode project, so lint errors appear as warnings after you build the project
-
-If your code has any style violations, you can try to automatically correct them by running:
-
-`rake lint:autocorrect`
-
-Otherwise you have to fix them manually.
+We use [SwiftLint](https://github.com/realm/SwiftLint) to enforce a common style for Swift code. If you plan to write code, SwiftLint is going to be installed when you run `bundle exec pod install` and SwiftLint will run during the build.
+No commit should have lint warnings or errors.
 
 ### Open Xcode
 

From eb1a2620b43035d87fe17f23ed6f5ac0bacbd2a4 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Mon, 25 Mar 2024 15:54:52 -0600
Subject: [PATCH 047/547] Remove the sustainer banner from the settings view

---
 .../SPSettingsViewController+Extensions.swift |  5 ++-
 Simplenote/Classes/SPSettingsViewController.m | 31 +------------------
 2 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/Simplenote/Classes/SPSettingsViewController+Extensions.swift b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
index 596d03cb0..be35d7233 100644
--- a/Simplenote/Classes/SPSettingsViewController+Extensions.swift
+++ b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
@@ -2,7 +2,10 @@ import UIKit
 
 // MARK: - Subscriber UI
 //
-extension SPSettingsViewController {
+
+// The methods in this extension are for showing and displaying the Sustainer banner in settings.  We are discontinuing Sustainer,
+// but we may still want to use the banner in the future, so marking these methods fileprivate and have removed their callers
+fileprivate extension SPSettingsViewController {
 
     private var isActiveSustainer: Bool {
         SPAppDelegate.shared().simperium.preferencesObject().isActiveSubscriber
diff --git a/Simplenote/Classes/SPSettingsViewController.m b/Simplenote/Classes/SPSettingsViewController.m
index b73535fe1..5b022a653 100644
--- a/Simplenote/Classes/SPSettingsViewController.m
+++ b/Simplenote/Classes/SPSettingsViewController.m
@@ -132,10 +132,6 @@ - (void)viewDidLoad
     self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone
                                                                                            target:self
                                                                                            action:@selector(doneAction:)];
-    
-    // Header View
-    [self setupTableHeaderView];
-
     // Setup the Switches
     self.alphabeticalTagSortSwitch = [UISwitch new];
     [self.alphabeticalTagSortSwitch addTarget:self
@@ -180,46 +176,22 @@ - (void)viewDidLoad
                                                  name:SPSimplenoteThemeChangedNotification
                                                object:nil];
 
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(subscriptionStatusDidChange)
-                                                 name:SPSubscriptionStatusDidChangeNotification
-                                               object:nil];
-
     [self refreshThemeStyles];
 }
 
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-    [self refreshTableHeaderView];
     [self.tableView reloadData];
 }
 
-- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator
-{
-    [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
-
-    [coordinator animateAlongsideTransition:^(id<UIViewControllerTransitionCoordinatorContext>  _Nonnull context) {
-        [self refreshTableHeaderView];
-    } completion:nil];
-}
-
 - (void)doneAction:(id)sender
 {
     [self.navigationController dismissViewControllerAnimated:YES completion:nil];
 }
 
-
 #pragma mark - Notifications
 
-- (void)subscriptionStatusDidChange
-{
-    dispatch_async(dispatch_get_main_queue(), ^{
-        [self refreshTableHeaderView];
-    });
-}
-
-
 #pragma mark - Table view data source
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
@@ -594,8 +566,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
             break;
 
         } case SPOptionsViewSectionsSustainer: {
-
-            [self restorePurchases];
+            //TODO: Remove the sustainer case?
             break;
 
         } case SPOptionsViewSectionsAccount: {

From aa143af8478a49d673f27dc2a21ebf8ad2a16fbc Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Mon, 25 Mar 2024 15:58:14 -0600
Subject: [PATCH 048/547] Dropped SPOptionsViewSectionsSustainer enum case for
 settings tableview

---
 Simplenote/Classes/SPSettingsViewController.m | 49 +++----------------
 1 file changed, 7 insertions(+), 42 deletions(-)

diff --git a/Simplenote/Classes/SPSettingsViewController.m b/Simplenote/Classes/SPSettingsViewController.m
index 5b022a653..363ad47a6 100644
--- a/Simplenote/Classes/SPSettingsViewController.m
+++ b/Simplenote/Classes/SPSettingsViewController.m
@@ -36,18 +36,12 @@ typedef NS_ENUM(NSInteger, SPOptionsViewSections) {
     SPOptionsViewSectionsTags           = 1,
     SPOptionsViewSectionsAppearance     = 2,
     SPOptionsViewSectionsSecurity       = 3,
-    SPOptionsViewSectionsSustainer      = 4,
-    SPOptionsViewSectionsAccount        = 5,
-    SPOptionsViewSectionsDelete         = 6,
-    SPOptionsViewSectionsAbout          = 7,
-    SPOptionsViewSectionsHelp           = 8,
-    SPOptionsViewSectionsDebug          = 9,
-    SPOptionsViewSectionsCount          = 10,
-};
-
-typedef NS_ENUM(NSInteger, SPOptionsSustainerRow) {
-    SPOptionsSustainerRowRestore        = 0,
-    SPOptionsSustainerRowCount          = 1
+    SPOptionsViewSectionsAccount        = 4,
+    SPOptionsViewSectionsDelete         = 5,
+    SPOptionsViewSectionsAbout          = 6,
+    SPOptionsViewSectionsHelp           = 7,
+    SPOptionsViewSectionsDebug          = 8,
+    SPOptionsViewSectionsCount          = 9,
 };
 
 typedef NS_ENUM(NSInteger, SPOptionsAccountRow) {
@@ -224,14 +218,6 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
             return [self isPinLockEnabled] ? SPOptionsSecurityRowRowCount - rowsToRemove : disabledPinLockRows;
         }
 
-        case SPOptionsViewSectionsSustainer: {
-            return SPOptionsSustainerRowCount;
-        }
-
-        case SPOptionsViewSectionsAccount: {
-            return SPOptionsAccountRowCount;
-        }
-
         case SPOptionsViewSectionsDelete: {
             return SPOptionsDeleteRowCount;
         }
@@ -270,9 +256,6 @@ - (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInte
         case SPOptionsViewSectionsSecurity:
             return NSLocalizedString(@"Security", nil);
 
-        case SPOptionsViewSectionsSustainer:
-            return NSLocalizedString(@"Sustainer", nil);
-
         case SPOptionsViewSectionsAccount:
             return NSLocalizedString(@"Account", nil);
 
@@ -417,22 +400,8 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
             
             break;
 
-        } case SPOptionsViewSectionsSustainer: {
-
-            switch (indexPath.row) {
-                case SPOptionsSustainerRowRestore: {
-                    cell.textLabel.text = NSLocalizedString(@"Restore Purchases", @"Manually Restores IAP Purchases");
-                    cell.selectionStyle = UITableViewCellSelectionStyleNone;
-                    break;
-                }
-                default:
-                    break;
-            }
-
-            break;
+        } case SPOptionsViewSectionsAccount: {
 
-        } case SPOptionsViewSectionsAccount:{
-            
             switch (indexPath.row) {
                 case SPOptionsAccountRowDescription: {
                     cell.textLabel.text = NSLocalizedString(@"Username", @"A user's Simplenote account");
@@ -565,10 +534,6 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
             
             break;
 
-        } case SPOptionsViewSectionsSustainer: {
-            //TODO: Remove the sustainer case?
-            break;
-
         } case SPOptionsViewSectionsAccount: {
             
             switch (indexPath.row) {

From d1300a8588d9c6378686a9b31084f0089c9e601b Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Mon, 25 Mar 2024 16:09:25 -0600
Subject: [PATCH 049/547] Removed sustainerUI from tag list view controller

---
 Simplenote/TagListViewController.swift | 48 ++------------------------
 1 file changed, 2 insertions(+), 46 deletions(-)

diff --git a/Simplenote/TagListViewController.swift b/Simplenote/TagListViewController.swift
index dee5f1339..0c880531b 100644
--- a/Simplenote/TagListViewController.swift
+++ b/Simplenote/TagListViewController.swift
@@ -49,7 +49,6 @@ final class TagListViewController: UIViewController {
         super.viewWillAppear(animated)
         startListeningToKeyboardNotifications()
 
-        refreshTableHeaderView()
         reloadTableView()
         startListeningForChanges()
         becomeFirstResponder()
@@ -64,19 +63,6 @@ final class TagListViewController: UIViewController {
 
         resignFirstResponder()
     }
-
-    override func viewSafeAreaInsetsDidChange() {
-        super.viewSafeAreaInsetsDidChange()
-        refreshTableHeaderView()
-    }
-
-    override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
-        super.viewWillTransition(to: size, with: coordinator)
-
-        coordinator.animate { _ in
-            self.refreshTableHeaderView()
-        }
-    }
 }
 
 // MARK: - Configuration
@@ -93,15 +79,6 @@ private extension TagListViewController {
 
         tableView.separatorInsetReference = .fromAutomaticInsets
         tableView.automaticallyAdjustsScrollIndicatorInsets = false
-
-        sustainerHeaderView = {
-            let sustainerView: SustainerView = SustainerView.instantiateFromNib()
-            sustainerView.onPress = { [weak self] in
-                self?.presentSubscriptionAlertIfNeeded()
-            }
-
-            return sustainerView
-        }()
     }
 
     func configureTableHeaderView() {
@@ -126,21 +103,6 @@ private extension TagListViewController {
     }
 }
 
-// MARK: - Action Handlers
-//
-private extension TagListViewController {
-
-    @available(iOS 15.0, *)
-    func presentSubscriptionAlertIfNeeded() {
-        if isActiveSustainer {
-            return
-        }
-
-        let sustainerAlertController = UIAlertController.buildSustainerAlert()
-        present(sustainerAlertController, animated: true)
-    }
-}
-
 // MARK: - Notifications
 //
 private extension TagListViewController {
@@ -150,7 +112,6 @@ private extension TagListViewController {
         nc.addObserver(self, selector: #selector(menuDidChangeVisibility), name: UIMenuController.didHideMenuNotification, object: nil)
         nc.addObserver(self, selector: #selector(tagsSortOrderWasUpdated), name: NSNotification.Name.SPAlphabeticalTagSortPreferenceChanged, object: nil)
         nc.addObserver(self, selector: #selector(themeDidChange), name: NSNotification.Name.SPSimplenoteThemeChanged, object: nil)
-        nc.addObserver(self, selector: #selector(subscriptionStatusDidChange), name: .SPSubscriptionStatusDidChange, object: nil)
     }
 
     func startListeningToKeyboardNotifications() {
@@ -183,13 +144,6 @@ private extension TagListViewController {
     func tagsSortOrderWasUpdated() {
         refreshSortDescriptorsAndPerformFetch()
     }
-
-    @objc
-    func subscriptionStatusDidChange() {
-        DispatchQueue.main.async {
-            self.refreshTableHeaderView()
-        }
-    }
 }
 
 // MARK: - Style
@@ -588,6 +542,8 @@ private extension TagListViewController {
         tagsHeaderView.actionButton.setTitle(title, for: .normal)
     }
 
+    // This method is for refreshing the size of the sustainer view.  We are retiring sustainer so this is no longer needed
+    // but we may want to use the banner again in the future, so leaving this here in case.  Method is not being called anywhere
     func refreshTableHeaderView() {
         guard let sustainerHeaderView else {
             return

From 65c43969e8cd47821bce64e393349253316e66ed Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Mon, 25 Mar 2024 16:12:16 -0600
Subject: [PATCH 050/547] Dropped uialertcontroller + sustainer extension

---
 Simplenote.xcodeproj/project.pbxproj          |  6 +-
 .../SPSettingsViewController+Extensions.swift | 21 ------
 Simplenote/UIAlertController+Sustainer.swift  | 65 -------------------
 3 files changed, 2 insertions(+), 90 deletions(-)
 delete mode 100644 Simplenote/UIAlertController+Sustainer.swift

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index 83c24fd3e..209ff1b1b 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -237,7 +237,6 @@
 		B513F2B62319A8F40021CFA4 /* SPNoteTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = B513F2B52319A8F40021CFA4 /* SPNoteTableViewCell.xib */; };
 		B513F2B82319A9A40021CFA4 /* UITableViewCell+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = B513F2B72319A9A40021CFA4 /* UITableViewCell+Simplenote.swift */; };
 		B513FB2422EF6A4B00B178AC /* SPUserInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = B513FB2322EF6A4B00B178AC /* SPUserInterface.swift */; };
-		B514678D291AC7790062736E /* UIAlertController+Sustainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = B514678C291AC7790062736E /* UIAlertController+Sustainer.swift */; };
 		B5185CFB23427F2F0060145A /* SearchDisplayController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5185CFA23427F2F0060145A /* SearchDisplayController.swift */; };
 		B518899E1E0D5EF800E71B83 /* SPContactsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B518899D1E0D5EF800E71B83 /* SPContactsManager.swift */; };
 		B51889A01E0D5F2200E71B83 /* Contacts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B518899F1E0D5F2200E71B83 /* Contacts.framework */; };
@@ -907,7 +906,6 @@
 		B513F2B52319A8F40021CFA4 /* SPNoteTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = SPNoteTableViewCell.xib; path = Classes/SPNoteTableViewCell.xib; sourceTree = "<group>"; };
 		B513F2B72319A9A40021CFA4 /* UITableViewCell+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "UITableViewCell+Simplenote.swift"; path = "Classes/UITableViewCell+Simplenote.swift"; sourceTree = "<group>"; };
 		B513FB2322EF6A4B00B178AC /* SPUserInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SPUserInterface.swift; path = Classes/SPUserInterface.swift; sourceTree = "<group>"; };
-		B514678C291AC7790062736E /* UIAlertController+Sustainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIAlertController+Sustainer.swift"; sourceTree = "<group>"; };
 		B5185CFA23427F2F0060145A /* SearchDisplayController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SearchDisplayController.swift; path = Classes/SearchDisplayController.swift; sourceTree = "<group>"; };
 		B518899D1E0D5EF800E71B83 /* SPContactsManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SPContactsManager.swift; path = Classes/SPContactsManager.swift; sourceTree = "<group>"; };
 		B518899F1E0D5F2200E71B83 /* Contacts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Contacts.framework; path = System/Library/Frameworks/Contacts.framework; sourceTree = SDKROOT; };
@@ -1883,7 +1881,6 @@
 				B54D9C562909BA2600D0E0EC /* StoreManager.swift */,
 				B549E24A290B3DD70072C3E8 /* StoreConstants.swift */,
 				B54D9C582909CC4400D0E0EC /* StoreProduct.swift */,
-				B514678C291AC7790062736E /* UIAlertController+Sustainer.swift */,
 				B5BADB7C2909D78B00275B29 /* TestConfiguration.storekit */,
 			);
 			name = Store;
@@ -3429,7 +3426,6 @@
 				A66E41E1256D0F44000C6FCB /* RoundedButton.swift in Sources */,
 				F920265B2294661C0061B1DE /* BuildConfiguration.swift in Sources */,
 				B59188C0240059950069EF96 /* NSRegularExpression+Simplenote.swift in Sources */,
-				B514678D291AC7790062736E /* UIAlertController+Sustainer.swift in Sources */,
 				A68ABCA824ABFB5300715EBD /* SPShadowView.swift in Sources */,
 				B56E763622BD565700C5AA47 /* UIView+Simplenote.swift in Sources */,
 				B5E4082D235DE41A00D4E1DF /* UIColor+Studio.swift in Sources */,
@@ -4382,6 +4378,7 @@
 				COPY_PHASE_STRIP = NO;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = PZYM8XX95Q;
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = PZYM8XX95Q;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -4412,6 +4409,7 @@
 				PRODUCT_NAME = Simplenote;
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "Simplenote Development";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Simplenote Development";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG USE_VERBOSE_LOGGING $(SP_IOS_SDK)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Simplenote/Simplenote-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
diff --git a/Simplenote/Classes/SPSettingsViewController+Extensions.swift b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
index be35d7233..50dcc70b4 100644
--- a/Simplenote/Classes/SPSettingsViewController+Extensions.swift
+++ b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
@@ -11,17 +11,6 @@ fileprivate extension SPSettingsViewController {
         SPAppDelegate.shared().simperium.preferencesObject().isActiveSubscriber
     }
 
-    @objc
-    func setupTableHeaderView() {
-        let sustainerView: SustainerView = SustainerView.instantiateFromNib()
-        sustainerView.appliesTopInset = true
-        sustainerView.onPress = { [weak self] in
-            self?.presentSubscriptionAlertIfNeeded()
-        }
-
-        tableView.tableHeaderView = sustainerView
-    }
-
     @objc
     func refreshTableHeaderView() {
         guard let headerView = tableView.tableHeaderView as? SustainerView else {
@@ -35,16 +24,6 @@ fileprivate extension SPSettingsViewController {
         tableView.tableHeaderView = headerView
     }
 
-    @available(iOS 15.0, *)
-    func presentSubscriptionAlertIfNeeded() {
-        if isActiveSustainer {
-            return
-        }
-
-        let sustainerAlertController = UIAlertController.buildSustainerAlert()
-        present(sustainerAlertController, animated: true)
-    }
-
     @objc
     func restorePurchases() {
         if StoreManager.shared.isActiveSubscriber {
diff --git a/Simplenote/UIAlertController+Sustainer.swift b/Simplenote/UIAlertController+Sustainer.swift
deleted file mode 100644
index 9a8bbf904..000000000
--- a/Simplenote/UIAlertController+Sustainer.swift
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-//  UIAlertController+Sustainer.swift
-//  Simplenote
-//
-//  Created by Jorge Leandro Perez on 11/8/22.
-//  Copyright © 2022 Automattic. All rights reserved.
-//
-
-import Foundation
-
-// MARK: - UIAlertController+Sustainer
-//
-@available(iOS 15, *)
-extension UIAlertController {
-
-    static func buildSustainerAlert() -> UIAlertController {
-        let manager = StoreManager.shared
-        let monthlyActionTitle = Localization.monthlyActionTitle(price: manager.displayPrice(for: .sustainerMonthly))
-        let yearlyActionTitle = Localization.yearlyActionTitle(price: manager.displayPrice(for: .sustainerYearly))
-
-        let style: UIAlertController.Style = UIDevice.isPad ? .alert : .actionSheet
-        let alert = UIAlertController(title: Localization.title, message: Localization.message, preferredStyle: style)
-        alert.addActionWithTitle(monthlyActionTitle, style: .default) { _ in
-            SPTracker.trackSustainerMonthlyButtonTapped()
-            manager.purchase(storeProduct: .sustainerMonthly)
-        }
-
-        alert.addActionWithTitle(yearlyActionTitle, style: .default) { _ in
-            SPTracker.trackSustainerYearlyButtonTapped()
-            manager.purchase(storeProduct: .sustainerYearly)
-        }
-
-        alert.addCancelActionWithTitle(Localization.dismissActionTitle) { _ in
-            SPTracker.trackSustainerDismissButtonTapped()
-        }
-
-        return alert
-    }
-}
-
-// MARK: - Localization
-//
-private enum Localization {
-    static let title = NSLocalizedString("Simplenote Sustainer", comment: "Sustainer Alert's Title")
-    static let message = NSLocalizedString("Choose a plan and help unlock future features", comment: "Sustainer Alert's Message")
-    static let dismissActionTitle = NSLocalizedString("Cancel", comment: "Dismisses the alert")
-
-    static func monthlyActionTitle(price: String?) -> String {
-        guard let price else {
-            return NSLocalizedString("Monthly", comment: "Monthly Subscription Option (Used when / if the price fails to load)")
-        }
-
-        let text = NSLocalizedString("%@ per Month", comment: "Monthly Subscription Option. Please preserve the special marker!")
-        return String(format: text, price)
-    }
-
-    static func yearlyActionTitle(price: String?) -> String {
-        guard let price else {
-            return NSLocalizedString("Yearly", comment: "Yearly Subscription Option (Used when / if the price fails to load)")
-        }
-
-        let text = NSLocalizedString("%@ per Year", comment: "Yearly Subscription Option. Please preserve the special marker!")
-        return String(format: text, price)
-    }
-}

From bb686189762038c4fd4041519de417b90e842daf Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Mon, 25 Mar 2024 16:16:45 -0600
Subject: [PATCH 051/547] Renamed SustainerView to BannerView

---
 Simplenote.xcodeproj/project.pbxproj          | 16 ++++++-------
 .../{SustainerView.swift => BannerView.swift} |  6 ++---
 .../{SustainerView.xib => BannerView.xib}     | 24 +++++++++----------
 .../SPSettingsViewController+Extensions.swift |  2 +-
 Simplenote/TagListViewController.swift        | 10 ++++----
 5 files changed, 29 insertions(+), 29 deletions(-)
 rename Simplenote/{SustainerView.swift => BannerView.swift} (96%)
 rename Simplenote/{SustainerView.xib => BannerView.xib} (95%)

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index 209ff1b1b..3de031937 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -410,8 +410,8 @@
 		B5EB1EF61C204EBD0080A1B3 /* SimplenoteShare.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = B5EB1EEC1C204EBD0080A1B3 /* SimplenoteShare.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		B5EB1EFE1C205A800080A1B3 /* Icons.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B5EB1EFD1C205A800080A1B3 /* Icons.xcassets */; };
 		B5EB1EFF1C205A800080A1B3 /* Icons.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B5EB1EFD1C205A800080A1B3 /* Icons.xcassets */; };
-		B5F232B629084336006D8570 /* SustainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F232B529084336006D8570 /* SustainerView.swift */; };
-		B5F232BA29084526006D8570 /* SustainerView.xib in Resources */ = {isa = PBXBuildFile; fileRef = B5F232B929084526006D8570 /* SustainerView.xib */; };
+		B5F232B629084336006D8570 /* BannerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F232B529084336006D8570 /* BannerView.swift */; };
+		B5F232BA29084526006D8570 /* BannerView.xib in Resources */ = {isa = PBXBuildFile; fileRef = B5F232B929084526006D8570 /* BannerView.xib */; };
 		B5F3000223F4502C007A7C59 /* SPSortBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = B5F3000123F4502C007A7C59 /* SPSortBar.xib */; };
 		B5F3FFFF23F44679007A7C59 /* SPSortBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F3FFFE23F44679007A7C59 /* SPSortBar.swift */; };
 		BA02A59226C0AE92005FF36E /* NoteListTable.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA02A59126C0AE92005FF36E /* NoteListTable.swift */; };
@@ -1106,8 +1106,8 @@
 		B5EB1EF11C204EBD0080A1B3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/MainInterface.storyboard; sourceTree = "<group>"; };
 		B5EB1EF31C204EBD0080A1B3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		B5EB1EFD1C205A800080A1B3 /* Icons.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Icons.xcassets; path = ../Icons.xcassets; sourceTree = "<group>"; };
-		B5F232B529084336006D8570 /* SustainerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SustainerView.swift; sourceTree = "<group>"; };
-		B5F232B929084526006D8570 /* SustainerView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SustainerView.xib; sourceTree = "<group>"; };
+		B5F232B529084336006D8570 /* BannerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BannerView.swift; sourceTree = "<group>"; };
+		B5F232B929084526006D8570 /* BannerView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BannerView.xib; sourceTree = "<group>"; };
 		B5F3000123F4502C007A7C59 /* SPSortBar.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = SPSortBar.xib; path = Classes/SPSortBar.xib; sourceTree = "<group>"; };
 		B5F3FFFE23F44679007A7C59 /* SPSortBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SPSortBar.swift; path = Classes/SPSortBar.swift; sourceTree = "<group>"; };
 		BA02A59126C0AE92005FF36E /* NoteListTable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteListTable.swift; sourceTree = "<group>"; };
@@ -2250,8 +2250,8 @@
 		B5F232B429084317006D8570 /* Sustainer */ = {
 			isa = PBXGroup;
 			children = (
-				B5F232B529084336006D8570 /* SustainerView.swift */,
-				B5F232B929084526006D8570 /* SustainerView.xib */,
+				B5F232B529084336006D8570 /* BannerView.swift */,
+				B5F232B929084526006D8570 /* BannerView.xib */,
 			);
 			name = Sustainer;
 			sourceTree = "<group>";
@@ -3063,7 +3063,7 @@
 				A69F861D25408085005140F2 /* NoteInformationViewController.xib in Resources */,
 				BA4499AA25ED8821000C563E /* NoticeView.xib in Resources */,
 				BA113E4D269E860500F3E3B4 /* markdown-light.css in Resources */,
-				B5F232BA29084526006D8570 /* SustainerView.xib in Resources */,
+				B5F232BA29084526006D8570 /* BannerView.xib in Resources */,
 				B513F2B62319A8F40021CFA4 /* SPNoteTableViewCell.xib in Resources */,
 				B5078A001C1F5595009F097A /* markdown-dark.css in Resources */,
 				B502311325129525002C3CDA /* SPDiagnosticsViewController.xib in Resources */,
@@ -3333,7 +3333,7 @@
 				B5B9AB4522EE8AF0001CB0AD /* UIImageName.swift in Sources */,
 				BA2D82C6261522F100A1695B /* PublishNoticePresenter.swift in Sources */,
 				A64DE6E9255D1C9F001D0526 /* ContentSlice.swift in Sources */,
-				B5F232B629084336006D8570 /* SustainerView.swift in Sources */,
+				B5F232B629084336006D8570 /* BannerView.swift in Sources */,
 				B5A6846D23CE84D400398BBC /* NotesListController.swift in Sources */,
 				B52BB74822CFBD540042C162 /* UIActivityViewController+Simplenote.swift in Sources */,
 				B5BA5B1C25520ECF002AAD43 /* UIKeyboardAppearance+Simplenote.swift in Sources */,
diff --git a/Simplenote/SustainerView.swift b/Simplenote/BannerView.swift
similarity index 96%
rename from Simplenote/SustainerView.swift
rename to Simplenote/BannerView.swift
index 4c325a921..67d9d875a 100644
--- a/Simplenote/SustainerView.swift
+++ b/Simplenote/BannerView.swift
@@ -1,9 +1,9 @@
 import Foundation
 import UIKit
 
-// MARK: - SustainerView
+// MARK: - BannerView
 //
-class SustainerView: UIView {
+class BannerView: UIView {
 
     @IBOutlet
     private var backgroundView: UIView!
@@ -62,7 +62,7 @@ class SustainerView: UIView {
 
 // MARK: - Private API(s)
 //
-private extension SustainerView {
+private extension BannerView {
 
     func refreshInterface() {
         let style = isActiveSustainer ? Style.sustainer : Style.notSubscriber
diff --git a/Simplenote/SustainerView.xib b/Simplenote/BannerView.xib
similarity index 95%
rename from Simplenote/SustainerView.xib
rename to Simplenote/BannerView.xib
index f334fcbad..73d929362 100644
--- a/Simplenote/SustainerView.xib
+++ b/Simplenote/BannerView.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -11,7 +11,12 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" id="H3q-Rz-XVn" customClass="SustainerView" customModule="Simplenote" customModuleProvider="target">
+        <tapGestureRecognizer id="4op-51-Dvd">
+            <connections>
+                <action selector="sustainerWasPresssed" destination="H3q-Rz-XVn" id="usw-j5-ej9"/>
+            </connections>
+        </tapGestureRecognizer>
+        <view contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" id="H3q-Rz-XVn" userLabel="BannerView" customClass="BannerView" customModule="Simplenote" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="390" height="72"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
@@ -24,13 +29,13 @@
                     </constraints>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sc5-2f-Alr">
-                    <rect key="frame" x="12" y="0.0" width="366" height="53"/>
+                    <rect key="frame" x="12" y="0.0" width="366" height="19"/>
                     <subviews>
                         <stackView opaque="NO" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" alignment="center" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="IH4-GE-Uvn">
-                            <rect key="frame" x="16" y="12" width="334" height="29"/>
+                            <rect key="frame" x="16" y="12" width="334" height="64"/>
                             <subviews>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="simplenote-logo" translatesAutoresizingMaskIntoConstraints="NO" id="qwE-CN-MTc" userLabel="Logo">
-                                    <rect key="frame" x="0.0" y="1" width="27" height="27"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="27" height="64"/>
                                     <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="27" id="0Cw-8J-qDY"/>
@@ -38,7 +43,7 @@
                                     </constraints>
                                 </imageView>
                                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" translatesAutoresizingMaskIntoConstraints="NO" id="jzQ-ge-KHY">
-                                    <rect key="frame" x="42" y="0.0" width="292" height="29"/>
+                                    <rect key="frame" x="42" y="17.666666666666671" width="292" height="29"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" text="Title?" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xLW-HX-XmH" userLabel="Title">
                                             <rect key="frame" x="0.0" y="0.0" width="34.333333333333336" height="15.666666666666666"/>
@@ -89,11 +94,6 @@
             </connections>
             <point key="canvasLocation" x="87.692307692307693" y="-258.05687203791467"/>
         </view>
-        <tapGestureRecognizer id="4op-51-Dvd">
-            <connections>
-                <action selector="sustainerWasPresssed" destination="H3q-Rz-XVn" id="usw-j5-ej9"/>
-            </connections>
-        </tapGestureRecognizer>
     </objects>
     <resources>
         <image name="simplenote-logo" width="64" height="64"/>
diff --git a/Simplenote/Classes/SPSettingsViewController+Extensions.swift b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
index 50dcc70b4..d1718d92d 100644
--- a/Simplenote/Classes/SPSettingsViewController+Extensions.swift
+++ b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
@@ -13,7 +13,7 @@ fileprivate extension SPSettingsViewController {
 
     @objc
     func refreshTableHeaderView() {
-        guard let headerView = tableView.tableHeaderView as? SustainerView else {
+        guard let headerView = tableView.tableHeaderView as? BannerView else {
             return
         }
 
diff --git a/Simplenote/TagListViewController.swift b/Simplenote/TagListViewController.swift
index 0c880531b..cb3e01e01 100644
--- a/Simplenote/TagListViewController.swift
+++ b/Simplenote/TagListViewController.swift
@@ -18,7 +18,7 @@ final class TagListViewController: UIViewController {
 
     private var renameTag: Tag?
 
-    private var sustainerHeaderView: SustainerView?
+    private var bannerView: BannerView?
     private var isActiveSustainer: Bool {
         SPAppDelegate.shared().simperium.preferencesObject().isActiveSubscriber
     }
@@ -545,7 +545,7 @@ private extension TagListViewController {
     // This method is for refreshing the size of the sustainer view.  We are retiring sustainer so this is no longer needed
     // but we may want to use the banner again in the future, so leaving this here in case.  Method is not being called anywhere
     func refreshTableHeaderView() {
-        guard let sustainerHeaderView else {
+        guard let bannerView else {
             return
         }
 
@@ -554,10 +554,10 @@ private extension TagListViewController {
             return
         }
 
-        sustainerHeaderView.preferredWidth = tableView.frame.width - view.safeAreaInsets.left
-        sustainerHeaderView.adjustSizeForCompressedLayout()
+        bannerView.preferredWidth = tableView.frame.width - view.safeAreaInsets.left
+        bannerView.adjustSizeForCompressedLayout()
 
-        tableView.tableHeaderView = sustainerHeaderView
+        tableView.tableHeaderView = bannerView
     }
 
     func openNoteListForTagName(_ tagName: String?, isTraversing: Bool) {

From 49eaac6a7733bc53a403894c5a53226713b6c0a0 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Mon, 25 Mar 2024 16:24:41 -0600
Subject: [PATCH 052/547] Removed a bunch of sustainer information from banner
 view

---
 Simplenote/BannerView.swift                       | 15 ++++++---------
 Simplenote/BannerView.xib                         |  2 +-
 .../SPSettingsViewController+Extensions.swift     |  1 -
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/Simplenote/BannerView.swift b/Simplenote/BannerView.swift
index 67d9d875a..ec98db8cc 100644
--- a/Simplenote/BannerView.swift
+++ b/Simplenote/BannerView.swift
@@ -29,12 +29,6 @@ class BannerView: UIView {
 
     var onPress: (() -> Void)?
 
-    var isActiveSustainer = false {
-        didSet {
-            refreshInterface()
-        }
-    }
-
     var preferredWidth: CGFloat? {
         didSet {
             guard let preferredWidth else {
@@ -55,7 +49,7 @@ class BannerView: UIView {
     // MARK: - Actions
 
     @IBAction
-    func sustainerWasPresssed() {
+    func bannerWasPresssed() {
         onPress?()
     }
 }
@@ -64,8 +58,10 @@ class BannerView: UIView {
 //
 private extension BannerView {
 
-    func refreshInterface() {
-        let style = isActiveSustainer ? Style.sustainer : Style.notSubscriber
+    func refreshInterface(with style: Style? = nil) {
+        guard let style else {
+            return
+        }
 
         titleLabel.text = style.title
         detailsLabel.text = style.details
@@ -86,6 +82,7 @@ private struct Style {
 }
 
 private extension Style {
+    // Leaving these styles in cause we may want them back someday
     static var sustainer: Style {
         Style(title: NSLocalizedString("You are a Simplenote Sustainer", comment: "Current Sustainer Title"),
               details: NSLocalizedString("Thank you for your continued support", comment: "Current Sustainer Details"),
diff --git a/Simplenote/BannerView.xib b/Simplenote/BannerView.xib
index 73d929362..dc1d2af0e 100644
--- a/Simplenote/BannerView.xib
+++ b/Simplenote/BannerView.xib
@@ -13,7 +13,7 @@
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <tapGestureRecognizer id="4op-51-Dvd">
             <connections>
-                <action selector="sustainerWasPresssed" destination="H3q-Rz-XVn" id="usw-j5-ej9"/>
+                <action selector="bannerWasPresssed" destination="H3q-Rz-XVn" id="Nhw-t0-Xiw"/>
             </connections>
         </tapGestureRecognizer>
         <view contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" id="H3q-Rz-XVn" userLabel="BannerView" customClass="BannerView" customModule="Simplenote" customModuleProvider="target">
diff --git a/Simplenote/Classes/SPSettingsViewController+Extensions.swift b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
index d1718d92d..3563e91cb 100644
--- a/Simplenote/Classes/SPSettingsViewController+Extensions.swift
+++ b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
@@ -17,7 +17,6 @@ fileprivate extension SPSettingsViewController {
             return
         }
 
-        headerView.isActiveSustainer = isActiveSustainer
         headerView.preferredWidth = tableView.frame.width
         headerView.adjustSizeForCompressedLayout()
 

From 2a986f6b1c36f3cca438307c4c4eeeea5af0d68f Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Tue, 26 Mar 2024 13:01:33 -0600
Subject: [PATCH 053/547] put account section rows back in settings

---
 Simplenote/Classes/SPSettingsViewController.m | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Simplenote/Classes/SPSettingsViewController.m b/Simplenote/Classes/SPSettingsViewController.m
index 363ad47a6..694e0ebf3 100644
--- a/Simplenote/Classes/SPSettingsViewController.m
+++ b/Simplenote/Classes/SPSettingsViewController.m
@@ -233,7 +233,11 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
         case SPOptionsViewSectionsDebug: {
             return SPOptionsDebugRowCount;
         }
-            
+
+        case SPOptionsViewSectionsAccount: {
+            return SPOptionsAccountRowCount;
+        }
+
         default:
             break;
     }

From d60e4dbe9f5bcc1d636a2f4916800b30968b6c35 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Tue, 26 Mar 2024 13:11:13 -0600
Subject: [PATCH 054/547] Added basic app icon for simplenote sustainer

---
 Simplenote.xcodeproj/project.pbxproj            |   5 +++++
 ...145-3c0b8d73-fc79-4898-afb9-2c188061bb8a.png | Bin 0 -> 30714 bytes
 .../AppIcon-Sustainer.appiconset/Contents.json  |  14 ++++++++++++++
 Simplenote/Icons.xcassets/Contents.json         |   6 +++---
 4 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/316077145-3c0b8d73-fc79-4898-afb9-2c188061bb8a.png
 create mode 100644 Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/Contents.json

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index 3de031937..55b64266a 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -4368,6 +4368,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Beta";
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = NO;
@@ -4424,6 +4425,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Beta";
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = NO;
@@ -4537,6 +4539,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Beta";
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = NO;
@@ -4733,6 +4736,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = NO;
@@ -4844,6 +4848,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Beta";
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = NO;
diff --git a/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/316077145-3c0b8d73-fc79-4898-afb9-2c188061bb8a.png b/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/316077145-3c0b8d73-fc79-4898-afb9-2c188061bb8a.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1180a775793ad8af364e765a94f8cbaa741528b
GIT binary patch
literal 30714
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

literal 0
HcmV?d00001

diff --git a/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/Contents.json b/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/Contents.json
new file mode 100644
index 000000000..d5647fa4c
--- /dev/null
+++ b/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/Contents.json
@@ -0,0 +1,14 @@
+{
+  "images" : [
+    {
+      "filename" : "316077145-3c0b8d73-fc79-4898-afb9-2c188061bb8a.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Simplenote/Icons.xcassets/Contents.json b/Simplenote/Icons.xcassets/Contents.json
index da4a164c9..73c00596a 100644
--- a/Simplenote/Icons.xcassets/Contents.json
+++ b/Simplenote/Icons.xcassets/Contents.json
@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}

From 27640dfe75fb0fd498abe17bce836042eef4dff5 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Tue, 26 Mar 2024 13:12:14 -0600
Subject: [PATCH 055/547] Added switch to enable sustainer icon

---
 Simplenote/Classes/SPSettingsViewController.m | 67 ++++++++++++++++---
 1 file changed, 58 insertions(+), 9 deletions(-)

diff --git a/Simplenote/Classes/SPSettingsViewController.m b/Simplenote/Classes/SPSettingsViewController.m
index 694e0ebf3..c9dc939ad 100644
--- a/Simplenote/Classes/SPSettingsViewController.m
+++ b/Simplenote/Classes/SPSettingsViewController.m
@@ -9,11 +9,13 @@
 
 NSString *const SPAlphabeticalTagSortPref                           = @"SPAlphabeticalTagSortPref";
 NSString *const SPThemePref                                         = @"SPThemePref";
+NSString *const SPSustainerAppIconName                              = @"AppIcon-Sustainer";
 
 @interface SPSettingsViewController ()
 @property (nonatomic, strong) UISwitch      *condensedNoteListSwitch;
 @property (nonatomic, strong) UISwitch      *alphabeticalTagSortSwitch;
 @property (nonatomic, strong) UISwitch      *biometrySwitch;
+@property (nonatomic, strong) UISwitch      *sustainerIconSwitch;
 @property (nonatomic, strong) UITextField   *pinTimeoutTextField;
 @property (nonatomic, strong) UIPickerView  *pinTimeoutPickerView;
 @property (nonatomic, strong) UIToolbar     *doneToolbar;
@@ -30,18 +32,20 @@ @implementation SPSettingsViewController {
 #define kTagPasscode            5
 #define kTagTimeout             6
 #define kTagTouchID             7
+#define kTagSustainerIcon       8
 
 typedef NS_ENUM(NSInteger, SPOptionsViewSections) {
     SPOptionsViewSectionsNotes          = 0,
     SPOptionsViewSectionsTags           = 1,
     SPOptionsViewSectionsAppearance     = 2,
-    SPOptionsViewSectionsSecurity       = 3,
-    SPOptionsViewSectionsAccount        = 4,
-    SPOptionsViewSectionsDelete         = 5,
-    SPOptionsViewSectionsAbout          = 6,
-    SPOptionsViewSectionsHelp           = 7,
-    SPOptionsViewSectionsDebug          = 8,
-    SPOptionsViewSectionsCount          = 9,
+    SPOptionsViewSectionsSustainer      = 3,
+    SPOptionsViewSectionsSecurity       = 4,
+    SPOptionsViewSectionsAccount        = 5,
+    SPOptionsViewSectionsDelete         = 6,
+    SPOptionsViewSectionsAbout          = 7,
+    SPOptionsViewSectionsHelp           = 8,
+    SPOptionsViewSectionsDebug          = 9,
+    SPOptionsViewSectionsCount          = 10,
 };
 
 typedef NS_ENUM(NSInteger, SPOptionsAccountRow) {
@@ -67,6 +71,12 @@ typedef NS_ENUM(NSInteger, SPOptionsAppearanceRow) {
     SPOptionsAppearanceRowCount         = 1
 };
 
+typedef NS_ENUM(NSInteger, SPOptionsSustainerRow) {
+    SPOptionsAccountSustainerIcon       = 0,
+    SPOptionsAccountSustainerCount      = 1
+};
+
+
 typedef NS_ENUM(NSInteger, SPOptionsSecurityRow) {
     SPOptionsSecurityRowRowPasscode     = 0,
     SPOptionsSecurityRowRowBiometry     = 1,
@@ -142,6 +152,11 @@ - (void)viewDidLoad
                            action:@selector(touchIdSwitchDidChangeValue:)
                  forControlEvents:UIControlEventValueChanged];
 
+    self.sustainerIconSwitch = [UISwitch new];
+    [self.sustainerIconSwitch addTarget:self
+                                 action:@selector(sustainerSwitchDidChangeValue:)
+                       forControlEvents:UIControlEventValueChanged];
+
     self.pinTimeoutPickerView = [UIPickerView new];
     self.pinTimeoutPickerView.delegate = self;
     self.pinTimeoutPickerView.dataSource = self;
@@ -211,7 +226,11 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
         case SPOptionsViewSectionsAppearance: {
             return SPOptionsAppearanceRowCount;
         }
-            
+
+        case SPOptionsViewSectionsSustainer: {
+            return SPOptionsAccountSustainerCount;
+        }
+
         case SPOptionsViewSectionsSecurity: {
             int rowsToRemove = [self isBiometryAvailable] ? 0 : 1;
             int disabledPinLockRows = [self isBiometryAvailable] ? 2 : 1;
@@ -257,6 +276,9 @@ - (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInte
         case SPOptionsViewSectionsAppearance:
             return NSLocalizedString(@"Appearance", nil);
 
+        case SPOptionsViewSectionsSustainer:
+            return NSLocalizedString(@"Sustainer Thank You", nil);
+
         case SPOptionsViewSectionsSecurity:
             return NSLocalizedString(@"Security", nil);
 
@@ -354,7 +376,26 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
             
             break;
         }
-        
+
+        case SPOptionsViewSectionsSustainer: {
+            switch (indexPath.row) {
+                case SPOptionsAccountSustainerIcon: {
+                    cell.textLabel.text = NSLocalizedString(@"Sustainer App Icon", @"Switch app icon");
+                    cell.selectionStyle = UITableViewCellSelectionStyleNone;
+
+                    cell.accessoryView = self.sustainerIconSwitch;
+                    cell.tag = kTagSustainerIcon;
+                    break;
+
+                }
+
+                default:
+                    break;
+            }
+
+            break;
+        }
+
         case SPOptionsViewSectionsSecurity: {
             switch (indexPath.row) {
                 case SPOptionsSecurityRowRowPasscode: {
@@ -700,6 +741,14 @@ - (void)touchIdSwitchDidChangeValue:(UISwitch *)sender
     }
 }
 
+- (void)sustainerSwitchDidChangeValue:(UISwitch *)sender
+{
+    BOOL isOn = [(UISwitch *)sender isOn];
+
+    NSString *iconName = isOn ? SPSustainerAppIconName : nil;
+    [UIApplication.sharedApplication setAlternateIconName:iconName completionHandler:nil];
+}
+
 - (UIAlertController*)pinLockRequiredAlert
 {
     NSString *alertTitleTemplate = NSLocalizedString(@"To enable %1$@, you must have a passcode setup first.",

From de8a8c1b4ba928537f450809becbe00e4ad2cf30 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Tue, 26 Mar 2024 13:46:07 -0600
Subject: [PATCH 056/547] Hide sustainer row if the user isn't a past or
 current sustainer

---
 .../SPSettingsViewController+Extensions.swift | 11 +++++---
 Simplenote/Classes/SPSettingsViewController.m | 26 +++++++++++++++++--
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/Simplenote/Classes/SPSettingsViewController+Extensions.swift b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
index 3563e91cb..7d68f16e3 100644
--- a/Simplenote/Classes/SPSettingsViewController+Extensions.swift
+++ b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
@@ -7,10 +7,6 @@ import UIKit
 // but we may still want to use the banner in the future, so marking these methods fileprivate and have removed their callers
 fileprivate extension SPSettingsViewController {
 
-    private var isActiveSustainer: Bool {
-        SPAppDelegate.shared().simperium.preferencesObject().isActiveSubscriber
-    }
-
     @objc
     func refreshTableHeaderView() {
         guard let headerView = tableView.tableHeaderView as? BannerView else {
@@ -42,6 +38,13 @@ fileprivate extension SPSettingsViewController {
     }
 }
 
+extension SPSettingsViewController {
+    @objc
+    var isActiveSustainer: Bool {
+        SPAppDelegate.shared().simperium.preferencesObject().isActiveSubscriber
+    }
+}
+
 // MARK: - Pin
 //
 extension SPSettingsViewController {
diff --git a/Simplenote/Classes/SPSettingsViewController.m b/Simplenote/Classes/SPSettingsViewController.m
index c9dc939ad..d67e82c85 100644
--- a/Simplenote/Classes/SPSettingsViewController.m
+++ b/Simplenote/Classes/SPSettingsViewController.m
@@ -228,7 +228,7 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
         }
 
         case SPOptionsViewSectionsSustainer: {
-            return SPOptionsAccountSustainerCount;
+            return [self isActiveSustainer] ? SPOptionsAccountSustainerCount : 0;
         }
 
         case SPOptionsViewSectionsSecurity: {
@@ -277,7 +277,10 @@ - (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInte
             return NSLocalizedString(@"Appearance", nil);
 
         case SPOptionsViewSectionsSustainer:
-            return NSLocalizedString(@"Sustainer Thank You", nil);
+            if ([self isActiveSustainer]) {
+                return NSLocalizedString(@"Sustainer Thank You", nil);
+            }
+            break;
 
         case SPOptionsViewSectionsSecurity:
             return NSLocalizedString(@"Security", nil);
@@ -303,6 +306,25 @@ - (NSString *)tableView:(UITableView *)tableView titleForFooterInSection:(NSInte
     return nil;
 }
 
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
+{
+    switch(section) {
+        case SPOptionsViewSectionsSustainer:
+            return CGFLOAT_MIN;
+        default:
+            return UITableViewAutomaticDimension;
+    }
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
+{
+    switch(section) {
+        case SPOptionsViewSectionsSustainer:
+            return CGFLOAT_MIN;
+        default:
+            return UITableViewAutomaticDimension;
+    }
+}
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {

From f50dae38458ad7ab275e7a22350b164f3aec6417 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Tue, 26 Mar 2024 14:07:07 -0600
Subject: [PATCH 057/547] Fix spacing issue for when sustainer is not visible

---
 Simplenote/Classes/SPSettingsViewController.m | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Simplenote/Classes/SPSettingsViewController.m b/Simplenote/Classes/SPSettingsViewController.m
index d67e82c85..f0a0eb165 100644
--- a/Simplenote/Classes/SPSettingsViewController.m
+++ b/Simplenote/Classes/SPSettingsViewController.m
@@ -10,6 +10,7 @@
 NSString *const SPAlphabeticalTagSortPref                           = @"SPAlphabeticalTagSortPref";
 NSString *const SPThemePref                                         = @"SPThemePref";
 NSString *const SPSustainerAppIconName                              = @"AppIcon-Sustainer";
+CGFloat  const SPSettingsTableViewSpacing                           = 25.0;
 
 @interface SPSettingsViewController ()
 @property (nonatomic, strong) UISwitch      *condensedNoteListSwitch;
@@ -186,6 +187,9 @@ - (void)viewDidLoad
                                                object:nil];
 
     [self refreshThemeStyles];
+
+    self.tableView.sectionHeaderHeight = CGFLOAT_MIN;
+    self.tableView.sectionFooterHeight = CGFLOAT_MIN;
 }
 
 - (void)viewWillAppear:(BOOL)animated
@@ -310,9 +314,9 @@ - (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSIntege
 {
     switch(section) {
         case SPOptionsViewSectionsSustainer:
-            return CGFLOAT_MIN;
+            return [self isActiveSustainer] ? SPSettingsTableViewSpacing : CGFLOAT_MIN;
         default:
-            return UITableViewAutomaticDimension;
+            return SPSettingsTableViewSpacing;
     }
 }
 
@@ -320,9 +324,9 @@ - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSIntege
 {
     switch(section) {
         case SPOptionsViewSectionsSustainer:
-            return CGFLOAT_MIN;
+            return [self isActiveSustainer] ? SPSettingsTableViewSpacing : CGFLOAT_MIN;
         default:
-            return UITableViewAutomaticDimension;
+            return SPSettingsTableViewSpacing;
     }
 }
 

From 37d4e06d8753802735f6cc655da1949248e27927 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Tue, 26 Mar 2024 14:29:20 -0600
Subject: [PATCH 058/547] Actually fix the sizing for the settings vc header
 and footer

---
 Simplenote/Classes/SPSettingsViewController.m | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/Simplenote/Classes/SPSettingsViewController.m b/Simplenote/Classes/SPSettingsViewController.m
index f0a0eb165..b4793d4f7 100644
--- a/Simplenote/Classes/SPSettingsViewController.m
+++ b/Simplenote/Classes/SPSettingsViewController.m
@@ -188,8 +188,8 @@ - (void)viewDidLoad
 
     [self refreshThemeStyles];
 
-    self.tableView.sectionHeaderHeight = CGFLOAT_MIN;
-    self.tableView.sectionFooterHeight = CGFLOAT_MIN;
+//    self.tableView.sectionHeaderHeight = CGFLOAT_MIN;
+//    self.tableView.sectionFooterHeight = CGFLOAT_MIN;
 }
 
 - (void)viewWillAppear:(BOOL)animated
@@ -314,9 +314,9 @@ - (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSIntege
 {
     switch(section) {
         case SPOptionsViewSectionsSustainer:
-            return [self isActiveSustainer] ? SPSettingsTableViewSpacing : CGFLOAT_MIN;
+            return [self isActiveSustainer] ? UITableViewAutomaticDimension : CGFLOAT_MIN;
         default:
-            return SPSettingsTableViewSpacing;
+            return UITableViewAutomaticDimension;
     }
 }
 
@@ -324,12 +324,22 @@ - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSIntege
 {
     switch(section) {
         case SPOptionsViewSectionsSustainer:
-            return [self isActiveSustainer] ? SPSettingsTableViewSpacing : CGFLOAT_MIN;
+            return [self isActiveSustainer] ? UITableViewAutomaticDimension : CGFLOAT_MIN;
         default:
-            return SPSettingsTableViewSpacing;
+            return UITableViewAutomaticDimension;
     }
 }
 
+- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
+{
+    return nil;
+}
+
+- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section
+{
+    return nil;
+}
+
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
     UITableViewCell *cell = [super tableView:tableView cellForRowAtIndexPath:indexPath];

From d874afadf7a0c8c66e03c017fd068c0cf24c462f Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Tue, 26 Mar 2024 14:36:21 -0600
Subject: [PATCH 059/547] Added all sizes for sustainer icon

---
 .../Contents.json                             | 113 +++++++++++++++++-
 ...61bb8a.png => SN-Sustainer @1024x1024.png} | Bin
 .../SN-Sustainer @114x114.png                 | Bin 0 -> 8425 bytes
 .../SN-Sustainer @120x120 1.png               | Bin 0 -> 8623 bytes
 .../SN-Sustainer @120x120.png                 | Bin 0 -> 8623 bytes
 .../SN-Sustainer @128x128 1.png               | Bin 0 -> 8988 bytes
 .../SN-Sustainer @128x128.png                 | Bin 0 -> 8988 bytes
 .../SN-Sustainer @136x136.png                 | Bin 0 -> 9295 bytes
 .../SN-Sustainer @152x152.png                 | Bin 0 -> 9132 bytes
 .../SN-Sustainer @167x167.png                 | Bin 0 -> 8924 bytes
 .../SN-Sustainer @180x180.png                 | Bin 0 -> 10788 bytes
 .../SN-Sustainer @192x192.png                 | Bin 0 -> 10118 bytes
 .../SN-Sustainer @40x40.png                   | Bin 0 -> 4470 bytes
 .../SN-Sustainer @58x58.png                   | Bin 0 -> 5458 bytes
 .../SN-Sustainer @60x60.png                   | Bin 0 -> 5429 bytes
 .../SN-Sustainer @76x76.png                   | Bin 0 -> 6310 bytes
 .../SN-Sustainer @80x80.png                   | Bin 0 -> 6435 bytes
 .../SN-Sustainer @87x87.png                   | Bin 0 -> 6670 bytes
 18 files changed, 112 insertions(+), 1 deletion(-)
 rename Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/{316077145-3c0b8d73-fc79-4898-afb9-2c188061bb8a.png => SN-Sustainer @1024x1024.png} (100%)
 create mode 100644 Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @114x114.png
 create mode 100644 Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @120x120 1.png
 create mode 100644 Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @120x120.png
 create mode 100644 Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @128x128 1.png
 create mode 100644 Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @128x128.png
 create mode 100644 Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @136x136.png
 create mode 100644 Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @152x152.png
 create mode 100644 Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @167x167.png
 create mode 100644 Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @180x180.png
 create mode 100644 Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @192x192.png
 create mode 100644 Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @40x40.png
 create mode 100644 Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @58x58.png
 create mode 100644 Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @60x60.png
 create mode 100644 Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @76x76.png
 create mode 100644 Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @80x80.png
 create mode 100644 Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @87x87.png

diff --git a/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/Contents.json b/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/Contents.json
index d5647fa4c..2bd75b76d 100644
--- a/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/Contents.json
+++ b/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/Contents.json
@@ -1,10 +1,121 @@
 {
   "images" : [
     {
-      "filename" : "316077145-3c0b8d73-fc79-4898-afb9-2c188061bb8a.png",
+      "filename" : "SN-Sustainer @40x40.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "SN-Sustainer @60x60.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "SN-Sustainer @58x58.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "SN-Sustainer @87x87.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "SN-Sustainer @76x76.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "38x38"
+    },
+    {
+      "filename" : "SN-Sustainer @114x114.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "38x38"
+    },
+    {
+      "filename" : "SN-Sustainer @80x80.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "SN-Sustainer @120x120.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "SN-Sustainer @120x120 1.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "SN-Sustainer @180x180.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "SN-Sustainer @128x128 1.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "64x64"
+    },
+    {
+      "filename" : "SN-Sustainer @192x192.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "64x64"
+    },
+    {
+      "filename" : "SN-Sustainer @136x136.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "68x68"
+    },
+    {
+      "filename" : "SN-Sustainer @152x152.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "SN-Sustainer @167x167.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "filename" : "SN-Sustainer @1024x1024.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
+    },
+    {
+      "filename" : "SN-Sustainer @128x128.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "128x128"
     }
   ],
   "info" : {
diff --git a/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/316077145-3c0b8d73-fc79-4898-afb9-2c188061bb8a.png b/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @1024x1024.png
similarity index 100%
rename from Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/316077145-3c0b8d73-fc79-4898-afb9-2c188061bb8a.png
rename to Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @1024x1024.png
diff --git a/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @114x114.png b/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @114x114.png
new file mode 100644
index 0000000000000000000000000000000000000000..df06a3cf72d33e071002cef006167ab618a5067d
GIT binary patch
literal 8425
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

literal 0
HcmV?d00001

diff --git a/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @120x120 1.png b/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @120x120 1.png
new file mode 100644
index 0000000000000000000000000000000000000000..51db22c3c06c3d8709d0e43e525e91d4cf774e02
GIT binary patch
literal 8623
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

literal 0
HcmV?d00001

diff --git a/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @120x120.png b/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @120x120.png
new file mode 100644
index 0000000000000000000000000000000000000000..51db22c3c06c3d8709d0e43e525e91d4cf774e02
GIT binary patch
literal 8623
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

literal 0
HcmV?d00001

diff --git a/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @128x128 1.png b/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @128x128 1.png
new file mode 100644
index 0000000000000000000000000000000000000000..40ff25e9028690e7ec7aa14147569c79e55aafef
GIT binary patch
literal 8988
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

literal 0
HcmV?d00001

diff --git a/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @128x128.png b/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @128x128.png
new file mode 100644
index 0000000000000000000000000000000000000000..40ff25e9028690e7ec7aa14147569c79e55aafef
GIT binary patch
literal 8988
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

literal 0
HcmV?d00001

diff --git a/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @136x136.png b/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @136x136.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1c62d36064bdce5c37257782cf219ef51617cda
GIT binary patch
literal 9295
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

literal 0
HcmV?d00001

diff --git a/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @152x152.png b/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @152x152.png
new file mode 100644
index 0000000000000000000000000000000000000000..8609a275896bff21780e9dd7edc07815534b72cf
GIT binary patch
literal 9132
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

literal 0
HcmV?d00001

diff --git a/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @167x167.png b/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @167x167.png
new file mode 100644
index 0000000000000000000000000000000000000000..b604e577c48448167b4f12acfc149518ed08bf0f
GIT binary patch
literal 8924
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

literal 0
HcmV?d00001

diff --git a/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @180x180.png b/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @180x180.png
new file mode 100644
index 0000000000000000000000000000000000000000..364479440e54c3210e719c72f0b36aec810fba18
GIT binary patch
literal 10788
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
P&x~qHT8hQ;mO=juxaS?g

literal 0
HcmV?d00001

diff --git a/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @192x192.png b/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @192x192.png
new file mode 100644
index 0000000000000000000000000000000000000000..c291d51095ac160badd3b987d98198962c138a96
GIT binary patch
literal 10118
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
NO*K8$5@qX<{{_bllaT-b

literal 0
HcmV?d00001

diff --git a/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @40x40.png b/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @40x40.png
new file mode 100644
index 0000000000000000000000000000000000000000..4bce01ecaa1f82f1971d1a792087727f453025a5
GIT binary patch
literal 4470
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
P-vgq+5Wyk;&$IpuLl^so

literal 0
HcmV?d00001

diff --git a/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @58x58.png b/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @58x58.png
new file mode 100644
index 0000000000000000000000000000000000000000..c10f1754826d20e3104d164afb11bf05e8326ba3
GIT binary patch
literal 5458
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

literal 0
HcmV?d00001

diff --git a/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @60x60.png b/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @60x60.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed3dc6465375e66d79862c5789f687ebf842f31b
GIT binary patch
literal 5429
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
Jmer0!{|3Gu_sswR

literal 0
HcmV?d00001

diff --git a/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @76x76.png b/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @76x76.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c8e76db866fc7a8d8af6141eacf5626181cdeb9
GIT binary patch
literal 6310
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
J7iif8{s&khq^tk{

literal 0
HcmV?d00001

diff --git a/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @80x80.png b/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @80x80.png
new file mode 100644
index 0000000000000000000000000000000000000000..dbb03876644ab9ea4efbd784ab56c7ebf6bccc0c
GIT binary patch
literal 6435
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

literal 0
HcmV?d00001

diff --git a/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @87x87.png b/Simplenote/Icons.xcassets/AppIcon-Sustainer.appiconset/SN-Sustainer @87x87.png
new file mode 100644
index 0000000000000000000000000000000000000000..e56ce06546e51ab84dbc912c3f06436f8c2b7807
GIT binary patch
literal 6670
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
Rhx4Bf0Bd1qUS{fj=s)8KAzJ_d

literal 0
HcmV?d00001


From f857d6d151c7c9b317e898a1c94d3ce602d31edb Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Tue, 26 Mar 2024 15:01:24 -0600
Subject: [PATCH 060/547] Persist sustainer app icon setting

---
 .../Classes/SPSettingsViewController+Extensions.swift |  9 +++++++++
 Simplenote/Classes/SPSettingsViewController.h         |  1 +
 Simplenote/Classes/SPSettingsViewController.m         | 11 ++---------
 Simplenote/Classes/UserDefaults+Simplenote.swift      |  1 +
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Simplenote/Classes/SPSettingsViewController+Extensions.swift b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
index 7d68f16e3..1b9fb5eb3 100644
--- a/Simplenote/Classes/SPSettingsViewController+Extensions.swift
+++ b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
@@ -43,6 +43,15 @@ extension SPSettingsViewController {
     var isActiveSustainer: Bool {
         SPAppDelegate.shared().simperium.preferencesObject().isActiveSubscriber
     }
+
+    @objc
+    func sustainerSwitchDidChangeValue(sender: UISwitch) {
+        let isOn = sender.isOn
+
+        let iconName = isOn ? SPSustainerAppIconName : nil
+        UserDefaults.standard.set(isOn, forKey: .useSustainerIcon)
+        UIApplication.shared.setAlternateIconName(iconName)
+    }
 }
 
 // MARK: - Pin
diff --git a/Simplenote/Classes/SPSettingsViewController.h b/Simplenote/Classes/SPSettingsViewController.h
index f923770be..fcad4f121 100644
--- a/Simplenote/Classes/SPSettingsViewController.h
+++ b/Simplenote/Classes/SPSettingsViewController.h
@@ -11,3 +11,4 @@
 @end
 
 extern NSString *const SPAlphabeticalTagSortPref;
+extern NSString *const SPSustainerAppIconName;
diff --git a/Simplenote/Classes/SPSettingsViewController.m b/Simplenote/Classes/SPSettingsViewController.m
index b4793d4f7..92c52b0c7 100644
--- a/Simplenote/Classes/SPSettingsViewController.m
+++ b/Simplenote/Classes/SPSettingsViewController.m
@@ -155,8 +155,9 @@ - (void)viewDidLoad
 
     self.sustainerIconSwitch = [UISwitch new];
     [self.sustainerIconSwitch addTarget:self
-                                 action:@selector(sustainerSwitchDidChangeValue:)
+                                 action:@selector(sustainerSwitchDidChangeValueWithSender:)
                        forControlEvents:UIControlEventValueChanged];
+    [self.sustainerIconSwitch setOn: [NSUserDefaults.standardUserDefaults boolForKey:@"useSustainerIcon"]];
 
     self.pinTimeoutPickerView = [UIPickerView new];
     self.pinTimeoutPickerView.delegate = self;
@@ -777,14 +778,6 @@ - (void)touchIdSwitchDidChangeValue:(UISwitch *)sender
     }
 }
 
-- (void)sustainerSwitchDidChangeValue:(UISwitch *)sender
-{
-    BOOL isOn = [(UISwitch *)sender isOn];
-
-    NSString *iconName = isOn ? SPSustainerAppIconName : nil;
-    [UIApplication.sharedApplication setAlternateIconName:iconName completionHandler:nil];
-}
-
 - (UIAlertController*)pinLockRequiredAlert
 {
     NSString *alertTitleTemplate = NSLocalizedString(@"To enable %1$@, you must have a passcode setup first.",
diff --git a/Simplenote/Classes/UserDefaults+Simplenote.swift b/Simplenote/Classes/UserDefaults+Simplenote.swift
index 8867d4ad8..8590292f2 100644
--- a/Simplenote/Classes/UserDefaults+Simplenote.swift
+++ b/Simplenote/Classes/UserDefaults+Simplenote.swift
@@ -15,6 +15,7 @@ extension UserDefaults {
         case wordPressSessionKey = "SPAuthSessionKey"
         case useBiometryInsteadOfPin = "SimplenoteUseTouchID"
         case accountIsLoggedIn
+        case useSustainerIcon
     }
 }
 

From 90009d833ce01300d8f8ae6d32d9b5283d3c6989 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Wed, 27 Mar 2024 10:51:22 -0600
Subject: [PATCH 061/547] Moved sustainer app icon row into the Appearance
 settings section

---
 Simplenote/Classes/SPSettingsViewController.m | 78 +++----------------
 1 file changed, 11 insertions(+), 67 deletions(-)

diff --git a/Simplenote/Classes/SPSettingsViewController.m b/Simplenote/Classes/SPSettingsViewController.m
index 92c52b0c7..e3c71fdfd 100644
--- a/Simplenote/Classes/SPSettingsViewController.m
+++ b/Simplenote/Classes/SPSettingsViewController.m
@@ -39,14 +39,13 @@ typedef NS_ENUM(NSInteger, SPOptionsViewSections) {
     SPOptionsViewSectionsNotes          = 0,
     SPOptionsViewSectionsTags           = 1,
     SPOptionsViewSectionsAppearance     = 2,
-    SPOptionsViewSectionsSustainer      = 3,
-    SPOptionsViewSectionsSecurity       = 4,
-    SPOptionsViewSectionsAccount        = 5,
-    SPOptionsViewSectionsDelete         = 6,
-    SPOptionsViewSectionsAbout          = 7,
-    SPOptionsViewSectionsHelp           = 8,
-    SPOptionsViewSectionsDebug          = 9,
-    SPOptionsViewSectionsCount          = 10,
+    SPOptionsViewSectionsSecurity       = 3,
+    SPOptionsViewSectionsAccount        = 4,
+    SPOptionsViewSectionsDelete         = 5,
+    SPOptionsViewSectionsAbout          = 6,
+    SPOptionsViewSectionsHelp           = 7,
+    SPOptionsViewSectionsDebug          = 8,
+    SPOptionsViewSectionsCount          = 9,
 };
 
 typedef NS_ENUM(NSInteger, SPOptionsAccountRow) {
@@ -69,15 +68,10 @@ typedef NS_ENUM(NSInteger, SPOptionsTagsRow) {
 
 typedef NS_ENUM(NSInteger, SPOptionsAppearanceRow) {
     SPOptionsPreferencesRowTheme        = 0,
-    SPOptionsAppearanceRowCount         = 1
+    SPOptionsAccountSustainerIcon       = 1,
+    SPOptionsAppearanceRowCount         = 2
 };
 
-typedef NS_ENUM(NSInteger, SPOptionsSustainerRow) {
-    SPOptionsAccountSustainerIcon       = 0,
-    SPOptionsAccountSustainerCount      = 1
-};
-
-
 typedef NS_ENUM(NSInteger, SPOptionsSecurityRow) {
     SPOptionsSecurityRowRowPasscode     = 0,
     SPOptionsSecurityRowRowBiometry     = 1,
@@ -229,11 +223,7 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
         }
             
         case SPOptionsViewSectionsAppearance: {
-            return SPOptionsAppearanceRowCount;
-        }
-
-        case SPOptionsViewSectionsSustainer: {
-            return [self isActiveSustainer] ? SPOptionsAccountSustainerCount : 0;
+            return [self isActiveSustainer] ? SPOptionsAppearanceRowCount : SPOptionsAppearanceRowCount - 1;
         }
 
         case SPOptionsViewSectionsSecurity: {
@@ -281,12 +271,6 @@ - (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInte
         case SPOptionsViewSectionsAppearance:
             return NSLocalizedString(@"Appearance", nil);
 
-        case SPOptionsViewSectionsSustainer:
-            if ([self isActiveSustainer]) {
-                return NSLocalizedString(@"Sustainer Thank You", nil);
-            }
-            break;
-
         case SPOptionsViewSectionsSecurity:
             return NSLocalizedString(@"Security", nil);
 
@@ -311,36 +295,6 @@ - (NSString *)tableView:(UITableView *)tableView titleForFooterInSection:(NSInte
     return nil;
 }
 
-- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
-{
-    switch(section) {
-        case SPOptionsViewSectionsSustainer:
-            return [self isActiveSustainer] ? UITableViewAutomaticDimension : CGFLOAT_MIN;
-        default:
-            return UITableViewAutomaticDimension;
-    }
-}
-
-- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
-{
-    switch(section) {
-        case SPOptionsViewSectionsSustainer:
-            return [self isActiveSustainer] ? UITableViewAutomaticDimension : CGFLOAT_MIN;
-        default:
-            return UITableViewAutomaticDimension;
-    }
-}
-
-- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
-{
-    return nil;
-}
-
-- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section
-{
-    return nil;
-}
-
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
     UITableViewCell *cell = [super tableView:tableView cellForRowAtIndexPath:indexPath];
@@ -406,16 +360,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
                     cell.tag = kTagTheme;
                     break;
                 }
-                    
-                default:
-                    break;
-            }
-            
-            break;
-        }
 
-        case SPOptionsViewSectionsSustainer: {
-            switch (indexPath.row) {
                 case SPOptionsAccountSustainerIcon: {
                     cell.textLabel.text = NSLocalizedString(@"Sustainer App Icon", @"Switch app icon");
                     cell.selectionStyle = UITableViewCellSelectionStyleNone;
@@ -423,13 +368,12 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
                     cell.accessoryView = self.sustainerIconSwitch;
                     cell.tag = kTagSustainerIcon;
                     break;
-
                 }
 
                 default:
                     break;
             }
-
+            
             break;
         }
 

From e4cb5b19533adab8582dd5896800832d13996ed0 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Wed, 27 Mar 2024 10:53:00 -0600
Subject: [PATCH 062/547] Removed some unneeded commented out code

---
 Simplenote/Classes/SPSettingsViewController.m | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Simplenote/Classes/SPSettingsViewController.m b/Simplenote/Classes/SPSettingsViewController.m
index e3c71fdfd..170227b68 100644
--- a/Simplenote/Classes/SPSettingsViewController.m
+++ b/Simplenote/Classes/SPSettingsViewController.m
@@ -182,9 +182,6 @@ - (void)viewDidLoad
                                                object:nil];
 
     [self refreshThemeStyles];
-
-//    self.tableView.sectionHeaderHeight = CGFLOAT_MIN;
-//    self.tableView.sectionFooterHeight = CGFLOAT_MIN;
 }
 
 - (void)viewWillAppear:(BOOL)animated

From b067188efd42b12c9fb24f413fbb50ad7c61b304 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Wed, 27 Mar 2024 10:53:55 -0600
Subject: [PATCH 063/547] Dropped unused row size constant

---
 Simplenote/Classes/SPSettingsViewController.m | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Simplenote/Classes/SPSettingsViewController.m b/Simplenote/Classes/SPSettingsViewController.m
index 170227b68..45c354625 100644
--- a/Simplenote/Classes/SPSettingsViewController.m
+++ b/Simplenote/Classes/SPSettingsViewController.m
@@ -10,7 +10,6 @@
 NSString *const SPAlphabeticalTagSortPref                           = @"SPAlphabeticalTagSortPref";
 NSString *const SPThemePref                                         = @"SPThemePref";
 NSString *const SPSustainerAppIconName                              = @"AppIcon-Sustainer";
-CGFloat  const SPSettingsTableViewSpacing                           = 25.0;
 
 @interface SPSettingsViewController ()
 @property (nonatomic, strong) UISwitch      *condensedNoteListSwitch;

From 13c911f3f562f9856566bee20a6328d69b0fbc66 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Wed, 27 Mar 2024 13:20:33 -0600
Subject: [PATCH 064/547] Make sure that updating the subscriptions doesnt
 remove sustainer status

---
 Simplenote/StoreManager.swift | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/Simplenote/StoreManager.swift b/Simplenote/StoreManager.swift
index 3ba92acc3..e62c3d935 100644
--- a/Simplenote/StoreManager.swift
+++ b/Simplenote/StoreManager.swift
@@ -17,7 +17,6 @@ enum StoreError: Error {
 
 // MARK: - StoreManager
 //
-@available(iOS 15, *)
 class StoreManager {
 
     // MARK: - Static
@@ -122,7 +121,6 @@ class StoreManager {
 
 // MARK: - Private API(s)
 //
-@available(iOS 15, *)
 private extension StoreManager {
 
     func listenForTransactions() -> Task<Void, Error> {
@@ -211,7 +209,6 @@ private extension StoreManager {
 
 // MARK: - Private Helpers
 //
-@available(iOS 15, *)
 private extension StoreManager {
 
     func buildStoreProductMap(products: [Product]) -> [StoreProduct: Product] {
@@ -242,7 +239,6 @@ private extension StoreManager {
 
 // MARK: - Simperium Kung Fu
 //
-@available(iOS 15, *)
 private extension StoreManager {
 
     func refreshSimperiumPreferences(status: SubscriptionStatus?) {
@@ -263,10 +259,6 @@ private extension StoreManager {
             preferences.subscription_level = subscriptionLevel(from: status)
             preferences.subscription_date = subscriptionDate(from: status)
             preferences.subscription_platform = StoreConstants.platform
-        } else {
-            preferences.subscription_date = nil
-            preferences.subscription_level = nil
-            preferences.subscription_platform = nil
         }
 
         simperium.save()
@@ -300,7 +292,6 @@ private extension StoreManager {
 
 // MARK: - SubscriptionStatus Helpers
 //
-@available(iOS 15, *)
 private extension Product.SubscriptionInfo.Status {
 
     var isActive: Bool {

From 9b417c9c783308799b16a22758785301fd4efa65 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Mon, 8 Apr 2024 15:19:40 -0600
Subject: [PATCH 065/547] Added was_sustainer value to preferences CD model

---
 Simplenote.xcodeproj/project.pbxproj          |  2 +
 Simplenote/Preferences.h                      |  2 +
 Simplenote/Preferences.m                      |  2 +
 .../Simplenote 7.xcdatamodel/contents         | 75 +++++++++++++++++++
 4 files changed, 81 insertions(+)
 create mode 100644 Simplenote/Simplenote.xcdatamodeld/Simplenote 7.xcdatamodel/contents

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index 55b64266a..baa8eacea 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -1121,6 +1121,7 @@
 		BA122DC5265EF90C003D3BC5 /* NewNoteWidgetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewNoteWidgetView.swift; sourceTree = "<group>"; };
 		BA122DC9265F2E2D003D3BC5 /* UIColorSimplenoteTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIColorSimplenoteTests.swift; sourceTree = "<group>"; };
 		BA12B06C26B0D0150026F31D /* SPManagedObject+Widget.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "SPManagedObject+Widget.swift"; sourceTree = "<group>"; };
+		BA16C6A82BC4968400C9079F /* Simplenote 7.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Simplenote 7.xcdatamodel"; sourceTree = "<group>"; };
 		BA18532726488DBC00D9A347 /* SignupRemoteTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignupRemoteTests.swift; sourceTree = "<group>"; };
 		BA2D82C5261522F100A1695B /* PublishNoticePresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishNoticePresenter.swift; sourceTree = "<group>"; };
 		BA32A90E26B7469F00727247 /* WidgetError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetError.swift; sourceTree = "<group>"; };
@@ -6183,6 +6184,7 @@
 		467D9C5C1788A4FB00785EF3 /* Simplenote.xcdatamodeld */ = {
 			isa = XCVersionGroup;
 			children = (
+				BA16C6A82BC4968400C9079F /* Simplenote 7.xcdatamodel */,
 				B54D9C542909B21700D0E0EC /* Simplenote 6.xcdatamodel */,
 				B5526335238881EE009AB3B2 /* Simplenote 5.xcdatamodel */,
 				B594E60C21508170001577EE /* Simplenote 4.xcdatamodel */,
diff --git a/Simplenote/Preferences.h b/Simplenote/Preferences.h
index d6e1aae61..654ced021 100644
--- a/Simplenote/Preferences.h
+++ b/Simplenote/Preferences.h
@@ -10,4 +10,6 @@
 @property (nullable, nonatomic,   copy) NSString            *subscription_level;
 @property (nullable, nonatomic,   copy) NSString            *subscription_platform;
 
+@property (nullable, nonatomic,   copy) NSNumber            *was_sustainer;
+
 @end
diff --git a/Simplenote/Preferences.m b/Simplenote/Preferences.m
index 022f58cd6..24f52e968 100644
--- a/Simplenote/Preferences.m
+++ b/Simplenote/Preferences.m
@@ -16,6 +16,8 @@ @implementation Preferences
 @dynamic subscription_level;
 @dynamic subscription_platform;
 
+@dynamic was_sustainer;
+
 
 - (void) didChangeValueForKey:(NSString *)key
 {
diff --git a/Simplenote/Simplenote.xcdatamodeld/Simplenote 7.xcdatamodel/contents b/Simplenote/Simplenote.xcdatamodeld/Simplenote 7.xcdatamodel/contents
new file mode 100644
index 000000000..bbe96025d
--- /dev/null
+++ b/Simplenote/Simplenote.xcdatamodeld/Simplenote 7.xcdatamodel/contents	
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22757" systemVersion="23E214" minimumToolsVersion="Xcode 7.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
+    <entity name="Note" representedClassName="Note" parentEntity="SPManagedObject" syncable="YES">
+        <attribute name="content" attributeType="String" syncable="YES"/>
+        <attribute name="creationDate" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="deleted" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="lastPosition" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" syncable="YES">
+            <userInfo>
+                <entry key="spDisableSync" value="value"/>
+            </userInfo>
+        </attribute>
+        <attribute name="modificationDate" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="noteSynced" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES">
+            <userInfo>
+                <entry key="spDisableSync" value="value"/>
+            </userInfo>
+        </attribute>
+        <attribute name="owner" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="pinned" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO" syncable="YES">
+            <userInfo>
+                <entry key="spDisableSync" value="value"/>
+            </userInfo>
+        </attribute>
+        <attribute name="publishURL" attributeType="String" syncable="YES"/>
+        <attribute name="remoteId" optional="YES" attributeType="String" syncable="YES">
+            <userInfo>
+                <entry key="spDisableSync" value="value"/>
+            </userInfo>
+        </attribute>
+        <attribute name="shareURL" attributeType="String" syncable="YES"/>
+        <attribute name="systemTags" optional="YES" attributeType="String" syncable="YES">
+            <userInfo>
+                <entry key="spOverride" value="jsonlist"/>
+            </userInfo>
+        </attribute>
+        <attribute name="tags" optional="YES" attributeType="String" syncable="YES">
+            <userInfo>
+                <entry key="spOverride" value="jsonlist"/>
+            </userInfo>
+        </attribute>
+    </entity>
+    <entity name="Preferences" representedClassName="Preferences" syncable="YES">
+        <attribute name="analytics_enabled" optional="YES" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="ghostData" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="recent_searches" optional="YES" attributeType="Transformable" valueTransformerName="" syncable="YES"/>
+        <attribute name="simperiumKey" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="subscription_date" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="subscription_level" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="subscription_platform" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="was_sustainer" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO" syncable="YES"/>
+    </entity>
+    <entity name="Settings" representedClassName="Settings" syncable="YES">
+        <attribute name="decline_skip_versions" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="dislike_skip_versions" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="ghostData" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="like_skip_versions" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="minimum_events" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="minimum_interval_days" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="ratings_disabled" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="simperiumKey" optional="YES" attributeType="String" syncable="YES"/>
+    </entity>
+    <entity name="SPManagedObject" representedClassName="SPManagedObject" isAbstract="YES" syncable="YES">
+        <attribute name="ghostData" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="simperiumKey" optional="YES" attributeType="String" syncable="YES"/>
+    </entity>
+    <entity name="Tag" representedClassName="Tag" parentEntity="SPManagedObject" syncable="YES">
+        <attribute name="index" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="share" optional="YES" attributeType="String" syncable="YES">
+            <userInfo>
+                <entry key="spOverride" value="jsonlist"/>
+            </userInfo>
+        </attribute>
+    </entity>
+</model>
\ No newline at end of file

From 65041400f99f6b8fc98026a00691a7b1a83a2de7 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Mon, 8 Apr 2024 15:22:54 -0600
Subject: [PATCH 066/547] Added migration to force update simperium preferences

---
 Simplenote/Classes/Simperium+Simplenote.swift  |  1 +
 .../Classes/UserDefaults+Simplenote.swift      |  1 +
 Simplenote/SPAppDelegate+Extensions.swift      | 18 ++++++++++++++++++
 Simplenote/SPAppDelegate.m                     |  2 ++
 4 files changed, 22 insertions(+)

diff --git a/Simplenote/Classes/Simperium+Simplenote.swift b/Simplenote/Classes/Simperium+Simplenote.swift
index 6e15cbcfd..8c1c9dc0e 100644
--- a/Simplenote/Classes/Simperium+Simplenote.swift
+++ b/Simplenote/Classes/Simperium+Simplenote.swift
@@ -61,4 +61,5 @@ extension Simperium {
 //
 extension Simperium {
     static let accountBucketName = "Account"
+    static let preferencesLastChangedSignatureKey = "lastChangeSignature-Preferences"
 }
diff --git a/Simplenote/Classes/UserDefaults+Simplenote.swift b/Simplenote/Classes/UserDefaults+Simplenote.swift
index 8590292f2..9bd5bfc25 100644
--- a/Simplenote/Classes/UserDefaults+Simplenote.swift
+++ b/Simplenote/Classes/UserDefaults+Simplenote.swift
@@ -16,6 +16,7 @@ extension UserDefaults {
         case useBiometryInsteadOfPin = "SimplenoteUseTouchID"
         case accountIsLoggedIn
         case useSustainerIcon
+        case hasMigratedSustainerPreferences
     }
 }
 
diff --git a/Simplenote/SPAppDelegate+Extensions.swift b/Simplenote/SPAppDelegate+Extensions.swift
index 87b556e46..7918570c1 100644
--- a/Simplenote/SPAppDelegate+Extensions.swift
+++ b/Simplenote/SPAppDelegate+Extensions.swift
@@ -504,3 +504,21 @@ extension SPAppDelegate {
         WidgetController.syncWidgetDefaults(authenticated: authenticated, sortMode: sortMode)
     }
 }
+
+// MARK: - Sustainer migration
+extension SPAppDelegate {
+    @objc 
+    func migrateSimperiumPreferencesIfNeeded() {
+        guard UserDefaults.standard.bool(forKey: .firstLaunch) == false,
+              UserDefaults.standard.bool(forKey: .hasMigratedSustainerPreferences) == false else {
+            return
+        }
+
+        UserDefaults.standard.removeObject(forKey: Simperium.preferencesLastChangedSignatureKey)
+        let prefs = simperium.preferencesObject()
+        prefs.ghostData = ""
+        simperium.saveWithoutSyncing()
+
+        UserDefaults.standard.set(true, forKey: .hasMigratedSustainerPreferences)
+    }
+}
diff --git a/Simplenote/SPAppDelegate.m b/Simplenote/SPAppDelegate.m
index 76c1e5afe..f19f8a2a7 100644
--- a/Simplenote/SPAppDelegate.m
+++ b/Simplenote/SPAppDelegate.m
@@ -131,6 +131,8 @@ - (BOOL)application:(UIApplication *)application willFinishLaunchingWithOptions:
     [self setupDefaultWindow];
     [self configureStateRestoration];
 
+    [self migrateSimperiumPreferencesIfNeeded];
+    
     return YES;
 }
 

From e80a3092df9efef7a7731f6aa414acc81e7b4c6c Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Mon, 8 Apr 2024 15:46:12 -0600
Subject: [PATCH 067/547] Updated data model version

---
 Simplenote.xcodeproj/project.pbxproj                 | 2 +-
 Simplenote/Simplenote.xcdatamodeld/.xccurrentversion | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index baa8eacea..0df97ec86 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -6192,7 +6192,7 @@
 				467D9C5D1788A4FB00785EF3 /* Simplenote 2.xcdatamodel */,
 				467D9C5E1788A4FB00785EF3 /* Simplenote.xcdatamodel */,
 			);
-			currentVersion = B54D9C542909B21700D0E0EC /* Simplenote 6.xcdatamodel */;
+			currentVersion = BA16C6A82BC4968400C9079F /* Simplenote 7.xcdatamodel */;
 			name = Simplenote.xcdatamodeld;
 			path = ../Simplenote.xcdatamodeld;
 			sourceTree = "<group>";
diff --git a/Simplenote/Simplenote.xcdatamodeld/.xccurrentversion b/Simplenote/Simplenote.xcdatamodeld/.xccurrentversion
index ffa847231..2db50145c 100755
--- a/Simplenote/Simplenote.xcdatamodeld/.xccurrentversion
+++ b/Simplenote/Simplenote.xcdatamodeld/.xccurrentversion
@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>_XCCurrentVersionName</key>
-	<string>Simplenote 6.xcdatamodel</string>
+	<string>Simplenote 7.xcdatamodel</string>
 </dict>
 </plist>

From 396f117a7c4dccc2131c6cdff9ed057b4e289079 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Mon, 8 Apr 2024 15:48:19 -0600
Subject: [PATCH 068/547] Set hasMigratedSustainerPreferences to true on first
 launch

---
 Simplenote/SPAppDelegate+Extensions.swift | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Simplenote/SPAppDelegate+Extensions.swift b/Simplenote/SPAppDelegate+Extensions.swift
index 7918570c1..5c98ff04b 100644
--- a/Simplenote/SPAppDelegate+Extensions.swift
+++ b/Simplenote/SPAppDelegate+Extensions.swift
@@ -509,8 +509,12 @@ extension SPAppDelegate {
 extension SPAppDelegate {
     @objc 
     func migrateSimperiumPreferencesIfNeeded() {
-        guard UserDefaults.standard.bool(forKey: .firstLaunch) == false,
-              UserDefaults.standard.bool(forKey: .hasMigratedSustainerPreferences) == false else {
+        guard UserDefaults.standard.bool(forKey: .hasMigratedSustainerPreferences) == false else {
+            return
+        }
+
+        guard UserDefaults.standard.bool(forKey: .firstLaunch) == false else {
+            UserDefaults.standard.set(true, forKey: .hasMigratedSustainerPreferences)
             return
         }
 

From 43bac649e5b8a6ced461c587796e9814f1eb237c Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Mon, 8 Apr 2024 15:50:00 -0600
Subject: [PATCH 069/547] Changed migration to use the options singleton
 checking first launch

---
 Simplenote/SPAppDelegate+Extensions.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Simplenote/SPAppDelegate+Extensions.swift b/Simplenote/SPAppDelegate+Extensions.swift
index 5c98ff04b..83f216eef 100644
--- a/Simplenote/SPAppDelegate+Extensions.swift
+++ b/Simplenote/SPAppDelegate+Extensions.swift
@@ -513,7 +513,7 @@ extension SPAppDelegate {
             return
         }
 
-        guard UserDefaults.standard.bool(forKey: .firstLaunch) == false else {
+        guard Options.shared.firstLaunch == false else {
             UserDefaults.standard.set(true, forKey: .hasMigratedSustainerPreferences)
             return
         }

From ca22321859b1036666c1979a230c7f6d8636f749 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Tue, 9 Apr 2024 14:27:26 -0600
Subject: [PATCH 070/547] Added logging to preferences migration

---
 Simplenote/SPAppDelegate+Extensions.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Simplenote/SPAppDelegate+Extensions.swift b/Simplenote/SPAppDelegate+Extensions.swift
index 83f216eef..4d3b48258 100644
--- a/Simplenote/SPAppDelegate+Extensions.swift
+++ b/Simplenote/SPAppDelegate+Extensions.swift
@@ -518,6 +518,7 @@ extension SPAppDelegate {
             return
         }
 
+        NSLog("Migrating Simperium Preferences object to include was_sustainer value")
         UserDefaults.standard.removeObject(forKey: Simperium.preferencesLastChangedSignatureKey)
         let prefs = simperium.preferencesObject()
         prefs.ghostData = ""

From 8f44cf5a37a728670d8da737524d8d64a5b60496 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Tue, 9 Apr 2024 14:39:03 -0600
Subject: [PATCH 071/547] Fixed issue where the migration wouldn't run if it
 wasn't first launch

---
 Simplenote/SPAppDelegate+Extensions.swift | 4 ++--
 Simplenote/SPAppDelegate.h                | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Simplenote/SPAppDelegate+Extensions.swift b/Simplenote/SPAppDelegate+Extensions.swift
index 4d3b48258..942f6ac98 100644
--- a/Simplenote/SPAppDelegate+Extensions.swift
+++ b/Simplenote/SPAppDelegate+Extensions.swift
@@ -507,13 +507,13 @@ extension SPAppDelegate {
 
 // MARK: - Sustainer migration
 extension SPAppDelegate {
-    @objc 
+    @objc
     func migrateSimperiumPreferencesIfNeeded() {
         guard UserDefaults.standard.bool(forKey: .hasMigratedSustainerPreferences) == false else {
             return
         }
 
-        guard Options.shared.firstLaunch == false else {
+        guard isFirstLaunch() == false else {
             UserDefaults.standard.set(true, forKey: .hasMigratedSustainerPreferences)
             return
         }
diff --git a/Simplenote/SPAppDelegate.h b/Simplenote/SPAppDelegate.h
index 41899d857..42aa15ef6 100644
--- a/Simplenote/SPAppDelegate.h
+++ b/Simplenote/SPAppDelegate.h
@@ -45,6 +45,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)save;
 - (void)logoutAndReset:(id)sender;
+- (BOOL)isFirstLaunch;
 
 + (SPAppDelegate *)sharedDelegate;
 

From 67dd0fa6af75466e806bcc1096e20aad7bbba0ee Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Tue, 9 Apr 2024 15:12:17 -0600
Subject: [PATCH 072/547] Removed default values from analytics enabled and was
 sustainer

avoids over writing existing values when doing a fresh install
---
 .../Simplenote.xcdatamodeld/Simplenote 7.xcdatamodel/contents | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Simplenote/Simplenote.xcdatamodeld/Simplenote 7.xcdatamodel/contents b/Simplenote/Simplenote.xcdatamodeld/Simplenote 7.xcdatamodel/contents
index bbe96025d..e915eb1f9 100644
--- a/Simplenote/Simplenote.xcdatamodeld/Simplenote 7.xcdatamodel/contents	
+++ b/Simplenote/Simplenote.xcdatamodeld/Simplenote 7.xcdatamodel/contents	
@@ -40,14 +40,14 @@
         </attribute>
     </entity>
     <entity name="Preferences" representedClassName="Preferences" syncable="YES">
-        <attribute name="analytics_enabled" optional="YES" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="analytics_enabled" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="ghostData" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="recent_searches" optional="YES" attributeType="Transformable" valueTransformerName="" syncable="YES"/>
         <attribute name="simperiumKey" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="subscription_date" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="subscription_level" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="subscription_platform" optional="YES" attributeType="String" syncable="YES"/>
-        <attribute name="was_sustainer" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="was_sustainer" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
     </entity>
     <entity name="Settings" representedClassName="Settings" syncable="YES">
         <attribute name="decline_skip_versions" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>

From bbd457a800e767cc507067f50f312256ec84b04f Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Tue, 9 Apr 2024 15:19:24 -0600
Subject: [PATCH 073/547] Updated settings VC to show sustainer app icon if 
 user is/was sustainer

---
 Simplenote/Classes/SPSettingsViewController+Extensions.swift | 5 +++++
 Simplenote/Classes/SPSettingsViewController.m                | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Simplenote/Classes/SPSettingsViewController+Extensions.swift b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
index 1b9fb5eb3..df9c32973 100644
--- a/Simplenote/Classes/SPSettingsViewController+Extensions.swift
+++ b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
@@ -44,6 +44,11 @@ extension SPSettingsViewController {
         SPAppDelegate.shared().simperium.preferencesObject().isActiveSubscriber
     }
 
+    @objc
+    var wasSustainer: Bool {
+        SPAppDelegate.shared().simperium.preferencesObject().was_sustainer == true
+    }
+
     @objc
     func sustainerSwitchDidChangeValue(sender: UISwitch) {
         let isOn = sender.isOn
diff --git a/Simplenote/Classes/SPSettingsViewController.m b/Simplenote/Classes/SPSettingsViewController.m
index 45c354625..cfd80cb91 100644
--- a/Simplenote/Classes/SPSettingsViewController.m
+++ b/Simplenote/Classes/SPSettingsViewController.m
@@ -219,7 +219,8 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
         }
             
         case SPOptionsViewSectionsAppearance: {
-            return [self isActiveSustainer] ? SPOptionsAppearanceRowCount : SPOptionsAppearanceRowCount - 1;
+            BOOL showSustainerSwitch = self.isActiveSustainer || self.wasSustainer;
+            return showSustainerSwitch ? SPOptionsAppearanceRowCount : SPOptionsAppearanceRowCount - 1;
         }
 
         case SPOptionsViewSectionsSecurity: {

From 1d03d83718019a7303f02190be5aaa5454b04489 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Wed, 10 Apr 2024 13:51:55 -0600
Subject: [PATCH 074/547] Refactored checking if should show sustainer icon to
 single variable

---
 .../Classes/SPSettingsViewController+Extensions.swift  | 10 +++-------
 Simplenote/Classes/SPSettingsViewController.m          |  3 +--
 Simplenote/Preferences+IAP.swift                       |  5 +++++
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Simplenote/Classes/SPSettingsViewController+Extensions.swift b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
index df9c32973..f5ea91e7c 100644
--- a/Simplenote/Classes/SPSettingsViewController+Extensions.swift
+++ b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
@@ -40,13 +40,9 @@ fileprivate extension SPSettingsViewController {
 
 extension SPSettingsViewController {
     @objc
-    var isActiveSustainer: Bool {
-        SPAppDelegate.shared().simperium.preferencesObject().isActiveSubscriber
-    }
-
-    @objc
-    var wasSustainer: Bool {
-        SPAppDelegate.shared().simperium.preferencesObject().was_sustainer == true
+    var showSustainerSwitch: Bool {
+        let preferences = SPAppDelegate.shared().simperium.preferencesObject()
+        return preferences.isActiveSubscriber || preferences.wasSustainer
     }
 
     @objc
diff --git a/Simplenote/Classes/SPSettingsViewController.m b/Simplenote/Classes/SPSettingsViewController.m
index cfd80cb91..61e6fab34 100644
--- a/Simplenote/Classes/SPSettingsViewController.m
+++ b/Simplenote/Classes/SPSettingsViewController.m
@@ -219,8 +219,7 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
         }
             
         case SPOptionsViewSectionsAppearance: {
-            BOOL showSustainerSwitch = self.isActiveSustainer || self.wasSustainer;
-            return showSustainerSwitch ? SPOptionsAppearanceRowCount : SPOptionsAppearanceRowCount - 1;
+            return self.showSustainerSwitch ? SPOptionsAppearanceRowCount : SPOptionsAppearanceRowCount - 1;
         }
 
         case SPOptionsViewSectionsSecurity: {
diff --git a/Simplenote/Preferences+IAP.swift b/Simplenote/Preferences+IAP.swift
index c670c5952..c3d869877 100644
--- a/Simplenote/Preferences+IAP.swift
+++ b/Simplenote/Preferences+IAP.swift
@@ -16,4 +16,9 @@ extension Preferences {
     var isActiveSubscriber: Bool {
         subscription_level == StoreConstants.activeSubscriptionLevel
     }
+
+    @objc
+    var wasSustainer: Bool {
+        was_sustainer == true
+    }
 }

From 97ee2b721bba1d6abdd082b67db8ccc7e826004d Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Wed, 10 Apr 2024 16:01:32 -0600
Subject: [PATCH 075/547] Updated rake file to fix bundle install --path
 depreciation

---
 Rakefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Rakefile b/Rakefile
index 090686846..e58354a3d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -4,6 +4,7 @@ require 'English'
 XCODE_WORKSPACE = 'Simplenote.xcworkspace'
 XCODE_SCHEME = 'Simplenote'
 XCODE_CONFIGURATION = 'Debug'
+LOCAL_PATH = "vendor/bundle"
 
 require 'fileutils'
 require 'tmpdir'
@@ -36,7 +37,8 @@ namespace :dependencies do
 
   namespace :bundle do
     task :check do
-      sh 'bundle check --path=${BUNDLE_PATH:-vendor/bundle} > /dev/null', verbose: false do |ok, _res|
+      sh "bundle config set --local path #{LOCAL_PATH} > /dev/null", verbose: false
+      sh 'bundle check > /dev/null', verbose: false do |ok, _res|
         next if ok
 
         # bundle check exits with a non zero code if install is needed
@@ -47,7 +49,7 @@ namespace :dependencies do
 
     task :install do
       fold('install.bundler') do
-        sh 'bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}'
+        sh 'bundle install --jobs=3 --retry=3'
       end
     end
     CLOBBER << 'vendor/bundle'

From 65cf8208f3de118e788b27be94a7f9879bea95f3 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Wed, 10 Apr 2024 16:09:52 -0600
Subject: [PATCH 076/547] Fixed double quote formatting in rake file where not
 needed

---
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index e58354a3d..bd037a7b9 100644
--- a/Rakefile
+++ b/Rakefile
@@ -4,7 +4,7 @@ require 'English'
 XCODE_WORKSPACE = 'Simplenote.xcworkspace'
 XCODE_SCHEME = 'Simplenote'
 XCODE_CONFIGURATION = 'Debug'
-LOCAL_PATH = "vendor/bundle"
+LOCAL_PATH = 'vendor/bundle'
 
 require 'fileutils'
 require 'tmpdir'

From b1fc06ac9fc9f5b01af8fe01fb7c70c1e7ec878d Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Fri, 12 Apr 2024 10:20:36 -0600
Subject: [PATCH 077/547] Fixed an issue where note tableview cells highlighted
 before selection

---
 Simplenote/Classes/SPNoteTableViewCell.swift | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Simplenote/Classes/SPNoteTableViewCell.swift b/Simplenote/Classes/SPNoteTableViewCell.swift
index 1f9fde988..c12ab9d1e 100644
--- a/Simplenote/Classes/SPNoteTableViewCell.swift
+++ b/Simplenote/Classes/SPNoteTableViewCell.swift
@@ -345,6 +345,15 @@ extension SPNoteTableViewCell {
 
         return max(result.rounded(.up), Constants.minCellHeight)
     }
+
+    // Ref: https://github.com/Automattic/simplenote-ios/issues/1307
+    // setHighlighted gets called on press down and on setSelected.  This causes the highlighting to change on press down but selection is on press up
+    // By only updating the highlighting if the cell is the cell is selected fixes this issue
+    override func setHighlighted(_ highlighted: Bool, animated: Bool) {
+        if isSelected {
+            super.setHighlighted(highlighted, animated: animated)
+        }
+    }
 }
 
 // MARK: - Cell Styles

From ef50a0792bc762954959b053231c9fd9abc46161 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Fri, 12 Apr 2024 10:27:16 -0600
Subject: [PATCH 078/547] Updated release notes for PR1560 fixed note
 selection/highlighting issue

---
 RELEASE-NOTES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index c705c09d6..188c15db1 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,6 +1,6 @@
 4.51
 -----
-
+- Fixed issue where note cell appearance changes on press down instead of when the cell is selected
 
 4.50
 -----

From 37a087b76fe3f752cfa60c56c21e8d74f376b404 Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Fri, 12 Apr 2024 17:32:40 -0700
Subject: [PATCH 079/547] Update Fastlane from `2.216.0` to `2.220.0`

---
 Gemfile.lock | 94 +++++++++++++++++++++++++---------------------------
 1 file changed, 46 insertions(+), 48 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 5999fee29..2deddeaf8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,9 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.6)
+    CFPropertyList (3.0.7)
+      base64
+      nkf
       rexml
     activesupport (7.1.1)
       base64
@@ -13,29 +15,29 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.5)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
-    artifactory (3.0.15)
+    artifactory (3.0.17)
     ast (2.4.2)
     atomos (0.1.3)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.842.0)
-    aws-sdk-core (3.185.1)
-      aws-eventstream (~> 1, >= 1.0.2)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.911.0)
+    aws-sdk-core (3.191.6)
+      aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+      aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.72.0)
-      aws-sdk-core (~> 3, >= 3.184.0)
+    aws-sdk-kms (1.78.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.136.0)
-      aws-sdk-core (~> 3, >= 3.181.0)
+    aws-sdk-s3 (1.146.1)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.6)
-    aws-sigv4 (1.6.1)
+      aws-sigv4 (~> 1.8)
+    aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.1.1)
@@ -133,8 +135,7 @@ GEM
     diffy (3.4.2)
     digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
+    domain_name (0.6.20240107)
     dotenv (2.8.1)
     drb (2.1.1)
       ruby2_keywords
@@ -142,7 +143,7 @@ GEM
     escape (0.0.4)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    excon (0.104.0)
+    excon (0.110.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -173,15 +174,15 @@ GEM
     faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    fastimage (2.2.7)
-    fastlane (2.216.0)
+    fastimage (2.3.1)
+    fastlane (2.220.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
       aws-sdk-s3 (~> 1.0)
       babosa (>= 1.0.3, < 2.0.0)
       bundler (>= 1.12.0, < 3.0.0)
-      colored
+      colored (~> 1.2)
       commander (~> 4.6)
       dotenv (>= 2.1.1, < 3.0.0)
       emoji_regex (>= 0.1, < 4.0)
@@ -193,6 +194,7 @@ GEM
       gh_inspector (>= 1.1.2, < 2.0.0)
       google-apis-androidpublisher_v3 (~> 0.3)
       google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, < 2.0.0)
       google-cloud-storage (~> 1.31)
       highline (~> 2.0)
       http-cookie (~> 1.0.5)
@@ -201,10 +203,10 @@ GEM
       mini_magick (>= 4.9.4, < 5.0.0)
       multipart-post (>= 2.0.0, < 3.0.0)
       naturally (~> 2.2)
-      optparse (~> 0.1.1)
+      optparse (>= 0.1.1, < 1.0.0)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
-      security (= 0.1.3)
+      security (= 0.1.5)
       simctl (~> 1.6.3)
       terminal-notifier (>= 2.0.0, < 3.0.0)
       terminal-table (~> 3)
@@ -213,7 +215,7 @@ GEM
       word_wrap (~> 1.0.0)
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
-      xcpretty-travis-formatter (>= 0.0.3)
+      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
     fastlane-plugin-appcenter (1.11.1)
     fastlane-plugin-sentry (1.14.0)
       os (~> 1.1, >= 1.1.4)
@@ -241,9 +243,9 @@ GEM
     git (1.18.0)
       addressable (~> 2.8)
       rchardet (~> 1.8)
-    google-apis-androidpublisher_v3 (0.51.0)
+    google-apis-androidpublisher_v3 (0.54.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.1)
+    google-apis-core (0.11.3)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -251,24 +253,23 @@ GEM
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
       rexml
-      webrick
     google-apis-iamcredentials_v1 (0.17.0)
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-playcustomapp_v1 (0.13.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-storage_v1 (0.19.0)
-      google-apis-core (>= 0.9.0, < 2.a)
-    google-cloud-core (1.6.0)
-      google-cloud-env (~> 1.0)
+    google-apis-storage_v1 (0.31.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-cloud-core (1.7.0)
+      google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.3.1)
-    google-cloud-storage (1.44.0)
+    google-cloud-errors (1.4.0)
+    google-cloud-storage (1.47.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.19.0)
+      google-apis-storage_v1 (~> 0.31.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
@@ -286,8 +287,9 @@ GEM
       concurrent-ruby (~> 1.0)
     java-properties (0.3.0)
     jmespath (1.6.2)
-    json (2.6.3)
-    jwt (2.7.1)
+    json (2.7.2)
+    jwt (2.8.1)
+      base64
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
@@ -298,12 +300,13 @@ GEM
     minitest (5.20.0)
     molinillo (0.8.0)
     multi_json (1.15.0)
-    multipart-post (2.3.0)
+    multipart-post (2.4.0)
     mutex_m (0.1.2)
     nanaimo (0.3.0)
     nap (1.1.0)
     naturally (2.2.1)
     netrc (0.11.0)
+    nkf (0.2.0)
     no_proxy_fix (0.1.2)
     nokogiri (1.15.4-arm64-darwin)
       racc (~> 1.4)
@@ -312,21 +315,21 @@ GEM
       sawyer (~> 0.9)
     open4 (1.3.4)
     options (2.3.2)
-    optparse (0.1.1)
+    optparse (0.4.0)
     os (1.1.4)
     ox (2.14.17)
     parallel (1.23.0)
     parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
-    plist (3.7.0)
+    plist (3.7.1)
     progress_bar (1.3.3)
       highline (>= 1.6, < 3)
       options (~> 2.3.0)
     public_suffix (4.0.7)
     racc (1.7.1)
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.2.1)
     rake-compiler (1.2.5)
       rake
     rchardet (1.8.0)
@@ -359,8 +362,8 @@ GEM
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
-    security (0.1.3)
-    signet (0.18.0)
+    security (0.1.5)
+    signet (0.19.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
@@ -374,7 +377,7 @@ GEM
     thor (1.0.1)
     trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     typhoeus (1.4.0)
@@ -382,13 +385,9 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
     unicode-display_width (2.5.0)
-    webrick (1.8.1)
     word_wrap (1.0.0)
-    xcodeproj (1.23.0)
+    xcodeproj (1.24.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -405,7 +404,6 @@ PLATFORMS
   arm64-darwin-21
   arm64-darwin-22
   arm64-darwin-23
-  ruby
 
 DEPENDENCIES
   cocoapods (~> 1.14)

From 2aaa5711e180dfc4a88f43e60a4f13f964c37b3e Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Fri, 12 Apr 2024 17:32:55 -0700
Subject: [PATCH 080/547] Update Matchfile for consistency

---
 fastlane/Matchfile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/fastlane/Matchfile b/fastlane/Matchfile
index 2ee895e90..09ef3019e 100644
--- a/fastlane/Matchfile
+++ b/fastlane/Matchfile
@@ -1,10 +1,9 @@
+# frozen_string_literal: true
+
 # This Matchfile has the shared properties used for all signing types
 
 # Store certs/profiles encrypted in Google Cloud
 storage_mode('google_cloud')
 google_cloud_bucket_name('a8c-fastlane-match')
-# Interestingly, Using the path with '~/.configure/...' results in Fastlane
-# failing to find the file.
-SECRETS_ROOT = File.join(Dir.home, '.configure/simplenote-ios/secrets')
-google_cloud_keys_file(File.join(SECRETS_ROOT, 'google_cloud_keys.json'))
-api_key_path(File.join(SECRETS_ROOT, 'app_store_connect_fastlane_api_key.json'))
+secrets_directory = File.join(Dir.home, '.configure', 'simplenote-ios', 'secrets')
+google_cloud_keys_file(File.join(secrets_directory, 'google_cloud_keys.json'))

From 27af395fbf574806b5253ca3cc705d62ff0d677a Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Fri, 12 Apr 2024 17:42:48 -0700
Subject: [PATCH 081/547] Remove unneeded Fastlane env examples

---
 fastlane/env/user.env-example | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/fastlane/env/user.env-example b/fastlane/env/user.env-example
index 763c920cc..254bd83be 100644
--- a/fastlane/env/user.env-example
+++ b/fastlane/env/user.env-example
@@ -1,8 +1,3 @@
-FASTLANE_USER=<Your Apple ID for fastlane>
-DELIVER_USER=<Your Apple ID for fastlane>
-
 GHHELPER_ACCESS=<GitHub access token>
 APPCENTER_API_TOKEN=<AppCenter Api Token>
 SENTRY_AUTH_TOKEN=<Sentry Auth Token>
-
-CIRCLE_CI_AUTH_TOKEN=<CircleCI Auth Token>

From ad24b1234bda7ccb9d2da81adaf2ae51135492db Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Fri, 12 Apr 2024 23:11:33 -0700
Subject: [PATCH 082/547] Improve code signing lanes

---
 fastlane/Fastfile | 92 ++++++++++++++++++++++++++++++++++-------------
 1 file changed, 67 insertions(+), 25 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 54a897b55..f794822a2 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -919,53 +919,84 @@ platform :ios do
 end
 
 ########################################################################
-# Configure Lanes
+# Fastlane Match Code Signing Lanes
 ########################################################################
-#####################################################################################
-# update_certs_and_profiles
-# -----------------------------------------------------------------------------------
-# This lane downloads all the required certs and profiles and,
-# if not run on CI it creates the missing ones.
-# -----------------------------------------------------------------------------------
-# Usage:
-# bundle exec fastlane update_certs_and_profiles
+
+# Downloads all the required certificates and profiles for both production and internal distribution builds.
+# Optionally, it can create any new necessary certificates or profiles.
 #
-# Example:
-# bundle exec fastlane update_certs_and_profiles
-#####################################################################################
-lane :update_certs_and_profiles do |_options|
-  alpha_code_signing
-  internal_code_signing
-  appstore_code_signing
+# @option [Boolean] readonly (default: true) Whether to only fetch existing certificates and profiles, without generating new ones.
+lane :update_certs_and_profiles do |options|
+  alpha_code_signing(options)
+  internal_code_signing(options)
+  appstore_code_signing(options)
 end
 
-########################################################################
-# Fastlane match code signing
-########################################################################
-
+# Downloads all the required certificates and profiles of the alpha enterprise build.
+# Optionally, it can create any new necessary certificates or profiles.
+#
+# @option [Boolean] readonly (default: true) Whether to only fetch existing certificates and profiles, without generating new ones.
 private_lane :alpha_code_signing do |options|
+  readonly = options.fetch(:readonly, true)
+
+  if readonly
+    # In readonly mode, we can use the API key
+    api_key_path = APP_STORE_CONNECT_KEY_PATH
+  else
+    # The Enterprise account APIs do not support authentication via API key.
+    # If we want to modify data (readonly = false) we need to authenticate manually.
+    prompt_user_for_app_store_connect_credentials
+    # We also need to pass no API key path, otherwise Fastlane will give
+    # precedence to that authentication mode.
+    api_key_path = nil
+  end
+
   match(
     type: 'enterprise',
     team_id: get_required_env('INT_EXPORT_TEAM_ID'),
-    readonly: options[:readonly] || is_ci,
-    app_identifier: simplenote_app_identifiers(root_bundle_id: "#{APP_STORE_BUNDLE_IDENTIFIER}.Alpha")
+    app_identifier: simplenote_app_identifiers(root_bundle_id: "#{APP_STORE_BUNDLE_IDENTIFIER}.Alpha"),
+    readonly: readonly,
+    api_key_path: api_key_path
   )
 end
 
+# Downloads all the required certificates and profiles the internal enterprise build.
+# Optionally, it can create any new necessary certificates or profiles.
+#
+# @option [Boolean] readonly (default: true) Whether to only fetch existing certificates and profiles, without generating new ones.
 private_lane :internal_code_signing do |options|
+  readonly = options.fetch(:readonly, true)
+
+  if readonly
+    # In readonly mode, we can use the API key
+    api_key_path = APP_STORE_CONNECT_KEY_PATH
+  else
+    # The Enterprise account APIs do not support authentication via API key.
+    # If we want to modify data (readonly = false) we need to authenticate manually.
+    prompt_user_for_app_store_connect_credentials
+    # We also need to pass no API key path, otherwise Fastlane will give
+    # precedence to that authentication mode.
+    api_key_path = nil
+  end
+
   match(
     type: 'enterprise',
     team_id: get_required_env('INT_EXPORT_TEAM_ID'),
-    readonly: options[:readonly] || is_ci,
-    app_identifier: simplenote_app_identifiers(root_bundle_id: "#{APP_STORE_BUNDLE_IDENTIFIER}.Internal")
+    app_identifier: simplenote_app_identifiers(root_bundle_id: "#{APP_STORE_BUNDLE_IDENTIFIER}.Internal"),
+    readonly: readonly,
+    api_key_path: api_key_path
   )
 end
 
+# Downloads all the required certificates and profiles for the production build.
+# Optionally, it can create any new necessary certificates or profiles.
+#
+# @option [Boolean] readonly (default: true) Whether to only fetch existing certificates and profiles, without generating new ones.
 private_lane :appstore_code_signing do |options|
   match(
     type: 'appstore',
     team_id: get_required_env('EXT_EXPORT_TEAM_ID'),
-    readonly: options[:readonly] || is_ci,
+    readonly: options.fetch(:readonly, true),
     app_identifier: simplenote_app_identifiers,
     template_name: 'NotationalFlow Keychain Access (Distribution)'
   )
@@ -1192,3 +1223,14 @@ def generate_installable_build_number
     "#{branch}-#{commit}"
   end
 end
+
+def prompt_user_for_app_store_connect_credentials
+  require 'credentials_manager'
+
+  # If Fastlane cannot instantiate a user, it will ask the caller for the email.
+  # Once we have it, we can set it as `FASTLANE_USER` in the environment (which has lifecycle limited to this call) so that the next commands will
+  # already have access to it.
+  # Note that if the user is already available to `AccountManager`, setting it in the environment is redundant, but Fastlane doesn't provide a way
+  # to check it so we have to do it anyway.
+  ENV['FASTLANE_USER'] = CredentialsManager::AccountManager.new.user
+end

From 0660204cb7ea832b7399652e93ae7513918a0c81 Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer@transier.us>
Date: Fri, 12 Apr 2024 23:58:37 -0700
Subject: [PATCH 083/547] Move Matchfile contents into Fastfile

---
 fastlane/Fastfile  | 70 +++++++++++++++++++++++++---------------------
 fastlane/Matchfile |  9 ------
 2 files changed, 38 insertions(+), 41 deletions(-)
 delete mode 100644 fastlane/Matchfile

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index f794822a2..d6a7aca4d 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -932,13 +932,7 @@ lane :update_certs_and_profiles do |options|
   appstore_code_signing(options)
 end
 
-# Downloads all the required certificates and profiles of the alpha enterprise build.
-# Optionally, it can create any new necessary certificates or profiles.
-#
-# @option [Boolean] readonly (default: true) Whether to only fetch existing certificates and profiles, without generating new ones.
-private_lane :alpha_code_signing do |options|
-  readonly = options.fetch(:readonly, true)
-
+def update_code_signing_enterprise(readonly:, app_identifiers:)
   if readonly
     # In readonly mode, we can use the API key
     api_key_path = APP_STORE_CONNECT_KEY_PATH
@@ -951,40 +945,37 @@ private_lane :alpha_code_signing do |options|
     api_key_path = nil
   end
 
-  match(
+  update_code_signing(
     type: 'enterprise',
+    # Enterprise builds belong to the "internal" team
     team_id: get_required_env('INT_EXPORT_TEAM_ID'),
-    app_identifier: simplenote_app_identifiers(root_bundle_id: "#{APP_STORE_BUNDLE_IDENTIFIER}.Alpha"),
     readonly: readonly,
+    app_identifiers: app_identifiers,
     api_key_path: api_key_path
   )
 end
 
-# Downloads all the required certificates and profiles the internal enterprise build.
+# Downloads all the required certificates and profiles (using `match`) for the alpha builds in the enterprise account.
 # Optionally, it can create any new necessary certificates or profiles.
 #
 # @option [Boolean] readonly (default: true) Whether to only fetch existing certificates and profiles, without generating new ones.
-private_lane :internal_code_signing do |options|
-  readonly = options.fetch(:readonly, true)
-
-  if readonly
-    # In readonly mode, we can use the API key
-    api_key_path = APP_STORE_CONNECT_KEY_PATH
-  else
-    # The Enterprise account APIs do not support authentication via API key.
-    # If we want to modify data (readonly = false) we need to authenticate manually.
-    prompt_user_for_app_store_connect_credentials
-    # We also need to pass no API key path, otherwise Fastlane will give
-    # precedence to that authentication mode.
-    api_key_path = nil
-  end
+#
+private_lane :alpha_code_signing do |options|
+  update_code_signing_enterprise(
+    app_identifiers: simplenote_app_identifiers(root_bundle_id: "#{APP_STORE_BUNDLE_IDENTIFIER}.Alpha"),
+    readonly: options.fetch(:readonly, true)
+  )
+end
 
-  match(
-    type: 'enterprise',
-    team_id: get_required_env('INT_EXPORT_TEAM_ID'),
-    app_identifier: simplenote_app_identifiers(root_bundle_id: "#{APP_STORE_BUNDLE_IDENTIFIER}.Internal"),
-    readonly: readonly,
-    api_key_path: api_key_path
+# Downloads all the required certificates and profiles (using `match`) for the internal builds in the enterprise account.
+# Optionally, it can create any new necessary certificates or profiles.
+#
+# @option [Boolean] readonly (default: true) Whether to only fetch existing certificates and profiles, without generating new ones.
+#
+private_lane :internal_code_signing do |options|
+  update_code_signing_enterprise(
+    app_identifiers: simplenote_app_identifiers(root_bundle_id: "#{APP_STORE_BUNDLE_IDENTIFIER}.Internal"),
+    readonly: options.fetch(:readonly, true)
   )
 end
 
@@ -993,12 +984,27 @@ end
 #
 # @option [Boolean] readonly (default: true) Whether to only fetch existing certificates and profiles, without generating new ones.
 private_lane :appstore_code_signing do |options|
-  match(
+  update_code_signing(
     type: 'appstore',
     team_id: get_required_env('EXT_EXPORT_TEAM_ID'),
     readonly: options.fetch(:readonly, true),
     app_identifier: simplenote_app_identifiers,
-    template_name: 'NotationalFlow Keychain Access (Distribution)'
+    api_key_path: APP_STORE_CONNECT_KEY_PATH
+  )
+end
+
+def update_code_signing(type:, team_id:, readonly:, app_identifiers:, api_key_path:)
+  # NOTE: It might be neccessary to add `force: true` alongside `readonly: true` in order to regenerate some provisioning profiles.
+  # If this turns out to be a hard requirement, we should consider updating the method with logic to toggle the two setting based on whether we're fetching or renewing.
+  match(
+    storage_mode: 'google_cloud',
+    google_cloud_bucket_name: 'a8c-fastlane-match',
+    google_cloud_keys_file: File.join(SECRETS_ROOT, 'google_cloud_keys.json'),
+    type: type,
+    team_id: team_id,
+    readonly: readonly,
+    app_identifier: app_identifiers,
+    api_key_path: api_key_path
   )
 end
 
diff --git a/fastlane/Matchfile b/fastlane/Matchfile
deleted file mode 100644
index 09ef3019e..000000000
--- a/fastlane/Matchfile
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-# This Matchfile has the shared properties used for all signing types
-
-# Store certs/profiles encrypted in Google Cloud
-storage_mode('google_cloud')
-google_cloud_bucket_name('a8c-fastlane-match')
-secrets_directory = File.join(Dir.home, '.configure', 'simplenote-ios', 'secrets')
-google_cloud_keys_file(File.join(secrets_directory, 'google_cloud_keys.json'))

From a2ac7f570fc2df895223d21c22fbb511b397c162 Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer@transier.us>
Date: Sat, 13 Apr 2024 00:02:57 -0700
Subject: [PATCH 084/547] Fix parameter typo

---
 fastlane/Fastfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index d6a7aca4d..6497f38c9 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -988,7 +988,7 @@ private_lane :appstore_code_signing do |options|
     type: 'appstore',
     team_id: get_required_env('EXT_EXPORT_TEAM_ID'),
     readonly: options.fetch(:readonly, true),
-    app_identifier: simplenote_app_identifiers,
+    app_identifiers: simplenote_app_identifiers,
     api_key_path: APP_STORE_CONNECT_KEY_PATH
   )
 end

From 7c21397ed10d0f180cdd29be70656dfcd62a08a2 Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer@transier.us>
Date: Sat, 13 Apr 2024 00:07:16 -0700
Subject: [PATCH 085/547] Move prompt_user method

---
 fastlane/Fastfile | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 6497f38c9..dd9d0d9a7 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -1032,6 +1032,17 @@ def simplenote_provisioning_profiles(root_bundle_id: APP_STORE_BUNDLE_IDENTIFIER
     .to_h { |key| [key, "match #{match_type} #{key}"] }
 end
 
+def prompt_user_for_app_store_connect_credentials
+  require 'credentials_manager'
+
+  # If Fastlane cannot instantiate a user, it will ask the caller for the email.
+  # Once we have it, we can set it as `FASTLANE_USER` in the environment (which has lifecycle limited to this call) so that the next commands will
+  # already have access to it.
+  # Note that if the user is already available to `AccountManager`, setting it in the environment is redundant, but Fastlane doesn't provide a way
+  # to check it so we have to do it anyway.
+  ENV['FASTLANE_USER'] = CredentialsManager::AccountManager.new.user
+end
+
 ########################################################################
 # Localization Lanes
 ########################################################################
@@ -1229,14 +1240,3 @@ def generate_installable_build_number
     "#{branch}-#{commit}"
   end
 end
-
-def prompt_user_for_app_store_connect_credentials
-  require 'credentials_manager'
-
-  # If Fastlane cannot instantiate a user, it will ask the caller for the email.
-  # Once we have it, we can set it as `FASTLANE_USER` in the environment (which has lifecycle limited to this call) so that the next commands will
-  # already have access to it.
-  # Note that if the user is already available to `AccountManager`, setting it in the environment is redundant, but Fastlane doesn't provide a way
-  # to check it so we have to do it anyway.
-  ENV['FASTLANE_USER'] = CredentialsManager::AccountManager.new.user
-end

From 334c881ad0da7b42abd5353f64b23ca69336fbd5 Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer@transier.us>
Date: Sat, 13 Apr 2024 00:40:47 -0700
Subject: [PATCH 086/547] Move Match storage from Google Cloud to S3

---
 fastlane/Fastfile | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index dd9d0d9a7..a8bfbfb29 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -996,10 +996,21 @@ end
 def update_code_signing(type:, team_id:, readonly:, app_identifiers:, api_key_path:)
   # NOTE: It might be neccessary to add `force: true` alongside `readonly: true` in order to regenerate some provisioning profiles.
   # If this turns out to be a hard requirement, we should consider updating the method with logic to toggle the two setting based on whether we're fetching or renewing.
+
+  # Fail early if secrets not available (via ENV.fetch with not default).
+  # Otherwise, Fastlane will prompt to type them.
+  access_key = ENV.fetch('MATCH_S3_ACCESS_KEY')
+  secret_access_key = ENV.fetch('MATCH_S3_SECRET_ACCESS_KEY')
+  # This ENV var is required but match has no input parameter for it, likely for security
+  password_key = 'MATCH_PASSWORD'
+  raise "Missing #{password_key} in the environment" unless ENV.key?(password_key)
+
   match(
-    storage_mode: 'google_cloud',
-    google_cloud_bucket_name: 'a8c-fastlane-match',
-    google_cloud_keys_file: File.join(SECRETS_ROOT, 'google_cloud_keys.json'),
+    storage_mode: 's3',
+    s3_bucket: 'a8c-fastlane-match',
+    s3_region: 'us-east-2',
+    s3_access_key: access_key,
+    s3_secret_access_key: secret_access_key,
     type: type,
     team_id: team_id,
     readonly: readonly,

From 5b1e2918377dbe4fb2d77626eea54035a91d4e9c Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Mon, 15 Apr 2024 13:22:28 -0600
Subject: [PATCH 087/547] Added option in settings to enable indexing notes in
 spotlight

---
 Simplenote/Classes/SPSettingsViewController.m | 29 +++++++++++++++++--
 .../Classes/UserDefaults+Simplenote.swift     |  1 +
 Simplenote/Options.swift                      | 13 +++++++++
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/Simplenote/Classes/SPSettingsViewController.m b/Simplenote/Classes/SPSettingsViewController.m
index 61e6fab34..d5e4989fa 100644
--- a/Simplenote/Classes/SPSettingsViewController.m
+++ b/Simplenote/Classes/SPSettingsViewController.m
@@ -19,6 +19,7 @@ @interface SPSettingsViewController ()
 @property (nonatomic, strong) UITextField   *pinTimeoutTextField;
 @property (nonatomic, strong) UIPickerView  *pinTimeoutPickerView;
 @property (nonatomic, strong) UIToolbar     *doneToolbar;
+@property (nonatomic, strong) UISwitch      *indexNotesSwitch;
 @end
 
 @implementation SPSettingsViewController {
@@ -33,6 +34,7 @@ @implementation SPSettingsViewController {
 #define kTagTimeout             6
 #define kTagTouchID             7
 #define kTagSustainerIcon       8
+#define kTagIndexNotes          9
 
 typedef NS_ENUM(NSInteger, SPOptionsViewSections) {
     SPOptionsViewSectionsNotes          = 0,
@@ -57,7 +59,8 @@ typedef NS_ENUM(NSInteger, SPOptionsAccountRow) {
 typedef NS_ENUM(NSInteger, SPOptionsNotesRow) {
     SPOptionsPreferencesRowSort         = 0,
     SPOptionsPreferencesRowCondensed    = 1,
-    SPOptionsNotesRowCount              = 2
+    SPOptionsPreferencesRowIndexNotes   = 2,
+    SPOptionsNotesRowCount              = 3
 };
 
 typedef NS_ENUM(NSInteger, SPOptionsTagsRow) {
@@ -141,6 +144,11 @@ - (void)viewDidLoad
                                      action:@selector(condensedSwitchDidChangeValue:)
                            forControlEvents:UIControlEventValueChanged];
 
+    self.indexNotesSwitch = [UISwitch new];
+    [self.indexNotesSwitch addTarget:self
+                              action:@selector(indexNotesSwitchDidChangeValue:)
+                    forControlEvents:UIControlEventValueChanged];
+
     self.biometrySwitch = [UISwitch new];
     [self.biometrySwitch addTarget:self
                            action:@selector(touchIdSwitchDidChangeValue:)
@@ -319,7 +327,17 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
                     cell.tag = kTagCondensedNoteList;
                     break;
                 }
-                    
+                case SPOptionsPreferencesRowIndexNotes: {
+                    cell.textLabel.text = NSLocalizedString(@"Index Notes in Spotlight", @"Option to add notes to spotlight search");
+
+                    self.indexNotesSwitch.on = [[Options shared] indexNotesInSpotlight];
+
+                    cell.accessoryView = self.indexNotesSwitch;
+                    cell.selectionStyle = UITableViewCellSelectionStyleNone;
+                    cell.tag = kTagIndexNotes;
+                    break;
+                }
+
                 default:
                     break;
             }
@@ -697,6 +715,13 @@ - (void)condensedSwitchDidChangeValue:(UISwitch *)sender
     [SPTracker trackSettingsListCondensedEnabled:isOn];
 }
 
+- (void)indexNotesSwitchDidChangeValue:(UISwitch *)sender
+{
+    BOOL isOn = [(UISwitch *)sender isOn];
+
+    [[Options shared] setIndexNotesInSpotlight:isOn];
+}
+
 - (void)tagSortSwitchDidChangeValue:(UISwitch *)sender
 {
     BOOL isOn = [(UISwitch *)sender isOn];
diff --git a/Simplenote/Classes/UserDefaults+Simplenote.swift b/Simplenote/Classes/UserDefaults+Simplenote.swift
index 9bd5bfc25..be71a8855 100644
--- a/Simplenote/Classes/UserDefaults+Simplenote.swift
+++ b/Simplenote/Classes/UserDefaults+Simplenote.swift
@@ -17,6 +17,7 @@ extension UserDefaults {
         case accountIsLoggedIn
         case useSustainerIcon
         case hasMigratedSustainerPreferences
+        case indexNotesInSpotlight
     }
 }
 
diff --git a/Simplenote/Options.swift b/Simplenote/Options.swift
index ccea36890..8251594a9 100644
--- a/Simplenote/Options.swift
+++ b/Simplenote/Options.swift
@@ -145,6 +145,19 @@ extension Options {
     var numberOfPreviewLines: Int {
         return condensedNotesList ? Settings.numberOfPreviewLinesCondensed : Settings.numberOfPreviewLinesRegular
     }
+
+    /// Index notes in spotlight
+    ///
+    @objc
+    var indexNotesInSpotlight: Bool {
+        get {
+            defaults.bool(forKey: .indexNotesInSpotlight)
+        }
+
+        set {
+            defaults.set(newValue, forKey: .indexNotesInSpotlight)
+        }
+    }
 }
 
 // MARK: - Private

From c007d9c24a80a2da4400c3871902a9e4264e2d61 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Mon, 15 Apr 2024 13:42:28 -0600
Subject: [PATCH 088/547] Added ability to disable or enable spotlight indexing
 in preferences

---
 Simplenote/Classes/CSSearchable+Helpers.swift | 32 +++++++++++++++++++
 Simplenote/Classes/SPSettingsViewController.m |  9 ++++++
 Simplenote/SPAppDelegate.m                    | 10 ++----
 Simplenote/Simplenote-Bridging-Header.h       |  1 +
 4 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/Simplenote/Classes/CSSearchable+Helpers.swift b/Simplenote/Classes/CSSearchable+Helpers.swift
index ef12bd6a2..8e9240acc 100644
--- a/Simplenote/Classes/CSSearchable+Helpers.swift
+++ b/Simplenote/Classes/CSSearchable+Helpers.swift
@@ -32,8 +32,29 @@ extension CSSearchableItem {
 }
 
 extension CSSearchableIndex {
+    // MARK: - Index Notes
+    @objc
+    func indexSpotlightItems(in context: NSManagedObjectContext) {
+        guard Options.shared.indexNotesInSpotlight else {
+            return
+        }
+
+        context.perform {
+            if let deleted = context.fetchObjects(forEntityName: "Note", with: NSPredicate(format: "deleted == YES")) as? [Note] {
+                CSSearchableIndex.default().deleteSearchableNotes(deleted)
+            }
+
+            if let notes = context.fetchObjects(forEntityName: "Note", with: NSPredicate(format: "deleted == NO")) as? [Note] {
+                CSSearchableIndex.default().indexSearchableNotes(notes)
+            }
+        }
+    }
 
     @objc func indexSearchableNote(_ note: Note) {
+        guard Options.shared.indexNotesInSpotlight else {
+            return
+        }
+
         let item = CSSearchableItem(note: note)
         indexSearchableItems([item]) { error in
             if let error = error {
@@ -43,6 +64,10 @@ extension CSSearchableIndex {
     }
 
     @objc func indexSearchableNotes(_ notes: [Note]) {
+        guard Options.shared.indexNotesInSpotlight else {
+            return
+        }
+
         let items = notes.map {
             return CSSearchableItem(note: $0)
         }
@@ -70,4 +95,11 @@ extension CSSearchableIndex {
         }
     }
 
+    @objc
+    func deleteSearchableNotes(in context: NSManagedObjectContext) {
+        if let notes = context.fetchAllObjects(forEntityName: "Note") as? [Note] {
+
+            deleteSearchableNotes(notes)
+        }
+    }
 }
diff --git a/Simplenote/Classes/SPSettingsViewController.m b/Simplenote/Classes/SPSettingsViewController.m
index d5e4989fa..557af508e 100644
--- a/Simplenote/Classes/SPSettingsViewController.m
+++ b/Simplenote/Classes/SPSettingsViewController.m
@@ -720,6 +720,15 @@ - (void)indexNotesSwitchDidChangeValue:(UISwitch *)sender
     BOOL isOn = [(UISwitch *)sender isOn];
 
     [[Options shared] setIndexNotesInSpotlight:isOn];
+
+    NSManagedObjectContext *context = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSPrivateQueueConcurrencyType];
+    [context setParentContext:SPAppDelegate.sharedDelegate.simperium.managedObjectContext];
+
+    if (isOn) {
+        [[CSSearchableIndex defaultSearchableIndex] indexSpotlightItemsIn:context];
+    } else {
+        [[CSSearchableIndex defaultSearchableIndex] deleteSearchableNotesIn:context];
+    }
 }
 
 - (void)tagSortSwitchDidChangeValue:(UISwitch *)sender
diff --git a/Simplenote/SPAppDelegate.m b/Simplenote/SPAppDelegate.m
index f19f8a2a7..45b18e7bc 100644
--- a/Simplenote/SPAppDelegate.m
+++ b/Simplenote/SPAppDelegate.m
@@ -468,14 +468,8 @@ - (void)indexSpotlightItems
 {
     NSManagedObjectContext *context = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSPrivateQueueConcurrencyType];
     [context setParentContext:self.simperium.managedObjectContext];
-    
-    [context performBlock:^{
-        NSArray *deleted = [context fetchObjectsForEntityName:@"Note" withPredicate:[NSPredicate predicateWithFormat:@"deleted == YES"]];
-        [[CSSearchableIndex defaultSearchableIndex] deleteSearchableNotes:deleted];
-        
-        NSArray *notes = [context fetchObjectsForEntityName:@"Note" withPredicate:[NSPredicate predicateWithFormat:@"deleted == NO"]];
-        [[CSSearchableIndex defaultSearchableIndex] indexSearchableNotes:notes];
-    }];
+
+    [[CSSearchableIndex defaultSearchableIndex] indexSpotlightItemsIn:context];
 }
 
 
diff --git a/Simplenote/Simplenote-Bridging-Header.h b/Simplenote/Simplenote-Bridging-Header.h
index ff2d8992f..d433b86f9 100644
--- a/Simplenote/Simplenote-Bridging-Header.h
+++ b/Simplenote/Simplenote-Bridging-Header.h
@@ -32,6 +32,7 @@
 #import "SPTracker.h"
 #import "SPTagEntryField.h"
 #import "WPAuthHandler.h"
+#import "NSManagedObjectContext+CoreDataExtensions.h"
 
 
 #pragma mark - Extensions

From 664aaae7051281ce2cedaf7b9eacbaff62224af7 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Mon, 15 Apr 2024 13:59:38 -0600
Subject: [PATCH 089/547] Added alert on deleting spotlight index that some
 history may remain

---
 Simplenote/Classes/CSSearchable+Helpers.swift     |  8 --------
 .../SPSettingsViewController+Extensions.swift     | 15 +++++++++++++++
 Simplenote/Classes/SPSettingsViewController.m     |  5 ++++-
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/Simplenote/Classes/CSSearchable+Helpers.swift b/Simplenote/Classes/CSSearchable+Helpers.swift
index 8e9240acc..411de8728 100644
--- a/Simplenote/Classes/CSSearchable+Helpers.swift
+++ b/Simplenote/Classes/CSSearchable+Helpers.swift
@@ -94,12 +94,4 @@ extension CSSearchableIndex {
             }
         }
     }
-
-    @objc
-    func deleteSearchableNotes(in context: NSManagedObjectContext) {
-        if let notes = context.fetchAllObjects(forEntityName: "Note") as? [Note] {
-
-            deleteSearchableNotes(notes)
-        }
-    }
 }
diff --git a/Simplenote/Classes/SPSettingsViewController+Extensions.swift b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
index f5ea91e7c..abd05fa21 100644
--- a/Simplenote/Classes/SPSettingsViewController+Extensions.swift
+++ b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
@@ -206,6 +206,21 @@ extension SPSettingsViewController {
         alert.addDefaultActionWithTitle(AccountDeletion.ok)
         self.present(alert, animated: true, completion: nil)
     }
+
+    @objc
+    func presentIndexRemovalAlert() {
+        DispatchQueue.main.async {
+            let alert = UIAlertController(title: IndexAlert.title, message: IndexAlert.message, preferredStyle: .alert)
+            alert.addDefaultActionWithTitle(IndexAlert.okay)
+            self.present(alert, animated: true, completion: nil)
+        }
+    }
+}
+
+private struct IndexAlert {
+    static let title = NSLocalizedString("Index Removed", comment: "Alert title letting user know their search index has been removed")
+    static let message = NSLocalizedString("Spotlight history may still appear in search results, but notes have be unindexed", comment: "Details that some results may still appear in searches on device")
+    static let okay = NSLocalizedString("Okay", comment: "confirm button title")
 }
 
 private struct AccountDeletion {
diff --git a/Simplenote/Classes/SPSettingsViewController.m b/Simplenote/Classes/SPSettingsViewController.m
index 557af508e..df788f9dd 100644
--- a/Simplenote/Classes/SPSettingsViewController.m
+++ b/Simplenote/Classes/SPSettingsViewController.m
@@ -727,7 +727,10 @@ - (void)indexNotesSwitchDidChangeValue:(UISwitch *)sender
     if (isOn) {
         [[CSSearchableIndex defaultSearchableIndex] indexSpotlightItemsIn:context];
     } else {
-        [[CSSearchableIndex defaultSearchableIndex] deleteSearchableNotesIn:context];
+        [[CSSearchableIndex defaultSearchableIndex] deleteAllSearchableItemsWithCompletionHandler:^(NSError * _Nullable error) {
+
+            [self presentIndexRemovalAlert];
+        }];
     }
 }
 

From dc1ac2cedae53e00c27171bbf2b3974cb3aff30a Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Mon, 15 Apr 2024 14:11:09 -0600
Subject: [PATCH 090/547] Updated release notes for PR1562 added toggle for
 indexing for spotlight

---
 RELEASE-NOTES.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 188c15db1..f4f964db3 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,6 +1,7 @@
 4.51
 -----
 - Fixed issue where note cell appearance changes on press down instead of when the cell is selected
+- Added ability to enable and disable indexing notes in Spotlight
 
 4.50
 -----

From 494a646226046dd5e0fc3ad3906c5ca4ab322681 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Tue, 16 Apr 2024 12:42:38 -0600
Subject: [PATCH 091/547] Fix issue with cert provisioning

---
 Simplenote.xcodeproj/project.pbxproj | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index 0df97ec86..56300cea5 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -2902,7 +2902,7 @@
 				BuildIndependentTargetsInParallel = YES;
 				CLASSPREFIX = SP;
 				LastSwiftUpdateCheck = 1240;
-				LastUpgradeCheck = 1520;
+				LastUpgradeCheck = 1530;
 				ORGANIZATIONNAME = Automattic;
 				TargetAttributes = {
 					3F1BB4AD243199FF006D1A04 = {
@@ -5239,11 +5239,12 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_ENTITLEMENTS = "SimplenoteIntents/Supporting Files/SimplenoteIntents-Debug.entitlements";
-				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				DEVELOPMENT_TEAM = PZYM8XX95Q;
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = PZYM8XX95Q;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -5261,7 +5262,8 @@
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.codality.NotationalFlow.Development.Intents;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "Simplenote Development Intents";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Simplenote Development Intents";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG APP_EXTENSION";
 				SWIFT_OBJC_BRIDGING_HEADER = "SimplenoteIntents/Simplenote-Intents-Bridging-Header.h";

From 428860fb5020f18b69e2b8e19aa64d3ed90b8a05 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Tue, 16 Apr 2024 12:43:00 -0600
Subject: [PATCH 092/547] Updated xcode settings to get rid of warnings

---
 Simplenote.xcodeproj/xcshareddata/xcschemes/Simplenote.xcscheme | 2 +-
 .../xcshareddata/xcschemes/SimplenoteIntents.xcscheme           | 2 +-
 .../xcshareddata/xcschemes/SimplenoteScreenshots.xcscheme       | 2 +-
 .../xcshareddata/xcschemes/SimplenoteShare.xcscheme             | 2 +-
 .../xcshareddata/xcschemes/SimplenoteUITests.xcscheme           | 2 +-
 .../xcshareddata/xcschemes/SimplenoteUITests_Subset.xcscheme    | 2 +-
 .../xcshareddata/xcschemes/SimplenoteWidgetsExtension.xcscheme  | 2 +-
 .../xcshareddata/xcschemes/UITestsFoundation.xcscheme           | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Simplenote.xcodeproj/xcshareddata/xcschemes/Simplenote.xcscheme b/Simplenote.xcodeproj/xcshareddata/xcschemes/Simplenote.xcscheme
index 3e62a3f76..964ae8c3f 100644
--- a/Simplenote.xcodeproj/xcshareddata/xcschemes/Simplenote.xcscheme
+++ b/Simplenote.xcodeproj/xcshareddata/xcschemes/Simplenote.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1520"
+   LastUpgradeVersion = "1530"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Simplenote.xcodeproj/xcshareddata/xcschemes/SimplenoteIntents.xcscheme b/Simplenote.xcodeproj/xcshareddata/xcschemes/SimplenoteIntents.xcscheme
index c7f82b5dd..ff3e9e943 100644
--- a/Simplenote.xcodeproj/xcshareddata/xcschemes/SimplenoteIntents.xcscheme
+++ b/Simplenote.xcodeproj/xcshareddata/xcschemes/SimplenoteIntents.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1520"
+   LastUpgradeVersion = "1530"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction
diff --git a/Simplenote.xcodeproj/xcshareddata/xcschemes/SimplenoteScreenshots.xcscheme b/Simplenote.xcodeproj/xcshareddata/xcschemes/SimplenoteScreenshots.xcscheme
index b314719ce..55154a2c9 100644
--- a/Simplenote.xcodeproj/xcshareddata/xcschemes/SimplenoteScreenshots.xcscheme
+++ b/Simplenote.xcodeproj/xcshareddata/xcschemes/SimplenoteScreenshots.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1520"
+   LastUpgradeVersion = "1530"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Simplenote.xcodeproj/xcshareddata/xcschemes/SimplenoteShare.xcscheme b/Simplenote.xcodeproj/xcshareddata/xcschemes/SimplenoteShare.xcscheme
index 502adb382..411b19a97 100644
--- a/Simplenote.xcodeproj/xcshareddata/xcschemes/SimplenoteShare.xcscheme
+++ b/Simplenote.xcodeproj/xcshareddata/xcschemes/SimplenoteShare.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1520"
+   LastUpgradeVersion = "1530"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction
diff --git a/Simplenote.xcodeproj/xcshareddata/xcschemes/SimplenoteUITests.xcscheme b/Simplenote.xcodeproj/xcshareddata/xcschemes/SimplenoteUITests.xcscheme
index 6238e6f00..826b2d7a0 100644
--- a/Simplenote.xcodeproj/xcshareddata/xcschemes/SimplenoteUITests.xcscheme
+++ b/Simplenote.xcodeproj/xcshareddata/xcschemes/SimplenoteUITests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1520"
+   LastUpgradeVersion = "1530"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Simplenote.xcodeproj/xcshareddata/xcschemes/SimplenoteUITests_Subset.xcscheme b/Simplenote.xcodeproj/xcshareddata/xcschemes/SimplenoteUITests_Subset.xcscheme
index 104c97b68..388a5fc53 100644
--- a/Simplenote.xcodeproj/xcshareddata/xcschemes/SimplenoteUITests_Subset.xcscheme
+++ b/Simplenote.xcodeproj/xcshareddata/xcschemes/SimplenoteUITests_Subset.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1520"
+   LastUpgradeVersion = "1530"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Simplenote.xcodeproj/xcshareddata/xcschemes/SimplenoteWidgetsExtension.xcscheme b/Simplenote.xcodeproj/xcshareddata/xcschemes/SimplenoteWidgetsExtension.xcscheme
index 1dea6bfb0..e4641cc9a 100644
--- a/Simplenote.xcodeproj/xcshareddata/xcschemes/SimplenoteWidgetsExtension.xcscheme
+++ b/Simplenote.xcodeproj/xcshareddata/xcschemes/SimplenoteWidgetsExtension.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1520"
+   LastUpgradeVersion = "1530"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction
diff --git a/Simplenote.xcodeproj/xcshareddata/xcschemes/UITestsFoundation.xcscheme b/Simplenote.xcodeproj/xcshareddata/xcschemes/UITestsFoundation.xcscheme
index 57cf98d61..fd89e0199 100644
--- a/Simplenote.xcodeproj/xcshareddata/xcschemes/UITestsFoundation.xcscheme
+++ b/Simplenote.xcodeproj/xcshareddata/xcschemes/UITestsFoundation.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1520"
+   LastUpgradeVersion = "1530"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

From b4ea039d84a8b4cc7a7d903d045cd1156a07976b Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Tue, 16 Apr 2024 14:02:56 -0600
Subject: [PATCH 093/547] Fixed an issue where the new note widget made a new
 note bypassing lock

---
 .../PinLock/PinLockVerifyController.swift     | 19 +++++++++++++++++++
 .../PinLock/PinLockViewController.swift       |  2 +-
 Simplenote/SPAppDelegate+Extensions.swift     | 14 +++++++++++++-
 Simplenote/SPAppDelegate.h                    |  2 +-
 Simplenote/SPAppDelegate.m                    |  6 +++++-
 Simplenote/URL+Simplenote.swift               | 11 ++++++++++-
 6 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/Simplenote/Classes/PinLock/PinLockVerifyController.swift b/Simplenote/Classes/PinLock/PinLockVerifyController.swift
index e97d8e1ad..87d46405c 100644
--- a/Simplenote/Classes/PinLock/PinLockVerifyController.swift
+++ b/Simplenote/Classes/PinLock/PinLockVerifyController.swift
@@ -18,6 +18,8 @@ final class PinLockVerifyController: PinLockBaseController, PinLockController {
     private let application: ApplicationStateProvider
     private weak var delegate: PinLockVerifyControllerDelegate?
 
+    private var onSuccesBlocks = [(() -> Void)]()
+
     init(pinLockManager: SPPinLockManager = .shared,
          application: ApplicationStateProvider = UIApplication.shared,
          delegate: PinLockVerifyControllerDelegate) {
@@ -37,6 +39,7 @@ final class PinLockVerifyController: PinLockBaseController, PinLockController {
         }
 
         delegate?.pinLockVerifyControllerDidComplete(self)
+        runOnSuccessBlocks()
     }
 
     func handleCancellation() {
@@ -50,6 +53,21 @@ final class PinLockVerifyController: PinLockBaseController, PinLockController {
     func applicationDidBecomeActive() {
         verifyBiometry()
     }
+
+    private func runOnSuccessBlocks() {
+        onSuccesBlocks.forEach({
+            $0()
+        })
+        removeSuccesBlocks()
+    }
+
+    func addOnSuccesBlock(block: @escaping () -> Void) {
+        onSuccesBlocks.append(block)
+    }
+
+    func removeSuccesBlocks() {
+        onSuccesBlocks.removeAll()
+    }
 }
 
 // MARK: - Biometry
@@ -71,6 +89,7 @@ private extension PinLockVerifyController {
 
             if success {
                 self.delegate?.pinLockVerifyControllerDidComplete(self)
+                self.runOnSuccessBlocks()
             }
         }
     }
diff --git a/Simplenote/Classes/PinLock/PinLockViewController.swift b/Simplenote/Classes/PinLock/PinLockViewController.swift
index 25c2ac776..124a6225f 100644
--- a/Simplenote/Classes/PinLock/PinLockViewController.swift
+++ b/Simplenote/Classes/PinLock/PinLockViewController.swift
@@ -14,7 +14,7 @@ class PinLockViewController: UIViewController {
     @IBOutlet private weak var headerStackView: UIStackView!
     @IBOutlet private var keypadButtons: [UIButton] = []
 
-    private let controller: PinLockController
+    let controller: PinLockController
     private var inputValues: [Int] = [] {
         didSet {
             progressView.progress = inputValues.count
diff --git a/Simplenote/SPAppDelegate+Extensions.swift b/Simplenote/SPAppDelegate+Extensions.swift
index 942f6ac98..e33b1fa6c 100644
--- a/Simplenote/SPAppDelegate+Extensions.swift
+++ b/Simplenote/SPAppDelegate+Extensions.swift
@@ -150,8 +150,19 @@ extension SPAppDelegate {
 
     /// Opens editor with a new note
     ///
+    @objc
     func presentNewNoteEditor(animated: Bool = false) {
-        presentNote(nil, animated: animated)
+        if isPresentingPasscodeLock && SPPinLockManager.shared.isEnabled {
+            verifyController?.addOnSuccesBlock {
+                self.presentNote(nil, animated: animated)
+            }
+        } else {
+            presentNote(nil, animated: animated)
+        }
+    }
+
+    var verifyController: PinLockVerifyController? {
+        (pinLockWindow?.rootViewController as? PinLockViewController)?.controller as? PinLockVerifyController
     }
 
     /// Opens a note with specified simperium key
@@ -325,6 +336,7 @@ extension SPAppDelegate {
     @objc
     func showPasscodeLockIfNecessary() {
         guard SPPinLockManager.shared.isEnabled, !isPresentingPasscodeLock else {
+            verifyController?.removeSuccesBlocks()
             return
         }
 
diff --git a/Simplenote/SPAppDelegate.h b/Simplenote/SPAppDelegate.h
index 42aa15ef6..3c1db17c7 100644
--- a/Simplenote/SPAppDelegate.h
+++ b/Simplenote/SPAppDelegate.h
@@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface SPAppDelegate : UIResponder <UIApplicationDelegate, SPBucketDelegate>
 
 @property (strong, nonatomic) UIWindow *window;
-@property (nullable, strong, nonatomic) UIWindow *pinLockWindow;
+@property (nullable, strong, nonatomic) UIWindow                        *pinLockWindow;
 
 @property (strong, nonatomic) Simperium						            *simperium;
 @property (strong, nonatomic) CoreDataManager                           *coreDataManager;
diff --git a/Simplenote/SPAppDelegate.m b/Simplenote/SPAppDelegate.m
index f19f8a2a7..1693db6eb 100644
--- a/Simplenote/SPAppDelegate.m
+++ b/Simplenote/SPAppDelegate.m
@@ -512,7 +512,11 @@ - (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDiction
 
         [self presentNote:newNote animated:NO];
     }
-    
+
+    if ([[components host] isEqualToString:@"widgetNew"]) {
+        [self presentNewNoteEditorWithAnimated: NO];
+    }
+
     return YES;
 }
 
diff --git a/Simplenote/URL+Simplenote.swift b/Simplenote/URL+Simplenote.swift
index 17e5287b4..42895a6fd 100644
--- a/Simplenote/URL+Simplenote.swift
+++ b/Simplenote/URL+Simplenote.swift
@@ -15,7 +15,7 @@ extension URL {
     }
 
     static func newNoteURL(withTag tag: String? = nil) -> URL {
-        guard var components = URLComponents.simplenoteURLComponents(with: Constants.newNotePath) else {
+        guard var components = URLComponents.simplenoteURLComponents(with: Constants.widgetNewNotePath) else {
             return URL(string: .simplenotePath())!
         }
 
@@ -27,9 +27,18 @@ extension URL {
 
         return components.url!
     }
+
+    static func newNoteWidgetURL() -> URL {
+        guard var components = URLComponents.simplenoteURLComponents(with: Constants.newNotePath) else {
+            return URL(string: .simplenotePath())!
+        }
+
+        return components.url!
+    }
 }
 
 private struct Constants {
     static let tagQueryBase = "tag"
     static let newNotePath = "new"
+    static let widgetNewNotePath = "widgetNew"
 }

From 6ec7e0bc7f1af2a0a79e1b742e4b28f3e00dba22 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Tue, 16 Apr 2024 14:10:59 -0600
Subject: [PATCH 094/547] Updated release notes PR1564 fixed new note widget
 ignoring pinlock

---
 RELEASE-NOTES.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 188c15db1..2f13d48e4 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,6 +1,7 @@
 4.51
 -----
 - Fixed issue where note cell appearance changes on press down instead of when the cell is selected
+- Fixed an issue where using the new note widget with the lock screen could create empty notes while the app was locked
 
 4.50
 -----

From 0e71cf54b2cbd0efa09e6b99b7f24474a6913631 Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer@transier.us>
Date: Tue, 16 Apr 2024 13:37:15 -0700
Subject: [PATCH 095/547] Remove AppFile

---
 fastlane/Appfile | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 fastlane/Appfile

diff --git a/fastlane/Appfile b/fastlane/Appfile
deleted file mode 100644
index 87770d1ef..000000000
--- a/fastlane/Appfile
+++ /dev/null
@@ -1,2 +0,0 @@
-app_identifier "com.codality.NotationalFlow" # The bundle identifier of your app
-team_id "PZYM8XX95Q" # Developer Portal Team ID
\ No newline at end of file

From 8eea4949be17fcf3c490ef2e5d5366b93d4180f3 Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Tue, 16 Apr 2024 15:22:59 -0700
Subject: [PATCH 096/547] Apple Rubocop corrections

---
 Rakefile          | 17 ++++++++---------
 fastlane/Fastfile |  4 +++-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Rakefile b/Rakefile
index 6527830f4..f040dc5ff 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,11 +1,4 @@
-require 'English'
-# Constants
-SWIFTLINT_VERSION = '0.41.0'
-PROJECT_DIR = __dir__
-XCODE_WORKSPACE = 'Simplenote.xcworkspace'
-XCODE_SCHEME = 'Simplenote'
-XCODE_CONFIGURATION = 'Debug'
-LOCAL_PATH = 'vendor/bundle'
+# frozen_string_literal: true
 
 require 'English'
 require 'fileutils'
@@ -14,7 +7,13 @@ require 'rake/clean'
 require 'yaml'
 require 'digest'
 
-
+# Constants
+SWIFTLINT_VERSION = '0.41.0'
+PROJECT_DIR = __dir__
+XCODE_WORKSPACE = 'Simplenote.xcworkspace'
+XCODE_SCHEME = 'Simplenote'
+XCODE_CONFIGURATION = 'Debug'
+LOCAL_PATH = 'vendor/bundle'
 
 task default: %w[test]
 
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 13dc7ebfe..80bef9049 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -126,7 +126,9 @@ platform :ios do
     generate_strings_file_for_glotpress
 
     UI.important('Pushing changes to remote, configuring the release on GitHub, and triggering the beta build')
-    UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.") unless options[:skip_confirm] || UI.confirm('Do you want to continue?')
+    unless options[:skip_confirm] || UI.confirm('Do you want to continue?')
+      UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.")
+    end
 
     push_to_git_remote(tags: false)
 

From 4a23e75e25f2e52d44e6789a90a4df48b64d8685 Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Tue, 16 Apr 2024 16:52:26 -0700
Subject: [PATCH 097/547] Remove extra `MATCH_PASSWORD` check

---
 fastlane/Fastfile | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 46a479c0f..818cf7f60 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -1066,13 +1066,10 @@ def update_code_signing(type:, team_id:, readonly:, app_identifiers:, api_key_pa
   # NOTE: It might be neccessary to add `force: true` alongside `readonly: true` in order to regenerate some provisioning profiles.
   # If this turns out to be a hard requirement, we should consider updating the method with logic to toggle the two setting based on whether we're fetching or renewing.
 
-  # Fail early if secrets not available (via ENV.fetch with not default).
+  # Fail early if secrets not available via `get_required_env`.
   # Otherwise, Fastlane will prompt to type them.
-  access_key = ENV.fetch('MATCH_S3_ACCESS_KEY')
-  secret_access_key = ENV.fetch('MATCH_S3_SECRET_ACCESS_KEY')
-  # This ENV var is required but match has no input parameter for it, likely for security
-  password_key = 'MATCH_PASSWORD'
-  raise "Missing #{password_key} in the environment" unless ENV.key?(password_key)
+  access_key = get_required_env('MATCH_S3_ACCESS_KEY')
+  secret_access_key = get_required_env('MATCH_S3_SECRET_ACCESS_KEY')
 
   match(
     storage_mode: 's3',

From 664a20c4c44905e1c82b7fbc654675deed9046ed Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Tue, 16 Apr 2024 16:54:56 -0700
Subject: [PATCH 098/547] Move the enterprise code signing method to for better
 organization

---
 fastlane/Fastfile | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 818cf7f60..425806748 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -1001,29 +1001,6 @@ lane :update_certs_and_profiles do |options|
   appstore_code_signing(options)
 end
 
-def update_code_signing_enterprise(readonly:, app_identifiers:)
-  if readonly
-    # In readonly mode, we can use the API key
-    api_key_path = APP_STORE_CONNECT_KEY_PATH
-  else
-    # The Enterprise account APIs do not support authentication via API key.
-    # If we want to modify data (readonly = false) we need to authenticate manually.
-    prompt_user_for_app_store_connect_credentials
-    # We also need to pass no API key path, otherwise Fastlane will give
-    # precedence to that authentication mode.
-    api_key_path = nil
-  end
-
-  update_code_signing(
-    type: 'enterprise',
-    # Enterprise builds belong to the "internal" team
-    team_id: get_required_env('INT_EXPORT_TEAM_ID'),
-    readonly: readonly,
-    app_identifiers: app_identifiers,
-    api_key_path: api_key_path
-  )
-end
-
 # Downloads all the required certificates and profiles (using `match`) for the alpha builds in the enterprise account.
 # Optionally, it can create any new necessary certificates or profiles.
 #
@@ -1062,6 +1039,29 @@ private_lane :appstore_code_signing do |options|
   )
 end
 
+def update_code_signing_enterprise(readonly:, app_identifiers:)
+  if readonly
+    # In readonly mode, we can use the API key
+    api_key_path = APP_STORE_CONNECT_KEY_PATH
+  else
+    # The Enterprise account APIs do not support authentication via API key.
+    # If we want to modify data (readonly = false) we need to authenticate manually.
+    prompt_user_for_app_store_connect_credentials
+    # We also need to pass no API key path, otherwise Fastlane will give
+    # precedence to that authentication mode.
+    api_key_path = nil
+  end
+
+  update_code_signing(
+    type: 'enterprise',
+    # Enterprise builds belong to the "internal" team
+    team_id: get_required_env('INT_EXPORT_TEAM_ID'),
+    readonly: readonly,
+    app_identifiers: app_identifiers,
+    api_key_path: api_key_path
+  )
+end
+
 def update_code_signing(type:, team_id:, readonly:, app_identifiers:, api_key_path:)
   # NOTE: It might be neccessary to add `force: true` alongside `readonly: true` in order to regenerate some provisioning profiles.
   # If this turns out to be a hard requirement, we should consider updating the method with logic to toggle the two setting based on whether we're fetching or renewing.

From 19fae80545d6def74aca1db364dece9ed957c949 Mon Sep 17 00:00:00 2001
From: Olivier Halligon <olivier.halligon@automattic.com>
Date: Wed, 17 Apr 2024 11:01:54 +0200
Subject: [PATCH 099/547] Fix bundler setup to allow running danger on Linux

---
 .bundle/config | 1 +
 Gemfile.lock   | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/.bundle/config b/.bundle/config
index bd4454d51..7a906f438 100644
--- a/.bundle/config
+++ b/.bundle/config
@@ -1,4 +1,5 @@
 ---
+BUNDLE_BUNDLE_SPECIFIC_PLATFORM: "false"
 BUNDLE_PATH: "vendor/bundle"
 BUNDLE_RETRY: "3"
 BUNDLE_JOBS: "3"
diff --git a/Gemfile.lock b/Gemfile.lock
index cb2e42a85..8f14d3098 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -310,6 +310,8 @@ GEM
     no_proxy_fix (0.1.2)
     nokogiri (1.15.4-arm64-darwin)
       racc (~> 1.4)
+    nokogiri (1.15.4-x86_64-linux)
+      racc (~> 1.4)
     octokit (6.1.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
@@ -404,6 +406,7 @@ PLATFORMS
   arm64-darwin-21
   arm64-darwin-22
   arm64-darwin-23
+  x86_64-linux
 
 DEPENDENCIES
   cocoapods (~> 1.14)

From 1f365a88294bd79a00e49230b1ed815519f6aa7c Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer@transier.us>
Date: Wed, 17 Apr 2024 04:16:23 -0700
Subject: [PATCH 100/547] Bump version number

---
 config/Version.Public.xcconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/Version.Public.xcconfig b/config/Version.Public.xcconfig
index 63c766f02..afdd640fc 100644
--- a/config/Version.Public.xcconfig
+++ b/config/Version.Public.xcconfig
@@ -1,4 +1,4 @@
-VERSION_SHORT=4.50
+VERSION_SHORT=4.51
 
 // Public long version example: VERSION_LONG=4.8.1.1
-VERSION_LONG=4.50.0.1
+VERSION_LONG=4.51.0.0

From d3c5d5c8c124a8b4fe86509d7016fb322f73feea Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer@transier.us>
Date: Wed, 17 Apr 2024 04:16:24 -0700
Subject: [PATCH 101/547] Update draft release notes for 4.51.

---
 Simplenote/Resources/release_notes.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Simplenote/Resources/release_notes.txt b/Simplenote/Resources/release_notes.txt
index 81d1894ea..8f1de708c 100644
--- a/Simplenote/Resources/release_notes.txt
+++ b/Simplenote/Resources/release_notes.txt
@@ -1 +1,2 @@
-• Behind-the-scenes reliability improvements
+- Fixed issue where note cell appearance changes on press down instead of when the cell is selected
+

From af7d860fe21f0b4f73bf11daac932b1df2bdc891 Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer@transier.us>
Date: Wed, 17 Apr 2024 04:16:24 -0700
Subject: [PATCH 102/547] Release Notes: add new section for next version
 (4.52)

---
 RELEASE-NOTES.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 188c15db1..5755b679c 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,3 +1,7 @@
+4.52
+-----
+
+
 4.51
 -----
 - Fixed issue where note cell appearance changes on press down instead of when the cell is selected

From 384d1923be51a5378371e454d4efbf9fe28bd486 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Wed, 17 Apr 2024 08:22:31 -0600
Subject: [PATCH 103/547] Removed unneeded calls to the CSSearchableIndex
 default

---
 Simplenote/Classes/CSSearchable+Helpers.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Simplenote/Classes/CSSearchable+Helpers.swift b/Simplenote/Classes/CSSearchable+Helpers.swift
index 411de8728..adb6f7433 100644
--- a/Simplenote/Classes/CSSearchable+Helpers.swift
+++ b/Simplenote/Classes/CSSearchable+Helpers.swift
@@ -41,11 +41,11 @@ extension CSSearchableIndex {
 
         context.perform {
             if let deleted = context.fetchObjects(forEntityName: "Note", with: NSPredicate(format: "deleted == YES")) as? [Note] {
-                CSSearchableIndex.default().deleteSearchableNotes(deleted)
+                self.deleteSearchableNotes(deleted)
             }
 
             if let notes = context.fetchObjects(forEntityName: "Note", with: NSPredicate(format: "deleted == NO")) as? [Note] {
-                CSSearchableIndex.default().indexSearchableNotes(notes)
+                self.indexSearchableNotes(notes)
             }
         }
     }

From 2d1cd365132809be3f2c4846f3cfc00f901b1210 Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Wed, 17 Apr 2024 16:18:26 -0700
Subject: [PATCH 104/547] Update release notes for 4.51

---
 Simplenote/Resources/release_notes.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Simplenote/Resources/release_notes.txt b/Simplenote/Resources/release_notes.txt
index 8f1de708c..37a8f4076 100644
--- a/Simplenote/Resources/release_notes.txt
+++ b/Simplenote/Resources/release_notes.txt
@@ -1,2 +1,3 @@
-- Fixed issue where note cell appearance changes on press down instead of when the cell is selected
-
+• Fixed issue where note cell appearance changes on press down instead of when the cell is selected
+• Fixed an issue where using the new note widget with the lock screen could create empty notes while the app was locked
+• Removed Sustainer plan information and upgrade UI

From 4bc2ae889c3595fdee3d48234cf386ed0a3d75de Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Wed, 17 Apr 2024 16:18:42 -0700
Subject: [PATCH 105/547] Update metadata strings

---
 Simplenote/Resources/AppStoreStrings.pot | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Simplenote/Resources/AppStoreStrings.pot b/Simplenote/Resources/AppStoreStrings.pot
index 9ab8e3981..65aa660df 100644
--- a/Simplenote/Resources/AppStoreStrings.pot
+++ b/Simplenote/Resources/AppStoreStrings.pot
@@ -66,8 +66,10 @@ msgctxt "app_store_keywords"
 msgid "notes,note,markdown,journal,sync,to-do,list,cloud,notebook,simple,notepad,tag,todo,writing,memo"
 msgstr ""
 
-msgctxt "v4.50-whats-new"
+msgctxt "v4.51-whats-new"
 msgid ""
-"• Behind-the-scenes reliability improvements\n"
+"• Fixed issue where note cell appearance changes on press down instead of when the cell is selected\n"
+"• Fixed an issue where using the new note widget with the lock screen could create empty notes while the app was locked\n"
+"• Removed Sustainer plan information and upgrade UI\n"
 msgstr ""
 

From 4f5e1a3936c415769be60ec74a7a148335e97f5c Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer.transier@automattic.com>
Date: Wed, 17 Apr 2024 17:15:16 -0700
Subject: [PATCH 106/547] Add template_name parameter to match call

---
 fastlane/Fastfile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 425806748..2bca74ae3 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -1035,7 +1035,8 @@ private_lane :appstore_code_signing do |options|
     team_id: get_required_env('EXT_EXPORT_TEAM_ID'),
     readonly: options.fetch(:readonly, true),
     app_identifiers: simplenote_app_identifiers,
-    api_key_path: APP_STORE_CONNECT_KEY_PATH
+    api_key_path: APP_STORE_CONNECT_KEY_PATH,
+    template_name: 'NotationalFlow Keychain Access (Distribution)'
   )
 end
 
@@ -1062,7 +1063,8 @@ def update_code_signing_enterprise(readonly:, app_identifiers:)
   )
 end
 
-def update_code_signing(type:, team_id:, readonly:, app_identifiers:, api_key_path:)
+# rubocop:disable Metrics/ParameterLists
+def update_code_signing(type:, team_id:, readonly:, app_identifiers:, api_key_path:, template_name: nil)
   # NOTE: It might be neccessary to add `force: true` alongside `readonly: true` in order to regenerate some provisioning profiles.
   # If this turns out to be a hard requirement, we should consider updating the method with logic to toggle the two setting based on whether we're fetching or renewing.
 
@@ -1081,9 +1083,11 @@ def update_code_signing(type:, team_id:, readonly:, app_identifiers:, api_key_pa
     team_id: team_id,
     readonly: readonly,
     app_identifier: app_identifiers,
-    api_key_path: api_key_path
+    api_key_path: api_key_path,
+    template_name: template_name
   )
 end
+# rubocop:enable Metrics/ParameterLists
 
 # Compiles the array of bundle identifiers for the different targets that
 # make up the Simplenote app, to be used as the `app_identifier` parameter

From 1e4252376ffb63b793995f5c9469a9c572fb8f2f Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer@transier.us>
Date: Tue, 23 Apr 2024 06:00:01 -0700
Subject: [PATCH 107/547] Bump version number

---
 config/Version.Public.xcconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/Version.Public.xcconfig b/config/Version.Public.xcconfig
index afdd640fc..63d01d802 100644
--- a/config/Version.Public.xcconfig
+++ b/config/Version.Public.xcconfig
@@ -1,4 +1,4 @@
 VERSION_SHORT=4.51
 
 // Public long version example: VERSION_LONG=4.8.1.1
-VERSION_LONG=4.51.0.0
+VERSION_LONG=4.51.0.1

From 0a901e9214bac54851fc9d67050c4cc38f35ae56 Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer@transier.us>
Date: Tue, 23 Apr 2024 06:01:34 -0700
Subject: [PATCH 108/547] Updated strings for 4.51

---
 Simplenote/ar.lproj/Localizable.strings         | 2 +-
 Simplenote/de.lproj/Localizable.strings         | 2 +-
 Simplenote/es.lproj/Localizable.strings         | 2 +-
 Simplenote/fr.lproj/Localizable.strings         | 2 +-
 Simplenote/he.lproj/Localizable.strings         | 2 +-
 Simplenote/id.lproj/Localizable.strings         | 2 +-
 Simplenote/it.lproj/Localizable.strings         | 2 +-
 Simplenote/ja.lproj/Localizable.strings         | 2 +-
 Simplenote/ko.lproj/Localizable.strings         | 2 +-
 Simplenote/nl.lproj/Localizable.strings         | 2 +-
 Simplenote/pt-BR.lproj/Localizable.strings      | 2 +-
 Simplenote/ru.lproj/Localizable.strings         | 2 +-
 Simplenote/sv.lproj/Localizable.strings         | 2 +-
 Simplenote/tr.lproj/Localizable.strings         | 2 +-
 Simplenote/zh-Hans-CN.lproj/Localizable.strings | 2 +-
 Simplenote/zh-Hant-TW.lproj/Localizable.strings | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Simplenote/ar.lproj/Localizable.strings b/Simplenote/ar.lproj/Localizable.strings
index 85a9ae2f3..1465b5569 100644
--- a/Simplenote/ar.lproj/Localizable.strings
+++ b/Simplenote/ar.lproj/Localizable.strings
@@ -3,7 +3,7 @@
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: ar */
 
-/* No comment provided by engineer. */
+/* Monthly Subscription Option. Please preserve the special marker! */
 "%@ per Month" = "%@ شهريًا ";
 
 /* Yearly Subscription Option. Please preserve the special marker! */
diff --git a/Simplenote/de.lproj/Localizable.strings b/Simplenote/de.lproj/Localizable.strings
index f0b51ad56..516bb4fb2 100644
--- a/Simplenote/de.lproj/Localizable.strings
+++ b/Simplenote/de.lproj/Localizable.strings
@@ -3,7 +3,7 @@
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: de */
 
-/* No comment provided by engineer. */
+/* Monthly Subscription Option. Please preserve the special marker! */
 "%@ per Month" = "%@ pro Monat";
 
 /* Yearly Subscription Option. Please preserve the special marker! */
diff --git a/Simplenote/es.lproj/Localizable.strings b/Simplenote/es.lproj/Localizable.strings
index 93ca839f3..de368529c 100644
--- a/Simplenote/es.lproj/Localizable.strings
+++ b/Simplenote/es.lproj/Localizable.strings
@@ -3,7 +3,7 @@
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: es */
 
-/* No comment provided by engineer. */
+/* Monthly Subscription Option. Please preserve the special marker! */
 "%@ per Month" = "%@ al mes";
 
 /* Yearly Subscription Option. Please preserve the special marker! */
diff --git a/Simplenote/fr.lproj/Localizable.strings b/Simplenote/fr.lproj/Localizable.strings
index da1c0ef9b..733f34062 100644
--- a/Simplenote/fr.lproj/Localizable.strings
+++ b/Simplenote/fr.lproj/Localizable.strings
@@ -3,7 +3,7 @@
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: fr */
 
-/* No comment provided by engineer. */
+/* Monthly Subscription Option. Please preserve the special marker! */
 "%@ per Month" = "%@ par mois";
 
 /* Yearly Subscription Option. Please preserve the special marker! */
diff --git a/Simplenote/he.lproj/Localizable.strings b/Simplenote/he.lproj/Localizable.strings
index 8c76cb5c1..efd46555d 100644
--- a/Simplenote/he.lproj/Localizable.strings
+++ b/Simplenote/he.lproj/Localizable.strings
@@ -3,7 +3,7 @@
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: he_IL */
 
-/* No comment provided by engineer. */
+/* Monthly Subscription Option. Please preserve the special marker! */
 "%@ per Month" = "%@ לחודש";
 
 /* Yearly Subscription Option. Please preserve the special marker! */
diff --git a/Simplenote/id.lproj/Localizable.strings b/Simplenote/id.lproj/Localizable.strings
index 245e44f3b..530ea0e1d 100644
--- a/Simplenote/id.lproj/Localizable.strings
+++ b/Simplenote/id.lproj/Localizable.strings
@@ -3,7 +3,7 @@
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: id */
 
-/* No comment provided by engineer. */
+/* Monthly Subscription Option. Please preserve the special marker! */
 "%@ per Month" = "%@ per Bulan";
 
 /* Yearly Subscription Option. Please preserve the special marker! */
diff --git a/Simplenote/it.lproj/Localizable.strings b/Simplenote/it.lproj/Localizable.strings
index bc600e39d..6dc597232 100644
--- a/Simplenote/it.lproj/Localizable.strings
+++ b/Simplenote/it.lproj/Localizable.strings
@@ -3,7 +3,7 @@
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: it */
 
-/* No comment provided by engineer. */
+/* Monthly Subscription Option. Please preserve the special marker! */
 "%@ per Month" = "%@ al mese";
 
 /* Yearly Subscription Option. Please preserve the special marker! */
diff --git a/Simplenote/ja.lproj/Localizable.strings b/Simplenote/ja.lproj/Localizable.strings
index e1b84beb6..8a128bf25 100644
--- a/Simplenote/ja.lproj/Localizable.strings
+++ b/Simplenote/ja.lproj/Localizable.strings
@@ -3,7 +3,7 @@
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: ja_JP */
 
-/* No comment provided by engineer. */
+/* Monthly Subscription Option. Please preserve the special marker! */
 "%@ per Month" = "月額 %@";
 
 /* Yearly Subscription Option. Please preserve the special marker! */
diff --git a/Simplenote/ko.lproj/Localizable.strings b/Simplenote/ko.lproj/Localizable.strings
index dd233661c..cf95dbc73 100644
--- a/Simplenote/ko.lproj/Localizable.strings
+++ b/Simplenote/ko.lproj/Localizable.strings
@@ -3,7 +3,7 @@
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: ko_KR */
 
-/* No comment provided by engineer. */
+/* Monthly Subscription Option. Please preserve the special marker! */
 "%@ per Month" = "월 %@";
 
 /* Yearly Subscription Option. Please preserve the special marker! */
diff --git a/Simplenote/nl.lproj/Localizable.strings b/Simplenote/nl.lproj/Localizable.strings
index c0aca05a6..0bd2fe55e 100644
--- a/Simplenote/nl.lproj/Localizable.strings
+++ b/Simplenote/nl.lproj/Localizable.strings
@@ -3,7 +3,7 @@
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: nl */
 
-/* No comment provided by engineer. */
+/* Monthly Subscription Option. Please preserve the special marker! */
 "%@ per Month" = "%@ Per maand";
 
 /* Yearly Subscription Option. Please preserve the special marker! */
diff --git a/Simplenote/pt-BR.lproj/Localizable.strings b/Simplenote/pt-BR.lproj/Localizable.strings
index 4f710de36..853469454 100644
--- a/Simplenote/pt-BR.lproj/Localizable.strings
+++ b/Simplenote/pt-BR.lproj/Localizable.strings
@@ -3,7 +3,7 @@
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: pt_BR */
 
-/* No comment provided by engineer. */
+/* Monthly Subscription Option. Please preserve the special marker! */
 "%@ per Month" = "%@ por mês";
 
 /* Yearly Subscription Option. Please preserve the special marker! */
diff --git a/Simplenote/ru.lproj/Localizable.strings b/Simplenote/ru.lproj/Localizable.strings
index 8deef0e41..3e4d397f5 100644
--- a/Simplenote/ru.lproj/Localizable.strings
+++ b/Simplenote/ru.lproj/Localizable.strings
@@ -3,7 +3,7 @@
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: ru */
 
-/* No comment provided by engineer. */
+/* Monthly Subscription Option. Please preserve the special marker! */
 "%@ per Month" = "%@ в месяц";
 
 /* Yearly Subscription Option. Please preserve the special marker! */
diff --git a/Simplenote/sv.lproj/Localizable.strings b/Simplenote/sv.lproj/Localizable.strings
index e39afe02e..f0f3dc15c 100644
--- a/Simplenote/sv.lproj/Localizable.strings
+++ b/Simplenote/sv.lproj/Localizable.strings
@@ -3,7 +3,7 @@
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: sv_SE */
 
-/* No comment provided by engineer. */
+/* Monthly Subscription Option. Please preserve the special marker! */
 "%@ per Month" = "%@ per månad";
 
 /* Yearly Subscription Option. Please preserve the special marker! */
diff --git a/Simplenote/tr.lproj/Localizable.strings b/Simplenote/tr.lproj/Localizable.strings
index 599617e24..3cd294523 100644
--- a/Simplenote/tr.lproj/Localizable.strings
+++ b/Simplenote/tr.lproj/Localizable.strings
@@ -3,7 +3,7 @@
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: tr */
 
-/* No comment provided by engineer. */
+/* Monthly Subscription Option. Please preserve the special marker! */
 "%@ per Month" = "Aylık %@";
 
 /* Yearly Subscription Option. Please preserve the special marker! */
diff --git a/Simplenote/zh-Hans-CN.lproj/Localizable.strings b/Simplenote/zh-Hans-CN.lproj/Localizable.strings
index ed6913856..853e9c036 100644
--- a/Simplenote/zh-Hans-CN.lproj/Localizable.strings
+++ b/Simplenote/zh-Hans-CN.lproj/Localizable.strings
@@ -3,7 +3,7 @@
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: zh_CN */
 
-/* No comment provided by engineer. */
+/* Monthly Subscription Option. Please preserve the special marker! */
 "%@ per Month" = "每月 %@";
 
 /* Yearly Subscription Option. Please preserve the special marker! */
diff --git a/Simplenote/zh-Hant-TW.lproj/Localizable.strings b/Simplenote/zh-Hant-TW.lproj/Localizable.strings
index f688d6846..b3bc6a284 100644
--- a/Simplenote/zh-Hant-TW.lproj/Localizable.strings
+++ b/Simplenote/zh-Hant-TW.lproj/Localizable.strings
@@ -3,7 +3,7 @@
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: zh_TW */
 
-/* No comment provided by engineer. */
+/* Monthly Subscription Option. Please preserve the special marker! */
 "%@ per Month" = "每月 %@";
 
 /* Yearly Subscription Option. Please preserve the special marker! */

From af4c607a60efc15ca21c0583eb99b4087237052e Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Wed, 24 Apr 2024 12:37:38 -0500
Subject: [PATCH 109/547] Display banner view on collaboration view announcing
 retirement

---
 Simplenote.xcodeproj/project.pbxproj          |  4 +++
 Simplenote/BannerView.swift                   | 36 +++++++++++--------
 Simplenote/BannerView.xib                     |  8 +----
 .../SPAddCollaboratorsViewController.m        |  1 +
 .../SPAddCollaboratorsViewController.swift    | 33 +++++++++++++++++
 5 files changed, 61 insertions(+), 21 deletions(-)
 create mode 100644 Simplenote/SPAddCollaboratorsViewController.swift

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index 56300cea5..b0a30bb67 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -518,6 +518,7 @@
 		BABFFF2226CF9094003A4C25 /* WidgetDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = BABFFF2126CF9094003A4C25 /* WidgetDefaults.swift */; };
 		BABFFF2326CF9094003A4C25 /* WidgetDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = BABFFF2126CF9094003A4C25 /* WidgetDefaults.swift */; };
 		BABFFF2426CF9094003A4C25 /* WidgetDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = BABFFF2126CF9094003A4C25 /* WidgetDefaults.swift */; };
+		BAC7264E2BD96E7C0002FA68 /* SPAddCollaboratorsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAC7264D2BD96E7C0002FA68 /* SPAddCollaboratorsViewController.swift */; };
 		BAE08626261282D1009D40CD /* Note+Publish.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAE08625261282D1009D40CD /* Note+Publish.swift */; };
 		BAE63CAF26E05312002BF81A /* NSString+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = B59188C124005B8A0069EF96 /* NSString+Simplenote.swift */; };
 		BAE63CB026E05313002BF81A /* NSString+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = B59188C124005B8A0069EF96 /* NSString+Simplenote.swift */; };
@@ -1181,6 +1182,7 @@
 		BAB576BD2670512C00B0C56F /* NoteWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteWidget.swift; sourceTree = "<group>"; };
 		BAB6C04626BA4CAF007495C4 /* WidgetController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetController.swift; sourceTree = "<group>"; };
 		BABFFF2126CF9094003A4C25 /* WidgetDefaults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetDefaults.swift; sourceTree = "<group>"; };
+		BAC7264D2BD96E7C0002FA68 /* SPAddCollaboratorsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPAddCollaboratorsViewController.swift; sourceTree = "<group>"; };
 		BAE08625261282D1009D40CD /* Note+Publish.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Note+Publish.swift"; sourceTree = "<group>"; };
 		BAF4A96E26DB085D00C51C1D /* NSURLComponents+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSURLComponents+Simplenote.swift"; sourceTree = "<group>"; };
 		BAF8D42226AE10F100CA9383 /* Tag+Widget.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Tag+Widget.swift"; sourceTree = "<group>"; };
@@ -2640,6 +2642,7 @@
 				E2F1497F179D8E1A00DC9690 /* Settings */,
 				E25C39CE17A41F3400B2591A /* SPAddCollaboratorsViewController.h */,
 				E25C39CF17A41F3400B2591A /* SPAddCollaboratorsViewController.m */,
+				BAC7264D2BD96E7C0002FA68 /* SPAddCollaboratorsViewController.swift */,
 				E2EAE38117C2C2D400268682 /* SPEntryListViewController.h */,
 				E2EAE38217C2C2D400268682 /* SPEntryListViewController.m */,
 				E215C790180B115C00AD36B5 /* SPNavigationController.h */,
@@ -3394,6 +3397,7 @@
 				B531090823D0B685002B0998 /* SPSimpleTextPrintFormatter.swift in Sources */,
 				B5CDE61F2150834C00C3FED4 /* Simperium+Simplenote.m in Sources */,
 				A60A1A1E25655D840041701E /* ApplicationShortcutItemType.swift in Sources */,
+				BAC7264E2BD96E7C0002FA68 /* SPAddCollaboratorsViewController.swift in Sources */,
 				B51F6DD12460C3EE0074DDD9 /* AuthenticationValidator.swift in Sources */,
 				B575736A232C567000443C2E /* UIImage+Dynamic.swift in Sources */,
 				A60DF31025A4524100FDADF3 /* PinLockBaseController.swift in Sources */,
diff --git a/Simplenote/BannerView.swift b/Simplenote/BannerView.swift
index ec98db8cc..4ea2d33e6 100644
--- a/Simplenote/BannerView.swift
+++ b/Simplenote/BannerView.swift
@@ -27,7 +27,11 @@ class BannerView: UIView {
         }
     }
 
-    var onPress: (() -> Void)?
+    var onPress: (() -> Void)? {
+        didSet {
+            setupTapRecognizer()
+        }
+    }
 
     var preferredWidth: CGFloat? {
         didSet {
@@ -48,17 +52,17 @@ class BannerView: UIView {
 
     // MARK: - Actions
 
-    @IBAction
-    func bannerWasPresssed() {
+    @objc
+    func bannerWasPressed() {
         onPress?()
     }
-}
 
-// MARK: - Private API(s)
-//
-private extension BannerView {
+    private func setupTapRecognizer() {
+        let tapRecognizer = UITapGestureRecognizer(target: self, action: #selector(bannerWasPressed))
+        backgroundView.addGestureRecognizer(tapRecognizer)
+    }
 
-    func refreshInterface(with style: Style? = nil) {
+    func refreshInterface(with style: BannerStyle? = nil) {
         guard let style else {
             return
         }
@@ -74,28 +78,32 @@ private extension BannerView {
 
 // MARK: - Style
 //
-private struct Style {
+struct BannerStyle {
     let title: String
     let details: String
     let textColor: UIColor
     let backgroundColor: UIColor
 }
 
-private extension Style {
+extension BannerStyle {
     // Leaving these styles in cause we may want them back someday
-    static var sustainer: Style {
-        Style(title: NSLocalizedString("You are a Simplenote Sustainer", comment: "Current Sustainer Title"),
+    static var sustainer: BannerStyle {
+        BannerStyle(title: NSLocalizedString("You are a Simplenote Sustainer", comment: "Current Sustainer Title"),
               details: NSLocalizedString("Thank you for your continued support", comment: "Current Sustainer Details"),
               textColor: .white,
               backgroundColor: .simplenoteSustainerViewBackgroundColor)
     }
 
-    static var notSubscriber: Style {
-        Style(title: NSLocalizedString("Become a Simplenote Sustainer", comment: "Become a Sustainer Title"),
+    static var notSubscriber: BannerStyle {
+        BannerStyle(title: NSLocalizedString("Become a Simplenote Sustainer", comment: "Become a Sustainer Title"),
               details: NSLocalizedString("Support your favorite notes app to help unlock future features", comment: "Become a Sustainer Details"),
               textColor: .white,
               backgroundColor: .simplenoteBlue50Color)
     }
+
+    static var collaborationRetirement: BannerStyle {
+        BannerStyle(title: NSLocalizedString("Collaboration Retirement", comment: "Title annoucning collaboration retirement"), details: NSLocalizedString("Collaboration is being retired and will be disabled for all users July 1st.  For more details tap here", comment: "Description for retiring collaboration feature"), textColor: .white, backgroundColor: .simplenoteBlue50Color)
+    }
 }
 
 // MARK: - Metrics
diff --git a/Simplenote/BannerView.xib b/Simplenote/BannerView.xib
index dc1d2af0e..f667c7744 100644
--- a/Simplenote/BannerView.xib
+++ b/Simplenote/BannerView.xib
@@ -10,12 +10,6 @@
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tapGestureRecognizer id="4op-51-Dvd">
-            <connections>
-                <action selector="bannerWasPresssed" destination="H3q-Rz-XVn" id="Nhw-t0-Xiw"/>
-            </connections>
-        </tapGestureRecognizer>
         <view contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" id="H3q-Rz-XVn" userLabel="BannerView" customClass="BannerView" customModule="Simplenote" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="390" height="72"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -90,10 +84,10 @@
                 <outlet property="titleLabel" destination="xLW-HX-XmH" id="G19-ww-50A"/>
                 <outlet property="topConstraint" destination="SUn-BD-pzh" id="e9F-8I-nc7"/>
                 <outlet property="widthConstraint" destination="kYU-Lx-Xbh" id="yEN-6g-UV9"/>
-                <outletCollection property="gestureRecognizers" destination="4op-51-Dvd" appends="YES" id="gpV-aI-zul"/>
             </connections>
             <point key="canvasLocation" x="87.692307692307693" y="-258.05687203791467"/>
         </view>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
     </objects>
     <resources>
         <image name="simplenote-logo" width="64" height="64"/>
diff --git a/Simplenote/Classes/SPAddCollaboratorsViewController.m b/Simplenote/Classes/SPAddCollaboratorsViewController.m
index 97ec18462..23d4561d9 100644
--- a/Simplenote/Classes/SPAddCollaboratorsViewController.m
+++ b/Simplenote/Classes/SPAddCollaboratorsViewController.m
@@ -49,6 +49,7 @@ - (void)viewWillAppear:(BOOL)animated
 
     [primaryTableView reloadData];
     [self.contactsManager requestAuthorizationIfNeededWithCompletion:nil];
+    [self setupBannerView];
 }
 
 - (void)viewDidAppear:(BOOL)animated
diff --git a/Simplenote/SPAddCollaboratorsViewController.swift b/Simplenote/SPAddCollaboratorsViewController.swift
new file mode 100644
index 000000000..b2e1899b2
--- /dev/null
+++ b/Simplenote/SPAddCollaboratorsViewController.swift
@@ -0,0 +1,33 @@
+//
+//  SPAddCollaboratorsViewController.swift
+//  Simplenote
+//
+//  Created by Charlie Scheer on 4/24/24.
+//  Copyright © 2024 Automattic. All rights reserved.
+//
+
+import Foundation
+import UIKit
+
+extension SPAddCollaboratorsViewController {
+    @objc
+    func setupBannerView() {
+        let bannerView: BannerView = BannerView.instantiateFromNib()
+
+        bannerView.onPress = {
+            print("# Click me")
+        }
+
+        view.addSubview(bannerView)
+
+        bannerView.translatesAutoresizingMaskIntoConstraints = false
+        NSLayoutConstraint.activate([
+            bannerView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+            bannerView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
+            bannerView.bottomAnchor.constraint(equalTo: view.bottomAnchor)
+        ])
+
+        bannerView.refreshInterface(with: .collaborationRetirement)
+
+    }
+}

From 38d0f3ad8312c26528b8b012bff9fb2478618844 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Wed, 24 Apr 2024 15:35:40 -0500
Subject: [PATCH 110/547] Added collaborator retirement banner announcement

---
 .../SPAddCollaboratorsViewController.m        | 16 ++---
 .../Classes/SPEntryListViewController.h       |  4 +-
 .../Classes/SPEntryListViewController.m       | 62 +++++++++----------
 .../SPAddCollaboratorsViewController.swift    | 19 +++++-
 4 files changed, 59 insertions(+), 42 deletions(-)

diff --git a/Simplenote/Classes/SPAddCollaboratorsViewController.m b/Simplenote/Classes/SPAddCollaboratorsViewController.m
index 23d4561d9..6e620202b 100644
--- a/Simplenote/Classes/SPAddCollaboratorsViewController.m
+++ b/Simplenote/Classes/SPAddCollaboratorsViewController.m
@@ -47,7 +47,7 @@ - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
 
-    [primaryTableView reloadData];
+    [self.primaryTableView reloadData];
     [self.contactsManager requestAuthorizationIfNeededWithCompletion:nil];
     [self setupBannerView];
 }
@@ -114,7 +114,7 @@ - (void)setupWithCollaborators:(NSArray *)collaborators
 
     self.dataSource = [[[merged allObjects] sortedArrayUsingSelector:@selector(compareName:)] mutableCopy];
 
-    [primaryTableView reloadData];
+    [self.primaryTableView reloadData];
 }
 
 
@@ -127,7 +127,7 @@ - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
 {
-    if ([tableView isEqual:primaryTableView]) {
+    if ([tableView isEqual:self.primaryTableView]) {
         return self.dataSource.count;
     }
 
@@ -136,7 +136,7 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
 
 - (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section
 {
-    if ([tableView isEqual:primaryTableView]) {
+    if ([tableView isEqual:self.primaryTableView]) {
         return self.dataSource.count > 0 ? NSLocalizedString(@"Current Collaborators", nil) : nil;
     }
 
@@ -145,7 +145,7 @@ - (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInte
 
 - (NSString *)tableView:(UITableView *)tableView titleForFooterInSection:(NSInteger)section
 {
-    if ([tableView isEqual:primaryTableView]) {
+    if ([tableView isEqual:self.primaryTableView]) {
         if (self.dataSource.count > 0) {
             return nil;
         } else {
@@ -161,7 +161,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     SPEntryListCell *cell = (SPEntryListCell *)[super tableView:tableView cellForRowAtIndexPath:indexPath];
     PersonTag *personTag;
 
-    if ([tableView isEqual:primaryTableView]) {
+    if ([tableView isEqual:self.primaryTableView]) {
         personTag = self.dataSource[indexPath.row];
     } else {
         personTag = self.autoCompleteDataSource[indexPath.row];
@@ -192,7 +192,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
     UITableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
     cell.selected = NO;
     
-    if ([tableView isEqual:primaryTableView]) {
+    if ([tableView isEqual:self.primaryTableView]) {
 
         PersonTag *person = self.dataSource[indexPath.row];
         person.active = !person.active;
@@ -228,7 +228,7 @@ - (void)addPersonTag:(PersonTag *)person
         [self.dataSource addObject:person];
         
         entryTextField.text = @"";
-        [primaryTableView reloadSections:[NSIndexSet indexSetWithIndex:0]
+        [self.primaryTableView reloadSections:[NSIndexSet indexSetWithIndex:0]
                       withRowAnimation:UITableViewRowAnimationAutomatic];
         
         [self updateAutoCompleteMatchesForString:nil];
diff --git a/Simplenote/Classes/SPEntryListViewController.h b/Simplenote/Classes/SPEntryListViewController.h
index f3dcd95ec..c54fc8ac2 100644
--- a/Simplenote/Classes/SPEntryListViewController.h
+++ b/Simplenote/Classes/SPEntryListViewController.h
@@ -11,14 +11,14 @@
 
 @interface SPEntryListViewController : UIViewController <UITableViewDataSource, UITableViewDelegate, UITextFieldDelegate> {
     
-    UITableView *primaryTableView;
-    UIView *entryFieldBackground;
     SPTextField *entryTextField;
     UIButton *entryFieldPlusButton;
     UITableView *autoCompleteTableView;
 
 }
 
+@property (nonatomic, strong) UITableView *primaryTableView;
+@property (nonatomic, strong) UIView *entryFieldBackground;
 @property (nonatomic, strong) NSMutableArray *dataSource;
 @property (nonatomic, strong) NSArray *autoCompleteDataSource;
 @property (nonatomic) BOOL showEntryFieldPlusButton;
diff --git a/Simplenote/Classes/SPEntryListViewController.m b/Simplenote/Classes/SPEntryListViewController.m
index 6f9f2adf7..2792e2804 100644
--- a/Simplenote/Classes/SPEntryListViewController.m
+++ b/Simplenote/Classes/SPEntryListViewController.m
@@ -32,7 +32,7 @@ - (void)viewDidLoad {
 - (void)viewWillAppear:(BOOL)animated {
     
     [super viewWillAppear:animated];
-    [primaryTableView reloadData];
+    [self.primaryTableView reloadData];
 }
 
 - (void)setupViews {
@@ -40,25 +40,25 @@ - (void)setupViews {
     // setup views
     CGFloat yOrigin = self.view.safeAreaInsets.top;
     
-    entryFieldBackground = [[UIView alloc] initWithFrame:CGRectMake(0,
+    self.entryFieldBackground = [[UIView alloc] initWithFrame:CGRectMake(0,
                                                                     yOrigin,
                                                                     self.view.frame.size.width,
                                                                     EntryListCellHeight)];
-    entryFieldBackground.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleBottomMargin;
-    [self.view addSubview:entryFieldBackground];
-    
+    self.entryFieldBackground.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleBottomMargin;
+    [self.view addSubview:self.entryFieldBackground];
+
     entryTextField = [[SPTextField alloc] initWithFrame:CGRectMake(EntryListTextFieldSidePadding,
                                                                    0,
-                                                                   entryFieldBackground.frame.size.width - 2 * EntryListTextFieldSidePadding,
-                                                                   entryFieldBackground.frame.size.height)];
+                                                                   self.entryFieldBackground.frame.size.width - 2 * EntryListTextFieldSidePadding,
+                                                                   self.entryFieldBackground.frame.size.height)];
     entryTextField.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleBottomMargin;
     entryTextField.keyboardType = UIKeyboardTypeEmailAddress;
 
     entryTextField.keyboardAppearance = SPUserInterface.isDark ? UIKeyboardAppearanceDark : UIKeyboardAppearanceDefault;
     entryTextField.autocapitalizationType = UITextAutocapitalizationTypeNone;
     entryTextField.delegate = self;
-    [entryFieldBackground addSubview:entryTextField];
-    
+    [self.entryFieldBackground addSubview:entryTextField];
+
     entryFieldPlusButton = [UIButton buttonWithType:UIButtonTypeCustom];
     UIImage *pickerImage = [UIImage imageWithName:UIImageNameAdd];
     [entryFieldPlusButton setImage:pickerImage forState:UIControlStateNormal];
@@ -70,17 +70,17 @@ - (void)setupViews {
     entryTextField.rightViewMode = UITextFieldViewModeAlways;
     
     
-    primaryTableView = [[UITableView alloc] initWithFrame:CGRectMake(0, yOrigin + entryTextField.frame.size.height,
+    self.primaryTableView = [[UITableView alloc] initWithFrame:CGRectMake(0, yOrigin + entryTextField.frame.size.height,
                                                                      self.view.frame.size.width, self.view.frame.size.height - (yOrigin + entryTextField.frame.size.height))
                                                     style:UITableViewStyleGrouped];
-    primaryTableView.rowHeight = EntryListCellHeight;
-    primaryTableView.delegate = self;
-    primaryTableView.dataSource = self;
-    primaryTableView.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
-    [self.view addSubview:primaryTableView];
-    
+    self.primaryTableView.rowHeight = EntryListCellHeight;
+    self.primaryTableView.delegate = self;
+    self.primaryTableView.dataSource = self;
+    self.primaryTableView.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
+    [self.view addSubview:self.primaryTableView];
+
     
-    [primaryTableView registerClass:[SPEntryListCell class]
+    [self.primaryTableView registerClass:[SPEntryListCell class]
              forCellReuseIdentifier:cellIdentifier];
     
     [autoCompleteTableView registerClass:[SPEntryListAutoCompleteCell class]
@@ -124,7 +124,7 @@ - (void)applyDefaultStyle {
     self.view.backgroundColor = tableBackgroundColor;
     
     // entry field
-    entryFieldBackground.backgroundColor = tableBackgroundColor;
+    self.entryFieldBackground.backgroundColor = tableBackgroundColor;
     entryTextField.backgroundColor = [UIColor clearColor];
     entryTextField.font = [UIFont preferredFontForTextStyle:UIFontTextStyleBody];
     entryTextField.textColor = [UIColor simplenoteTextColor];
@@ -132,15 +132,15 @@ - (void)applyDefaultStyle {
     
     CALayer *entryFieldBorder = [[CALayer alloc] init];
     entryFieldBorder.frame = CGRectMake(0,
-                                        entryFieldBackground.bounds.size.height - 1.0 / [[UIScreen mainScreen] scale],
+                                        self.entryFieldBackground.bounds.size.height - 1.0 / [[UIScreen mainScreen] scale],
                                         MAX(self.view.frame.size.width, self.view.frame.size.height),
                                         1.0 / [[UIScreen mainScreen] scale]);
     entryFieldBorder.backgroundColor = tableSeparatorColor.CGColor;
-    [entryFieldBackground.layer addSublayer:entryFieldBorder];
-    
+    [self.entryFieldBackground.layer addSublayer:entryFieldBorder];
+
     // tableview
-    primaryTableView.backgroundColor = [UIColor clearColor];
-    primaryTableView.separatorColor = tableSeparatorColor;
+    self.primaryTableView.backgroundColor = [UIColor clearColor];
+    self.primaryTableView.separatorColor = tableSeparatorColor;
     autoCompleteTableView.backgroundColor = backgroundColor;
     autoCompleteTableView.separatorColor = tableSeparatorColor;
 }
@@ -169,7 +169,7 @@ - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
     
-    if ([tableView isEqual:primaryTableView])
+    if ([tableView isEqual:self.primaryTableView])
         return 0; // this is implemented by subclassing
     else if ([tableView isEqual:autoCompleteTableView])
         return _autoCompleteDataSource.count;
@@ -192,8 +192,8 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     
     UITableViewCell *finalCell;
     
-    if ([tableView isEqual:primaryTableView]) {
-        
+    if ([tableView isEqual:self.primaryTableView]) {
+
         
         SPEntryListCell *cell = (SPEntryListCell *)[tableView dequeueReusableCellWithIdentifier:cellIdentifier];
         if (!cell) {
@@ -220,7 +220,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 
 - (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath {
     
-    return [tableView isEqual:primaryTableView] ? YES : NO;
+    return [tableView isEqual:self.primaryTableView] ? YES : NO;
 }
 
 - (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath {
@@ -238,10 +238,10 @@ - (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEd
     if (editingStyle == UITableViewCellEditingStyleDelete) {
 
         [self removeItemFromDataSourceAtIndexPath:indexPath];
-        [primaryTableView beginUpdates];
-        [primaryTableView deleteRowsAtIndexPaths:@[indexPath]
+        [self.primaryTableView beginUpdates];
+        [self.primaryTableView deleteRowsAtIndexPaths:@[indexPath]
                                 withRowAnimation:UITableViewRowAnimationLeft];
-        [primaryTableView endUpdates];
+        [self.primaryTableView endUpdates];
     }
 }
 - (void)removeItemFromDataSourceAtIndexPath:(NSIndexPath *)indexPath {
@@ -295,7 +295,7 @@ - (void)updatedAutoCompleteMatches {
 
 - (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView {
     
-    if ([scrollView isEqual:primaryTableView])
+    if ([scrollView isEqual:self.primaryTableView])
         [entryTextField resignFirstResponder];    
 }
 
diff --git a/Simplenote/SPAddCollaboratorsViewController.swift b/Simplenote/SPAddCollaboratorsViewController.swift
index b2e1899b2..f0dba4f67 100644
--- a/Simplenote/SPAddCollaboratorsViewController.swift
+++ b/Simplenote/SPAddCollaboratorsViewController.swift
@@ -21,10 +21,27 @@ extension SPAddCollaboratorsViewController {
         view.addSubview(bannerView)
 
         bannerView.translatesAutoresizingMaskIntoConstraints = false
+        primaryTableView.translatesAutoresizingMaskIntoConstraints = false
+        entryFieldBackground.translatesAutoresizingMaskIntoConstraints = false
+
         NSLayoutConstraint.activate([
             bannerView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
             bannerView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
-            bannerView.bottomAnchor.constraint(equalTo: view.bottomAnchor)
+            bannerView.topAnchor.constraint(equalTo: view.topAnchor),
+            bannerView.bottomAnchor.constraint(equalTo: entryFieldBackground.topAnchor)
+        ])
+
+        NSLayoutConstraint.activate([
+            entryFieldBackground.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+            entryFieldBackground.trailingAnchor.constraint(equalTo: view.trailingAnchor),
+            entryFieldBackground.heightAnchor.constraint(equalToConstant: 44)
+        ])
+
+        NSLayoutConstraint.activate([
+            primaryTableView.topAnchor.constraint(equalTo: entryFieldBackground.bottomAnchor),
+            primaryTableView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+            primaryTableView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
+            primaryTableView.bottomAnchor.constraint(equalTo: view.bottomAnchor)
         ])
 
         bannerView.refreshInterface(with: .collaborationRetirement)

From 725b9fc4b9c3c86dc3fc4abd50af51c84aca2d60 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Wed, 24 Apr 2024 15:43:16 -0500
Subject: [PATCH 111/547] Refactor creation and storage of banner view in
 collaboratorsVC

---
 .../Classes/SPAddCollaboratorsViewController.h       |  2 ++
 .../Classes/SPAddCollaboratorsViewController.m       |  1 +
 Simplenote/Classes/SPEntryListViewController.h       |  2 ++
 Simplenote/Classes/SPEntryListViewController.m       |  1 -
 Simplenote/SPAddCollaboratorsViewController.swift    | 12 ++++++------
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Simplenote/Classes/SPAddCollaboratorsViewController.h b/Simplenote/Classes/SPAddCollaboratorsViewController.h
index 83c11be63..fe6ad6dce 100644
--- a/Simplenote/Classes/SPAddCollaboratorsViewController.h
+++ b/Simplenote/Classes/SPAddCollaboratorsViewController.h
@@ -5,6 +5,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @class SPAddCollaboratorsViewController;
+@class BannerView;
 @protocol SPCollaboratorDelegate <NSObject>
 
 @required
@@ -20,6 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface SPAddCollaboratorsViewController : SPEntryListViewController
 
+@property (nonatomic, strong) BannerView *bannerView;
 @property (nonatomic, nullable, weak) id<SPCollaboratorDelegate> collaboratorDelegate;
 
 - (void)setupWithCollaborators:(NSArray<NSString *> *)collaborators;
diff --git a/Simplenote/Classes/SPAddCollaboratorsViewController.m b/Simplenote/Classes/SPAddCollaboratorsViewController.m
index 6e620202b..18bc871f5 100644
--- a/Simplenote/Classes/SPAddCollaboratorsViewController.m
+++ b/Simplenote/Classes/SPAddCollaboratorsViewController.m
@@ -50,6 +50,7 @@ - (void)viewWillAppear:(BOOL)animated
     [self.primaryTableView reloadData];
     [self.contactsManager requestAuthorizationIfNeededWithCompletion:nil];
     [self setupBannerView];
+    [self setupViewContraints];
 }
 
 - (void)viewDidAppear:(BOOL)animated
diff --git a/Simplenote/Classes/SPEntryListViewController.h b/Simplenote/Classes/SPEntryListViewController.h
index c54fc8ac2..f4cc336a8 100644
--- a/Simplenote/Classes/SPEntryListViewController.h
+++ b/Simplenote/Classes/SPEntryListViewController.h
@@ -9,6 +9,8 @@
 #import <UIKit/UIKit.h>
 #import "SPTextField.h"
 
+static CGFloat const EntryListCellHeight = 44;
+
 @interface SPEntryListViewController : UIViewController <UITableViewDataSource, UITableViewDelegate, UITextFieldDelegate> {
     
     SPTextField *entryTextField;
diff --git a/Simplenote/Classes/SPEntryListViewController.m b/Simplenote/Classes/SPEntryListViewController.m
index 2792e2804..7ec1a1c86 100644
--- a/Simplenote/Classes/SPEntryListViewController.m
+++ b/Simplenote/Classes/SPEntryListViewController.m
@@ -14,7 +14,6 @@
 static NSString *cellIdentifier = @"primaryCell";
 static NSString *autoCompleteCellIdentifier = @"autoCompleteCell";
 static CGFloat const EntryListTextFieldSidePadding = 15;
-static CGFloat const EntryListCellHeight = 44;
 
 @implementation SPEntryListViewController
 
diff --git a/Simplenote/SPAddCollaboratorsViewController.swift b/Simplenote/SPAddCollaboratorsViewController.swift
index f0dba4f67..2d8153214 100644
--- a/Simplenote/SPAddCollaboratorsViewController.swift
+++ b/Simplenote/SPAddCollaboratorsViewController.swift
@@ -12,14 +12,17 @@ import UIKit
 extension SPAddCollaboratorsViewController {
     @objc
     func setupBannerView() {
-        let bannerView: BannerView = BannerView.instantiateFromNib()
-
+        bannerView = BannerView.instantiateFromNib()
+        bannerView.refreshInterface(with: .collaborationRetirement)
         bannerView.onPress = {
             print("# Click me")
         }
 
         view.addSubview(bannerView)
+    }
 
+    @objc
+    func setupViewContraints() {
         bannerView.translatesAutoresizingMaskIntoConstraints = false
         primaryTableView.translatesAutoresizingMaskIntoConstraints = false
         entryFieldBackground.translatesAutoresizingMaskIntoConstraints = false
@@ -34,7 +37,7 @@ extension SPAddCollaboratorsViewController {
         NSLayoutConstraint.activate([
             entryFieldBackground.leadingAnchor.constraint(equalTo: view.leadingAnchor),
             entryFieldBackground.trailingAnchor.constraint(equalTo: view.trailingAnchor),
-            entryFieldBackground.heightAnchor.constraint(equalToConstant: 44)
+            entryFieldBackground.heightAnchor.constraint(equalToConstant: EntryListCellHeight)
         ])
 
         NSLayoutConstraint.activate([
@@ -43,8 +46,5 @@ extension SPAddCollaboratorsViewController {
             primaryTableView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
             primaryTableView.bottomAnchor.constraint(equalTo: view.bottomAnchor)
         ])
-
-        bannerView.refreshInterface(with: .collaborationRetirement)
-
     }
 }

From 0a029e5727eb46f644db052139ad9b8aecabbbd0 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Wed, 24 Apr 2024 15:44:03 -0500
Subject: [PATCH 112/547] Added todo for collaborators banner view

---
 Simplenote/SPAddCollaboratorsViewController.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Simplenote/SPAddCollaboratorsViewController.swift b/Simplenote/SPAddCollaboratorsViewController.swift
index 2d8153214..23e14fe8b 100644
--- a/Simplenote/SPAddCollaboratorsViewController.swift
+++ b/Simplenote/SPAddCollaboratorsViewController.swift
@@ -15,7 +15,7 @@ extension SPAddCollaboratorsViewController {
         bannerView = BannerView.instantiateFromNib()
         bannerView.refreshInterface(with: .collaborationRetirement)
         bannerView.onPress = {
-            print("# Click me")
+            //TODO: load blog post for collaborator retirement details
         }
 
         view.addSubview(bannerView)

From b5ff293fd2290877a3800e23623fe60795f7ee26 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Wed, 24 Apr 2024 15:47:02 -0500
Subject: [PATCH 113/547] Moved setup of banner view tap recognizer to
 wakeFromNib

---
 Simplenote/BannerView.swift | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Simplenote/BannerView.swift b/Simplenote/BannerView.swift
index 4ea2d33e6..9d562a06d 100644
--- a/Simplenote/BannerView.swift
+++ b/Simplenote/BannerView.swift
@@ -27,11 +27,7 @@ class BannerView: UIView {
         }
     }
 
-    var onPress: (() -> Void)? {
-        didSet {
-            setupTapRecognizer()
-        }
-    }
+    var onPress: (() -> Void)?
 
     var preferredWidth: CGFloat? {
         didSet {
@@ -48,6 +44,7 @@ class BannerView: UIView {
     override func awakeFromNib() {
         super.awakeFromNib()
         refreshInterface()
+        setupTapRecognizer()
     }
 
     // MARK: - Actions

From fc7f5c598381c13d093df00ac95a084556cb48fb Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Wed, 24 Apr 2024 15:49:52 -0500
Subject: [PATCH 114/547] Moved BannerView style to exist in the BannerView
 namespace

---
 Simplenote/BannerView.swift | 51 ++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/Simplenote/BannerView.swift b/Simplenote/BannerView.swift
index 9d562a06d..2b5a6afcc 100644
--- a/Simplenote/BannerView.swift
+++ b/Simplenote/BannerView.swift
@@ -59,7 +59,7 @@ class BannerView: UIView {
         backgroundView.addGestureRecognizer(tapRecognizer)
     }
 
-    func refreshInterface(with style: BannerStyle? = nil) {
+    func refreshInterface(with style: BannerView.Style? = nil) {
         guard let style else {
             return
         }
@@ -71,36 +71,35 @@ class BannerView: UIView {
         backgroundView.backgroundColor = style.backgroundColor
         backgroundView.layer.cornerRadius = Metrics.defaultCornerRadius
     }
-}
 
-// MARK: - Style
-//
-struct BannerStyle {
-    let title: String
-    let details: String
-    let textColor: UIColor
-    let backgroundColor: UIColor
-}
+    // MARK: - Style
+    //
+    struct Style {
+        let title: String
+        let details: String
+        let textColor: UIColor
+        let backgroundColor: UIColor
+
+        // Leaving these styles in cause we may want them back someday
+        static var sustainer: Style {
+            Style(title: NSLocalizedString("You are a Simplenote Sustainer", comment: "Current Sustainer Title"),
+                  details: NSLocalizedString("Thank you for your continued support", comment: "Current Sustainer Details"),
+                  textColor: .white,
+                  backgroundColor: .simplenoteSustainerViewBackgroundColor)
+        }
 
-extension BannerStyle {
-    // Leaving these styles in cause we may want them back someday
-    static var sustainer: BannerStyle {
-        BannerStyle(title: NSLocalizedString("You are a Simplenote Sustainer", comment: "Current Sustainer Title"),
-              details: NSLocalizedString("Thank you for your continued support", comment: "Current Sustainer Details"),
-              textColor: .white,
-              backgroundColor: .simplenoteSustainerViewBackgroundColor)
-    }
+        static var notSubscriber: Style {
+            Style(title: NSLocalizedString("Become a Simplenote Sustainer", comment: "Become a Sustainer Title"),
+                  details: NSLocalizedString("Support your favorite notes app to help unlock future features", comment: "Become a Sustainer Details"),
+                  textColor: .white,
+                  backgroundColor: .simplenoteBlue50Color)
+        }
 
-    static var notSubscriber: BannerStyle {
-        BannerStyle(title: NSLocalizedString("Become a Simplenote Sustainer", comment: "Become a Sustainer Title"),
-              details: NSLocalizedString("Support your favorite notes app to help unlock future features", comment: "Become a Sustainer Details"),
-              textColor: .white,
-              backgroundColor: .simplenoteBlue50Color)
+        static var collaborationRetirement: Style {
+            Style(title: NSLocalizedString("Collaboration Retirement", comment: "Title annoucning collaboration retirement"), details: NSLocalizedString("Collaboration is being retired and will be disabled for all users July 1st.  For more details tap here", comment: "Description for retiring collaboration feature"), textColor: .white, backgroundColor: .simplenoteBlue50Color)
+        }
     }
 
-    static var collaborationRetirement: BannerStyle {
-        BannerStyle(title: NSLocalizedString("Collaboration Retirement", comment: "Title annoucning collaboration retirement"), details: NSLocalizedString("Collaboration is being retired and will be disabled for all users July 1st.  For more details tap here", comment: "Description for retiring collaboration feature"), textColor: .white, backgroundColor: .simplenoteBlue50Color)
-    }
 }
 
 // MARK: - Metrics

From e58f252af5bbdaac9a87bd0cc8ff00820bcf139d Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Wed, 24 Apr 2024 15:56:28 -0500
Subject: [PATCH 115/547] Added url to collaborator retirement post

---
 Simplenote/SPAddCollaboratorsViewController.swift | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Simplenote/SPAddCollaboratorsViewController.swift b/Simplenote/SPAddCollaboratorsViewController.swift
index 23e14fe8b..8b370606f 100644
--- a/Simplenote/SPAddCollaboratorsViewController.swift
+++ b/Simplenote/SPAddCollaboratorsViewController.swift
@@ -15,7 +15,11 @@ extension SPAddCollaboratorsViewController {
         bannerView = BannerView.instantiateFromNib()
         bannerView.refreshInterface(with: .collaborationRetirement)
         bannerView.onPress = {
-            //TODO: load blog post for collaborator retirement details
+            guard let url = URL(string: "https://simplenote.com/2024/05/01/collaboration-feature-retirement") else {
+                return
+            }
+
+            UIApplication.shared.open(url)
         }
 
         view.addSubview(bannerView)

From 1088ed4239b31b2472b0574f7412dd891dda2688 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Wed, 24 Apr 2024 15:57:53 -0500
Subject: [PATCH 116/547] Updated banner view collaboration retirement message

---
 Simplenote/BannerView.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Simplenote/BannerView.swift b/Simplenote/BannerView.swift
index 2b5a6afcc..0b772e9f7 100644
--- a/Simplenote/BannerView.swift
+++ b/Simplenote/BannerView.swift
@@ -96,7 +96,7 @@ class BannerView: UIView {
         }
 
         static var collaborationRetirement: Style {
-            Style(title: NSLocalizedString("Collaboration Retirement", comment: "Title annoucning collaboration retirement"), details: NSLocalizedString("Collaboration is being retired and will be disabled for all users July 1st.  For more details tap here", comment: "Description for retiring collaboration feature"), textColor: .white, backgroundColor: .simplenoteBlue50Color)
+            Style(title: NSLocalizedString("Collaboration Retirement", comment: "Title annoucning collaboration retirement"), details: NSLocalizedString("Collaboration is retiring on July 1st.  For more details tap here.", comment: "Description for retiring collaboration feature"), textColor: .white, backgroundColor: .simplenoteBlue50Color)
         }
     }
 

From 50face7cb2296ac65f9dc2a3f876c0f80986f8e3 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Mon, 29 Apr 2024 11:52:45 -0600
Subject: [PATCH 117/547] Added privacy manifest details to Simplenote project

---
 Simplenote.xcodeproj/project.pbxproj          | 12 +++++++
 Simplenote/Resources/PrivacyInfo.xcprivacy    | 33 +++++++++++++++++++
 .../Supporting Files/PrivacyInfo.xcprivacy    | 17 ++++++++++
 .../Supporting Files/PrivacyInfo.xcprivacy    | 17 ++++++++++
 4 files changed, 79 insertions(+)
 create mode 100644 Simplenote/Resources/PrivacyInfo.xcprivacy
 create mode 100644 SimplenoteIntents/Supporting Files/PrivacyInfo.xcprivacy
 create mode 100644 SimplenoteWidgets/Supporting Files/PrivacyInfo.xcprivacy

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index 56300cea5..e6cf3d060 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -462,6 +462,9 @@
 		BA608EF526BB6E0200A9D94E /* ListWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA608EF426BB6E0200A9D94E /* ListWidget.swift */; };
 		BA608EF726BB6E7400A9D94E /* ListWidgetProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA608EF626BB6E7400A9D94E /* ListWidgetProvider.swift */; };
 		BA608EF926BB6F4C00A9D94E /* ListWidgetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA608EF826BB6F4C00A9D94E /* ListWidgetView.swift */; };
+		BA69A5192BE0127C0096E50F /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = BA69A5182BE0127C0096E50F /* PrivacyInfo.xcprivacy */; };
+		BA69A51B2BE015640096E50F /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = BA69A51A2BE015640096E50F /* PrivacyInfo.xcprivacy */; };
+		BA69A51D2BE015BF0096E50F /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = BA69A51C2BE015BF0096E50F /* PrivacyInfo.xcprivacy */; };
 		BA6DA19126DB5F1B000464C8 /* URLComponents.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA6DA19026DB5F1B000464C8 /* URLComponents.swift */; };
 		BA6DA19226DB5F1B000464C8 /* URLComponents.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA6DA19026DB5F1B000464C8 /* URLComponents.swift */; };
 		BA7071E526BB68A300D5DFF0 /* ListWidgetIntent.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = BA7071E426BB68A300D5DFF0 /* ListWidgetIntent.intentdefinition */; };
@@ -1145,6 +1148,9 @@
 		BA608EF426BB6E0200A9D94E /* ListWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListWidget.swift; sourceTree = "<group>"; };
 		BA608EF626BB6E7400A9D94E /* ListWidgetProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListWidgetProvider.swift; sourceTree = "<group>"; };
 		BA608EF826BB6F4C00A9D94E /* ListWidgetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListWidgetView.swift; sourceTree = "<group>"; };
+		BA69A5182BE0127C0096E50F /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
+		BA69A51A2BE015640096E50F /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
+		BA69A51C2BE015BF0096E50F /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		BA6DA19026DB5F1B000464C8 /* URLComponents.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLComponents.swift; sourceTree = "<group>"; };
 		BA7071E426BB68A300D5DFF0 /* ListWidgetIntent.intentdefinition */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; path = ListWidgetIntent.intentdefinition; sourceTree = "<group>"; };
 		BA75D87D26C0843600883FFA /* Text+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Text+Simplenote.swift"; sourceTree = "<group>"; };
@@ -1395,6 +1401,7 @@
 				BA8661D526B3A00B00466746 /* SimplenoteIntents-DistributionAlpha.entitlements */,
 				BA8661D826B3A0B000466746 /* SimplenoteIntents-DistributionInternal.entitlements */,
 				BA8661D726B3A0A000466746 /* SimplenoteIntents-Release.entitlements */,
+				BA69A51C2BE015BF0096E50F /* PrivacyInfo.xcprivacy */,
 			);
 			path = "Supporting Files";
 			sourceTree = "<group>";
@@ -2357,6 +2364,7 @@
 				241709C7266829CD00F6E2B1 /* SimplenoteWidgetsExtension-DistributionAlpha.entitlements */,
 				241709D126682AED00F6E2B1 /* SimplenoteWidgetsExtension-DistributionInternal.entitlements */,
 				241709BB266827A800F6E2B1 /* SimplenoteWidgetsExtension-Release.entitlements */,
+				BA69A51A2BE015640096E50F /* PrivacyInfo.xcprivacy */,
 			);
 			path = "Supporting Files";
 			sourceTree = "<group>";
@@ -2693,6 +2701,7 @@
 				B5767F9022FDF2B900052D81 /* LaunchScreen.storyboard */,
 				E280453E180DAE0200670073 /* Localizable.strings */,
 				467D9C5C1788A4FB00785EF3 /* Simplenote.xcdatamodeld */,
+				BA69A5182BE0127C0096E50F /* PrivacyInfo.xcprivacy */,
 			);
 			path = Resources;
 			sourceTree = "<group>";
@@ -3049,6 +3058,7 @@
 				A6C0DFE825C18E3300B9BE39 /* NoteEditorTagListViewController.xib in Resources */,
 				A628BEB725ECD97900121B64 /* SignupVerificationViewController.xib in Resources */,
 				B56A695822F9CD1500B90398 /* SPOnboardingViewController.xib in Resources */,
+				BA69A5192BE0127C0096E50F /* PrivacyInfo.xcprivacy in Resources */,
 				A61471B825D70C190065D849 /* PopoverViewController.xib in Resources */,
 				A6C0589524AD2B8F006BC572 /* SPNoteHistoryViewController.xib in Resources */,
 				A6A648A525AC3AC00074A094 /* AccountVerificationViewController.xib in Resources */,
@@ -3099,6 +3109,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				BA69A51D2BE015BF0096E50F /* PrivacyInfo.xcprivacy in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3106,6 +3117,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				BA69A51B2BE015640096E50F /* PrivacyInfo.xcprivacy in Resources */,
 				BAFA93E1265DCFCD0009DCFB /* Assets.xcassets in Resources */,
 				BAFA93FA265DE8920009DCFB /* Images.xcassets in Resources */,
 			);
diff --git a/Simplenote/Resources/PrivacyInfo.xcprivacy b/Simplenote/Resources/PrivacyInfo.xcprivacy
new file mode 100644
index 000000000..8ee414ce4
--- /dev/null
+++ b/Simplenote/Resources/PrivacyInfo.xcprivacy
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>1C8F.1</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>3B52.1</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryDiskSpace</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>7D9E.1</string>
+			</array>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/SimplenoteIntents/Supporting Files/PrivacyInfo.xcprivacy b/SimplenoteIntents/Supporting Files/PrivacyInfo.xcprivacy
new file mode 100644
index 000000000..dd6881b47
--- /dev/null
+++ b/SimplenoteIntents/Supporting Files/PrivacyInfo.xcprivacy	
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>1C8F.1</string>
+			</array>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/SimplenoteWidgets/Supporting Files/PrivacyInfo.xcprivacy b/SimplenoteWidgets/Supporting Files/PrivacyInfo.xcprivacy
new file mode 100644
index 000000000..dd6881b47
--- /dev/null
+++ b/SimplenoteWidgets/Supporting Files/PrivacyInfo.xcprivacy	
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>1C8F.1</string>
+			</array>
+		</dict>
+	</array>
+</dict>
+</plist>

From 6cc0da4ca9a4db5d70581f23fdb4d17e2ce25436 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Mon, 29 Apr 2024 12:06:25 -0600
Subject: [PATCH 118/547] Updated gem file

---
 Gemfile.lock | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8f14d3098..cddfae860 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,7 +5,7 @@ GEM
       base64
       nkf
       rexml
-    activesupport (7.1.3)
+    activesupport (7.1.3.2)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -24,25 +24,25 @@ GEM
     ast (2.4.2)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.911.0)
-    aws-sdk-core (3.191.6)
+    aws-partitions (1.921.0)
+    aws-sdk-core (3.193.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.78.0)
-      aws-sdk-core (~> 3, >= 3.191.0)
+    aws-sdk-kms (1.80.0)
+      aws-sdk-core (~> 3, >= 3.193.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.146.1)
-      aws-sdk-core (~> 3, >= 3.191.0)
+    aws-sdk-s3 (1.148.0)
+      aws-sdk-core (~> 3, >= 3.193.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.2.0)
-    bigdecimal (3.1.6)
-    buildkit (1.5.0)
+    bigdecimal (3.1.7)
+    buildkit (1.6.0)
       sawyer (>= 0.6)
     chroma (0.2.0)
     claide (1.1.0)
@@ -137,8 +137,7 @@ GEM
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.6.20240107)
     dotenv (2.8.1)
-    drb (2.2.0)
-      ruby2_keywords
+    drb (2.2.1)
     emoji_regex (3.2.3)
     escape (0.0.4)
     ethon (0.16.0)
@@ -283,7 +282,7 @@ GEM
     http-cookie (1.0.5)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.14.1)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     java-properties (0.3.0)
     jmespath (1.6.2)
@@ -297,7 +296,7 @@ GEM
     language_server-protocol (3.17.0.3)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
-    minitest (5.22.2)
+    minitest (5.22.3)
     molinillo (0.8.0)
     multi_json (1.15.0)
     multipart-post (2.4.0)
@@ -308,16 +307,16 @@ GEM
     netrc (0.11.0)
     nkf (0.2.0)
     no_proxy_fix (0.1.2)
-    nokogiri (1.15.4-arm64-darwin)
+    nokogiri (1.15.6-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-linux)
+    nokogiri (1.15.6-x86_64-linux)
       racc (~> 1.4)
     octokit (6.1.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     open4 (1.3.4)
     options (2.3.2)
-    optparse (0.4.0)
+    optparse (0.5.0)
     os (1.1.4)
     ox (2.14.17)
     parallel (1.24.0)
@@ -332,7 +331,7 @@ GEM
     racc (1.7.3)
     rainbow (3.1.1)
     rake (13.2.1)
-    rake-compiler (1.2.5)
+    rake-compiler (1.2.7)
       rake
     rchardet (1.8.0)
     regexp_parser (2.9.0)

From 1f4fc831f1ae179fba50b1d8d7c570ff13d9508e Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Mon, 29 Apr 2024 12:28:39 -0600
Subject: [PATCH 119/547] updated gemfile.lock

---
 Gemfile.lock | 46 +++++++++++++++-------------------------------
 1 file changed, 15 insertions(+), 31 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index cddfae860..1cd1c53e0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -50,12 +50,12 @@ GEM
       cork
       nap
       open4 (~> 1.3)
-    cocoapods (1.14.1)
+    cocoapods (1.15.2)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.14.1)
+      cocoapods-core (= 1.15.2)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 2.0)
+      cocoapods-downloader (>= 2.1, < 3.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-trunk (>= 1.6.0, < 2.0)
@@ -68,7 +68,7 @@ GEM
       nap (~> 1.0)
       ruby-macho (>= 2.3.0, < 3.0)
       xcodeproj (>= 1.23.0, < 2.0)
-    cocoapods-core (1.14.1)
+    cocoapods-core (1.15.2)
       activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
@@ -79,7 +79,7 @@ GEM
       public_suffix (~> 4.0)
       typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.5)
-    cocoapods-downloader (2.0)
+    cocoapods-downloader (2.1)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.1)
@@ -108,29 +108,16 @@ GEM
       no_proxy_fix
       octokit (>= 4.0)
       terminal-table (>= 1, < 4)
-    danger-dangermattic (1.0.0)
+    danger-dangermattic (1.0.2)
       danger (~> 9.4)
-      danger-junit (~> 1.0)
       danger-plugin-api (~> 1.0)
       danger-rubocop (~> 0.12)
-      danger-swiftlint (~> 0.35)
-      danger-xcode_summary (~> 1.0)
-      rubocop (~> 1.60)
-    danger-junit (1.0.2)
-      danger (> 2.0)
-      ox (~> 2.0)
+      rubocop (~> 1.61)
     danger-plugin-api (1.0.0)
       danger (> 2.0)
     danger-rubocop (0.12.0)
       danger
       rubocop (~> 1.0)
-    danger-swiftlint (0.35.0)
-      danger
-      rake (> 10)
-      thor (~> 1.0.0)
-    danger-xcode_summary (1.3.0)
-      danger-plugin-api (~> 1.0)
-      xcresult (~> 0.2)
     declarative (0.0.20)
     diffy (3.4.2)
     digest-crc (0.6.5)
@@ -216,7 +203,7 @@ GEM
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
     fastlane-plugin-appcenter (1.11.1)
-    fastlane-plugin-sentry (1.14.0)
+    fastlane-plugin-sentry (1.22.0)
       os (~> 1.1, >= 1.1.4)
     fastlane-plugin-wpmreleasetoolkit (9.4.0)
       activesupport (>= 6.1.7.1)
@@ -318,9 +305,8 @@ GEM
     options (2.3.2)
     optparse (0.5.0)
     os (1.1.4)
-    ox (2.14.17)
     parallel (1.24.0)
-    parser (3.3.0.5)
+    parser (3.3.1.0)
       ast (~> 2.4.1)
       racc
     plist (3.7.1)
@@ -343,7 +329,7 @@ GEM
     rexml (3.2.6)
     rmagick (3.2.0)
     rouge (2.0.7)
-    rubocop (1.60.2)
+    rubocop (1.63.4)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -351,11 +337,11 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
     ruby-macho (2.5.1)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
@@ -375,13 +361,12 @@ GEM
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    thor (1.0.1)
     trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
     tty-screen (0.8.2)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
-    typhoeus (1.4.0)
+    typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -399,7 +384,6 @@ GEM
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
-    xcresult (0.2.1)
 
 PLATFORMS
   arm64-darwin-21
@@ -417,4 +401,4 @@ DEPENDENCIES
   rmagick (~> 3.2.0)
 
 BUNDLED WITH
-   2.4.13
+   2.5.4

From 8d9231941b4cc18fdacee95fc0e11aab0b4273ca Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Mon, 29 Apr 2024 12:35:20 -0600
Subject: [PATCH 120/547] updated gems

---
 Gemfile      |  4 ++--
 Gemfile.lock | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index b78fff34a..a2653bc3a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,9 +6,9 @@ source 'https://rubygems.org'
 gem 'cocoapods', '~> 1.14'
 gem 'danger-dangermattic', '~> 1.0'
 gem 'fastlane', '~> 2'
-gem 'fastlane-plugin-appcenter', '~> 1.11'
+gem 'fastlane-plugin-appcenter', '~> 2.1.2'
 gem 'fastlane-plugin-sentry', '~> 1.6'
-gem 'fastlane-plugin-wpmreleasetoolkit', '~> 9.1'
+gem 'fastlane-plugin-wpmreleasetoolkit', '~> 11.0.1'
 
 group :screenshots, optional: true do
   gem 'rmagick', '~> 3.2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 1cd1c53e0..5f2447ee7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -202,10 +202,10 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
-    fastlane-plugin-appcenter (1.11.1)
+    fastlane-plugin-appcenter (2.1.2)
     fastlane-plugin-sentry (1.22.0)
       os (~> 1.1, >= 1.1.4)
-    fastlane-plugin-wpmreleasetoolkit (9.4.0)
+    fastlane-plugin-wpmreleasetoolkit (11.0.1)
       activesupport (>= 6.1.7.1)
       buildkit (~> 1.5)
       chroma (= 0.2.0)
@@ -214,7 +214,7 @@ GEM
       git (~> 1.3)
       google-cloud-storage (~> 1.31)
       java-properties (~> 0.3.0)
-      nokogiri (~> 1.11, < 1.16)
+      nokogiri (~> 1.11, < 1.17)
       octokit (~> 6.1)
       parallel (~> 1.14)
       plist (~> 3.1)
@@ -294,9 +294,9 @@ GEM
     netrc (0.11.0)
     nkf (0.2.0)
     no_proxy_fix (0.1.2)
-    nokogiri (1.15.6-arm64-darwin)
+    nokogiri (1.16.4-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.15.6-x86_64-linux)
+    nokogiri (1.16.4-x86_64-linux)
       racc (~> 1.4)
     octokit (6.1.1)
       faraday (>= 1, < 3)
@@ -395,9 +395,9 @@ DEPENDENCIES
   cocoapods (~> 1.14)
   danger-dangermattic (~> 1.0)
   fastlane (~> 2)
-  fastlane-plugin-appcenter (~> 1.11)
+  fastlane-plugin-appcenter (~> 2.1.2)
   fastlane-plugin-sentry (~> 1.6)
-  fastlane-plugin-wpmreleasetoolkit (~> 9.1)
+  fastlane-plugin-wpmreleasetoolkit (~> 11.0.1)
   rmagick (~> 3.2.0)
 
 BUNDLED WITH

From bd5f56ea61e805e3d04fa10c10abcf7c98f4cb61 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Tue, 30 Apr 2024 10:03:47 -0600
Subject: [PATCH 121/547] Added privacy nutrition label info

---
 Simplenote/Resources/PrivacyInfo.xcprivacy    | 63 +++++++++++++++++++
 .../Supporting Files/PrivacyInfo.xcprivacy    | 63 +++++++++++++++++++
 .../Supporting Files/PrivacyInfo.xcprivacy    | 63 +++++++++++++++++++
 3 files changed, 189 insertions(+)

diff --git a/Simplenote/Resources/PrivacyInfo.xcprivacy b/Simplenote/Resources/PrivacyInfo.xcprivacy
index 8ee414ce4..3aa90c0cf 100644
--- a/Simplenote/Resources/PrivacyInfo.xcprivacy
+++ b/Simplenote/Resources/PrivacyInfo.xcprivacy
@@ -2,6 +2,69 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>NSPrivacyCollectedDataTypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypeOtherDiagnosticData</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypePerformanceData</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypeCrashData</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypeEmailAddress</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<true/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypeUserID</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<true/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+	</array>
 	<key>NSPrivacyAccessedAPITypes</key>
 	<array>
 		<dict>
diff --git a/SimplenoteIntents/Supporting Files/PrivacyInfo.xcprivacy b/SimplenoteIntents/Supporting Files/PrivacyInfo.xcprivacy
index dd6881b47..e56fe8190 100644
--- a/SimplenoteIntents/Supporting Files/PrivacyInfo.xcprivacy	
+++ b/SimplenoteIntents/Supporting Files/PrivacyInfo.xcprivacy	
@@ -2,6 +2,69 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+    <key>NSPrivacyCollectedDataTypes</key>
+    <array>
+        <dict>
+            <key>NSPrivacyCollectedDataType</key>
+            <string>NSPrivacyCollectedDataTypeOtherDiagnosticData</string>
+            <key>NSPrivacyCollectedDataTypeLinked</key>
+            <false/>
+            <key>NSPrivacyCollectedDataTypeTracking</key>
+            <false/>
+            <key>NSPrivacyCollectedDataTypePurposes</key>
+            <array>
+                <string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+            </array>
+        </dict>
+        <dict>
+            <key>NSPrivacyCollectedDataType</key>
+            <string>NSPrivacyCollectedDataTypePerformanceData</string>
+            <key>NSPrivacyCollectedDataTypeLinked</key>
+            <false/>
+            <key>NSPrivacyCollectedDataTypeTracking</key>
+            <false/>
+            <key>NSPrivacyCollectedDataTypePurposes</key>
+            <array>
+                <string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+            </array>
+        </dict>
+        <dict>
+            <key>NSPrivacyCollectedDataType</key>
+            <string>NSPrivacyCollectedDataTypeCrashData</string>
+            <key>NSPrivacyCollectedDataTypeLinked</key>
+            <false/>
+            <key>NSPrivacyCollectedDataTypeTracking</key>
+            <false/>
+            <key>NSPrivacyCollectedDataTypePurposes</key>
+            <array>
+                <string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+            </array>
+        </dict>
+        <dict>
+            <key>NSPrivacyCollectedDataType</key>
+            <string>NSPrivacyCollectedDataTypeEmailAddress</string>
+            <key>NSPrivacyCollectedDataTypeLinked</key>
+            <true/>
+            <key>NSPrivacyCollectedDataTypeTracking</key>
+            <false/>
+            <key>NSPrivacyCollectedDataTypePurposes</key>
+            <array>
+                <string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+            </array>
+        </dict>
+        <dict>
+            <key>NSPrivacyCollectedDataType</key>
+            <string>NSPrivacyCollectedDataTypeUserID</string>
+            <key>NSPrivacyCollectedDataTypeLinked</key>
+            <true/>
+            <key>NSPrivacyCollectedDataTypeTracking</key>
+            <false/>
+            <key>NSPrivacyCollectedDataTypePurposes</key>
+            <array>
+                <string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+            </array>
+        </dict>
+    </array>
 	<key>NSPrivacyAccessedAPITypes</key>
 	<array>
 		<dict>
diff --git a/SimplenoteWidgets/Supporting Files/PrivacyInfo.xcprivacy b/SimplenoteWidgets/Supporting Files/PrivacyInfo.xcprivacy
index dd6881b47..e56fe8190 100644
--- a/SimplenoteWidgets/Supporting Files/PrivacyInfo.xcprivacy	
+++ b/SimplenoteWidgets/Supporting Files/PrivacyInfo.xcprivacy	
@@ -2,6 +2,69 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+    <key>NSPrivacyCollectedDataTypes</key>
+    <array>
+        <dict>
+            <key>NSPrivacyCollectedDataType</key>
+            <string>NSPrivacyCollectedDataTypeOtherDiagnosticData</string>
+            <key>NSPrivacyCollectedDataTypeLinked</key>
+            <false/>
+            <key>NSPrivacyCollectedDataTypeTracking</key>
+            <false/>
+            <key>NSPrivacyCollectedDataTypePurposes</key>
+            <array>
+                <string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+            </array>
+        </dict>
+        <dict>
+            <key>NSPrivacyCollectedDataType</key>
+            <string>NSPrivacyCollectedDataTypePerformanceData</string>
+            <key>NSPrivacyCollectedDataTypeLinked</key>
+            <false/>
+            <key>NSPrivacyCollectedDataTypeTracking</key>
+            <false/>
+            <key>NSPrivacyCollectedDataTypePurposes</key>
+            <array>
+                <string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+            </array>
+        </dict>
+        <dict>
+            <key>NSPrivacyCollectedDataType</key>
+            <string>NSPrivacyCollectedDataTypeCrashData</string>
+            <key>NSPrivacyCollectedDataTypeLinked</key>
+            <false/>
+            <key>NSPrivacyCollectedDataTypeTracking</key>
+            <false/>
+            <key>NSPrivacyCollectedDataTypePurposes</key>
+            <array>
+                <string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+            </array>
+        </dict>
+        <dict>
+            <key>NSPrivacyCollectedDataType</key>
+            <string>NSPrivacyCollectedDataTypeEmailAddress</string>
+            <key>NSPrivacyCollectedDataTypeLinked</key>
+            <true/>
+            <key>NSPrivacyCollectedDataTypeTracking</key>
+            <false/>
+            <key>NSPrivacyCollectedDataTypePurposes</key>
+            <array>
+                <string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+            </array>
+        </dict>
+        <dict>
+            <key>NSPrivacyCollectedDataType</key>
+            <string>NSPrivacyCollectedDataTypeUserID</string>
+            <key>NSPrivacyCollectedDataTypeLinked</key>
+            <true/>
+            <key>NSPrivacyCollectedDataTypeTracking</key>
+            <false/>
+            <key>NSPrivacyCollectedDataTypePurposes</key>
+            <array>
+                <string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+            </array>
+        </dict>
+    </array>
 	<key>NSPrivacyAccessedAPITypes</key>
 	<array>
 		<dict>

From 3fcefe72066019e4c03f3cef2da34402ec71b52e Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Tue, 30 Apr 2024 10:28:45 -0600
Subject: [PATCH 122/547] Updated privacy info to mark collected data as linked
 to user

---
 Simplenote/Resources/PrivacyInfo.xcprivacy    |   6 +-
 .../Supporting Files/PrivacyInfo.xcprivacy    | 126 +++++++++---------
 .../Supporting Files/PrivacyInfo.xcprivacy    | 126 +++++++++---------
 3 files changed, 129 insertions(+), 129 deletions(-)

diff --git a/Simplenote/Resources/PrivacyInfo.xcprivacy b/Simplenote/Resources/PrivacyInfo.xcprivacy
index 3aa90c0cf..374b5efe9 100644
--- a/Simplenote/Resources/PrivacyInfo.xcprivacy
+++ b/Simplenote/Resources/PrivacyInfo.xcprivacy
@@ -8,7 +8,7 @@
 			<key>NSPrivacyCollectedDataType</key>
 			<string>NSPrivacyCollectedDataTypeOtherDiagnosticData</string>
 			<key>NSPrivacyCollectedDataTypeLinked</key>
-			<false/>
+			<true/>
 			<key>NSPrivacyCollectedDataTypeTracking</key>
 			<false/>
 			<key>NSPrivacyCollectedDataTypePurposes</key>
@@ -20,7 +20,7 @@
 			<key>NSPrivacyCollectedDataType</key>
 			<string>NSPrivacyCollectedDataTypePerformanceData</string>
 			<key>NSPrivacyCollectedDataTypeLinked</key>
-			<false/>
+			<true/>
 			<key>NSPrivacyCollectedDataTypeTracking</key>
 			<false/>
 			<key>NSPrivacyCollectedDataTypePurposes</key>
@@ -32,7 +32,7 @@
 			<key>NSPrivacyCollectedDataType</key>
 			<string>NSPrivacyCollectedDataTypeCrashData</string>
 			<key>NSPrivacyCollectedDataTypeLinked</key>
-			<false/>
+			<true/>
 			<key>NSPrivacyCollectedDataTypeTracking</key>
 			<false/>
 			<key>NSPrivacyCollectedDataTypePurposes</key>
diff --git a/SimplenoteIntents/Supporting Files/PrivacyInfo.xcprivacy b/SimplenoteIntents/Supporting Files/PrivacyInfo.xcprivacy
index e56fe8190..321483656 100644
--- a/SimplenoteIntents/Supporting Files/PrivacyInfo.xcprivacy	
+++ b/SimplenoteIntents/Supporting Files/PrivacyInfo.xcprivacy	
@@ -2,69 +2,69 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>NSPrivacyCollectedDataTypes</key>
-    <array>
-        <dict>
-            <key>NSPrivacyCollectedDataType</key>
-            <string>NSPrivacyCollectedDataTypeOtherDiagnosticData</string>
-            <key>NSPrivacyCollectedDataTypeLinked</key>
-            <false/>
-            <key>NSPrivacyCollectedDataTypeTracking</key>
-            <false/>
-            <key>NSPrivacyCollectedDataTypePurposes</key>
-            <array>
-                <string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
-            </array>
-        </dict>
-        <dict>
-            <key>NSPrivacyCollectedDataType</key>
-            <string>NSPrivacyCollectedDataTypePerformanceData</string>
-            <key>NSPrivacyCollectedDataTypeLinked</key>
-            <false/>
-            <key>NSPrivacyCollectedDataTypeTracking</key>
-            <false/>
-            <key>NSPrivacyCollectedDataTypePurposes</key>
-            <array>
-                <string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
-            </array>
-        </dict>
-        <dict>
-            <key>NSPrivacyCollectedDataType</key>
-            <string>NSPrivacyCollectedDataTypeCrashData</string>
-            <key>NSPrivacyCollectedDataTypeLinked</key>
-            <false/>
-            <key>NSPrivacyCollectedDataTypeTracking</key>
-            <false/>
-            <key>NSPrivacyCollectedDataTypePurposes</key>
-            <array>
-                <string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
-            </array>
-        </dict>
-        <dict>
-            <key>NSPrivacyCollectedDataType</key>
-            <string>NSPrivacyCollectedDataTypeEmailAddress</string>
-            <key>NSPrivacyCollectedDataTypeLinked</key>
-            <true/>
-            <key>NSPrivacyCollectedDataTypeTracking</key>
-            <false/>
-            <key>NSPrivacyCollectedDataTypePurposes</key>
-            <array>
-                <string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
-            </array>
-        </dict>
-        <dict>
-            <key>NSPrivacyCollectedDataType</key>
-            <string>NSPrivacyCollectedDataTypeUserID</string>
-            <key>NSPrivacyCollectedDataTypeLinked</key>
-            <true/>
-            <key>NSPrivacyCollectedDataTypeTracking</key>
-            <false/>
-            <key>NSPrivacyCollectedDataTypePurposes</key>
-            <array>
-                <string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
-            </array>
-        </dict>
-    </array>
+	<key>NSPrivacyCollectedDataTypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypeOtherDiagnosticData</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<true/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypePerformanceData</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<true/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypeCrashData</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<true/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypeEmailAddress</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<true/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypeUserID</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<true/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+	</array>
 	<key>NSPrivacyAccessedAPITypes</key>
 	<array>
 		<dict>
diff --git a/SimplenoteWidgets/Supporting Files/PrivacyInfo.xcprivacy b/SimplenoteWidgets/Supporting Files/PrivacyInfo.xcprivacy
index e56fe8190..321483656 100644
--- a/SimplenoteWidgets/Supporting Files/PrivacyInfo.xcprivacy	
+++ b/SimplenoteWidgets/Supporting Files/PrivacyInfo.xcprivacy	
@@ -2,69 +2,69 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>NSPrivacyCollectedDataTypes</key>
-    <array>
-        <dict>
-            <key>NSPrivacyCollectedDataType</key>
-            <string>NSPrivacyCollectedDataTypeOtherDiagnosticData</string>
-            <key>NSPrivacyCollectedDataTypeLinked</key>
-            <false/>
-            <key>NSPrivacyCollectedDataTypeTracking</key>
-            <false/>
-            <key>NSPrivacyCollectedDataTypePurposes</key>
-            <array>
-                <string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
-            </array>
-        </dict>
-        <dict>
-            <key>NSPrivacyCollectedDataType</key>
-            <string>NSPrivacyCollectedDataTypePerformanceData</string>
-            <key>NSPrivacyCollectedDataTypeLinked</key>
-            <false/>
-            <key>NSPrivacyCollectedDataTypeTracking</key>
-            <false/>
-            <key>NSPrivacyCollectedDataTypePurposes</key>
-            <array>
-                <string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
-            </array>
-        </dict>
-        <dict>
-            <key>NSPrivacyCollectedDataType</key>
-            <string>NSPrivacyCollectedDataTypeCrashData</string>
-            <key>NSPrivacyCollectedDataTypeLinked</key>
-            <false/>
-            <key>NSPrivacyCollectedDataTypeTracking</key>
-            <false/>
-            <key>NSPrivacyCollectedDataTypePurposes</key>
-            <array>
-                <string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
-            </array>
-        </dict>
-        <dict>
-            <key>NSPrivacyCollectedDataType</key>
-            <string>NSPrivacyCollectedDataTypeEmailAddress</string>
-            <key>NSPrivacyCollectedDataTypeLinked</key>
-            <true/>
-            <key>NSPrivacyCollectedDataTypeTracking</key>
-            <false/>
-            <key>NSPrivacyCollectedDataTypePurposes</key>
-            <array>
-                <string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
-            </array>
-        </dict>
-        <dict>
-            <key>NSPrivacyCollectedDataType</key>
-            <string>NSPrivacyCollectedDataTypeUserID</string>
-            <key>NSPrivacyCollectedDataTypeLinked</key>
-            <true/>
-            <key>NSPrivacyCollectedDataTypeTracking</key>
-            <false/>
-            <key>NSPrivacyCollectedDataTypePurposes</key>
-            <array>
-                <string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
-            </array>
-        </dict>
-    </array>
+	<key>NSPrivacyCollectedDataTypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypeOtherDiagnosticData</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<true/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypePerformanceData</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<true/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypeCrashData</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<true/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypeEmailAddress</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<true/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypeUserID</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<true/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+	</array>
 	<key>NSPrivacyAccessedAPITypes</key>
 	<array>
 		<dict>

From 6260e3b07559adc2ab81bd5824351a240fb27d64 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Tue, 30 Apr 2024 10:37:15 -0600
Subject: [PATCH 123/547] Update Simplenote/BannerView.swift copy to make it
 the same as other apps

Co-authored-by: Dan Roundhill <dan@a8c.com>
---
 Simplenote/BannerView.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Simplenote/BannerView.swift b/Simplenote/BannerView.swift
index 0b772e9f7..d5e602cff 100644
--- a/Simplenote/BannerView.swift
+++ b/Simplenote/BannerView.swift
@@ -96,7 +96,7 @@ class BannerView: UIView {
         }
 
         static var collaborationRetirement: Style {
-            Style(title: NSLocalizedString("Collaboration Retirement", comment: "Title annoucning collaboration retirement"), details: NSLocalizedString("Collaboration is retiring on July 1st.  For more details tap here.", comment: "Description for retiring collaboration feature"), textColor: .white, backgroundColor: .simplenoteBlue50Color)
+            Style(title: NSLocalizedString("Collaboration Retirement", comment: "Title announcing collaboration retirement"), details: NSLocalizedString("Collaboration is retiring on July 1st, 2024. For more details, tap here.", comment: "Description for retiring collaboration feature"), textColor: .white, backgroundColor: .simplenoteBlue50Color)
         }
     }
 

From 7a3257e3a6c86bfd34d7dfb7f0e74d7b4e2cf77e Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Tue, 30 Apr 2024 10:52:07 -0600
Subject: [PATCH 124/547] updated podfile.lock

---
 Podfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Podfile.lock b/Podfile.lock
index 14f4c6907..bf8d40e2c 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -53,4 +53,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 6fc187e283b4fb7f9f4a0ef73a27632724c90845
 
-COCOAPODS: 1.14.1
+COCOAPODS: 1.15.2

From fa11512ca8a5dfdd7ffe093695a859d0d598fc08 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 2 May 2024 15:02:12 -0600
Subject: [PATCH 125/547] Drop registering NSUserActivity for shortcuts

---
 Simplenote/Classes/ShortcutsHandler.swift | 17 -----------------
 Simplenote/SPAppDelegate+Extensions.swift |  1 -
 2 files changed, 18 deletions(-)

diff --git a/Simplenote/Classes/ShortcutsHandler.swift b/Simplenote/Classes/ShortcutsHandler.swift
index 6ec70ace4..ae1a4d765 100644
--- a/Simplenote/Classes/ShortcutsHandler.swift
+++ b/Simplenote/Classes/ShortcutsHandler.swift
@@ -23,23 +23,6 @@ class ShortcutsHandler: NSObject {
         NSUserActivity.launchActivity()
     ]
 
-    /// Registers all of the Simplenote-Y Activities.
-    ///
-    /// - Note:
-    ///     1. Calling `becomeCurrent()` sequentially causes the OS not to register anything, (OR) register
-    ///        just the last activity.
-    ///     2. Not keeping the Activities around... also causes `becomeCurrent` to fail. That's why `activities` is
-    ///        an ivar!
-    ///
-    func registerSimplenoteActivities() {
-        for (index, activity) in activities.enumerated() {
-            let delay = DispatchTime.now() + DispatchTimeInterval.seconds(index)
-            DispatchQueue.main.asyncAfter(deadline: delay) {
-                activity.becomeCurrent()
-            }
-        }
-    }
-
     /// Removes all of the shared UserActivities, whenever the API allows.
     ///
     @objc
diff --git a/Simplenote/SPAppDelegate+Extensions.swift b/Simplenote/SPAppDelegate+Extensions.swift
index e33b1fa6c..f9bee8541 100644
--- a/Simplenote/SPAppDelegate+Extensions.swift
+++ b/Simplenote/SPAppDelegate+Extensions.swift
@@ -284,7 +284,6 @@ extension SPAppDelegate: SimperiumDelegate {
         SPTracker.refreshMetadata(withEmail: user.email)
 
         // Shortcuts!
-        ShortcutsHandler.shared.registerSimplenoteActivities()
         ShortcutsHandler.shared.updateHomeScreenQuickActionsIfNeeded()
 
         // Now that the user info is present, cache it for use by the crash logging system.

From c6adbb45e72896878e5989a3cd3da060d398804e Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Fri, 3 May 2024 14:35:27 -0600
Subject: [PATCH 126/547] Updated package.resolved

---
 .../xcshareddata/swiftpm/Package.resolved             | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved
index cd06d10ef..82138b2dd 100644
--- a/Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,12 +1,13 @@
 {
+  "originHash" : "4c803bfc0eef41e640a11de86de8bd9cb6ec711e343dadfe7d14d904ae2a7283",
   "pins" : [
     {
       "identity" : "automattic-tracks-ios",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/Automattic/Automattic-Tracks-iOS",
       "state" : {
-        "revision" : "b6979ef69b4b094c8809ba83661222dcd0d7667e",
-        "version" : "3.2.0"
+        "revision" : "bd981ad3a08c6af6113834eb62ee7466cb8aa71c",
+        "version" : "3.4.0"
       }
     },
     {
@@ -23,8 +24,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/getsentry/sentry-cocoa",
       "state" : {
-        "revision" : "3b9a8e69ca296bd8cd0e317ad7a448e5daf4a342",
-        "version" : "8.18.0"
+        "revision" : "82af013792dca3784a2dc5e7f975159fb9d263b3",
+        "version" : "8.25.0"
       }
     },
     {
@@ -82,5 +83,5 @@
       }
     }
   ],
-  "version" : 2
+  "version" : 3
 }

From 50baa38cb80c54ffc96344aae99233ee0b386f95 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 2 May 2024 15:02:59 -0600
Subject: [PATCH 127/547] Added shortcut intent files to simplenote and intent
 targets

---
 Simplenote.xcodeproj/project.pbxproj                 |  6 ++++++
 .../ShortcutIntents.intentdefinition                 | 12 ++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 Simplenote/Supporting Files/ShortcutIntents.intentdefinition

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index c3ce139a8..7081a2014 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -436,6 +436,8 @@
 		BA12B07026B0D0150026F31D /* SPManagedObject+Widget.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA12B06C26B0D0150026F31D /* SPManagedObject+Widget.swift */; };
 		BA18532826488DBC00D9A347 /* SignupRemoteTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA18532726488DBC00D9A347 /* SignupRemoteTests.swift */; };
 		BA2015BB2B57384F005E59AA /* AutomatticTracks in Frameworks */ = {isa = PBXBuildFile; productRef = BA2015BA2B57384F005E59AA /* AutomatticTracks */; };
+		BA289B582BE436EB000E6794 /* ShortcutIntents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = BA289B572BE436EB000E6794 /* ShortcutIntents.intentdefinition */; };
+		BA289B592BE436EB000E6794 /* ShortcutIntents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = BA289B572BE436EB000E6794 /* ShortcutIntents.intentdefinition */; };
 		BA2D82C6261522F100A1695B /* PublishNoticePresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA2D82C5261522F100A1695B /* PublishNoticePresenter.swift */; };
 		BA3101A926C8C76A00C95F93 /* ListWidgetIntent.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = BA7071E426BB68A300D5DFF0 /* ListWidgetIntent.intentdefinition */; settings = {ATTRIBUTES = (no_codegen, ); }; };
 		BA32A90F26B7469F00727247 /* WidgetError.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA32A90E26B7469F00727247 /* WidgetError.swift */; };
@@ -1127,6 +1129,7 @@
 		BA12B06C26B0D0150026F31D /* SPManagedObject+Widget.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "SPManagedObject+Widget.swift"; sourceTree = "<group>"; };
 		BA16C6A82BC4968400C9079F /* Simplenote 7.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Simplenote 7.xcdatamodel"; sourceTree = "<group>"; };
 		BA18532726488DBC00D9A347 /* SignupRemoteTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignupRemoteTests.swift; sourceTree = "<group>"; };
+		BA289B572BE436EB000E6794 /* ShortcutIntents.intentdefinition */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; path = ShortcutIntents.intentdefinition; sourceTree = "<group>"; };
 		BA2D82C5261522F100A1695B /* PublishNoticePresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishNoticePresenter.swift; sourceTree = "<group>"; };
 		BA32A90E26B7469F00727247 /* WidgetError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetError.swift; sourceTree = "<group>"; };
 		BA3856CC2681715700F388CC /* CoreDataManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreDataManager.swift; sourceTree = "<group>"; };
@@ -2618,6 +2621,7 @@
 				B5250A6B22B922F900AE7797 /* Simplenote-Internal.entitlements */,
 				E29ADD4717848E8500E55842 /* main.m */,
 				E29ADD4917848E8500E55842 /* Simplenote-Prefix.pch */,
+				BA289B572BE436EB000E6794 /* ShortcutIntents.intentdefinition */,
 			);
 			path = "Supporting Files";
 			sourceTree = "<group>";
@@ -3372,6 +3376,7 @@
 				B52BB74E22CFD1660042C162 /* SimplenoteActivityItemSource.swift in Sources */,
 				B537730F252E14C600BC78C5 /* OptionsViewController.swift in Sources */,
 				B56A696722F9D55F00B90398 /* UIView+Animations.swift in Sources */,
+				BA289B582BE436EB000E6794 /* ShortcutIntents.intentdefinition in Sources */,
 				BA3856CD2681715700F388CC /* CoreDataManager.swift in Sources */,
 				A60DF30825A44F0F00FDADF3 /* PinLockRemoveController.swift in Sources */,
 				A694ABAB25D1549D00CC3A2D /* FileStorage.swift in Sources */,
@@ -3728,6 +3733,7 @@
 				BAF8D51426AE172600CA9383 /* StorageSettings.swift in Sources */,
 				BA86616326B35CF000466746 /* BuildConfiguration.swift in Sources */,
 				BAB5762726703C8200B0C56F /* IntentHandler.swift in Sources */,
+				BA289B592BE436EB000E6794 /* ShortcutIntents.intentdefinition in Sources */,
 				BA86625D26B3B14900466746 /* SortMode.swift in Sources */,
 				BA12B07026B0D0150026F31D /* SPManagedObject+Widget.swift in Sources */,
 				BAF4A9AA26DB138600C51C1D /* NoteContentHelper.swift in Sources */,
diff --git a/Simplenote/Supporting Files/ShortcutIntents.intentdefinition b/Simplenote/Supporting Files/ShortcutIntents.intentdefinition
new file mode 100644
index 000000000..86b3c628c
--- /dev/null
+++ b/Simplenote/Supporting Files/ShortcutIntents.intentdefinition	
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>INIntents</key>
+  <array>
+  </array>
+  <key>INEnums</key>
+  <array>
+  </array>
+</dict>
+</plist>

From 545a2e1880cf0ea32032458c001744321ccabd2e Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 2 May 2024 15:10:52 -0600
Subject: [PATCH 128/547] Refactored Widget intent handlers into their own
 class

---
 Simplenote.xcodeproj/project.pbxproj          | 12 +++
 SimplenoteIntents/IntentHandler.swift         | 75 ++-----------------
 .../ListWidgetIntentHandler.swift             | 45 +++++++++++
 .../NoteWidgetIntentHandler.swift             | 44 +++++++++++
 4 files changed, 108 insertions(+), 68 deletions(-)
 create mode 100644 SimplenoteIntents/ListWidgetIntentHandler.swift
 create mode 100644 SimplenoteIntents/NoteWidgetIntentHandler.swift

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index 7081a2014..091438000 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -438,6 +438,10 @@
 		BA2015BB2B57384F005E59AA /* AutomatticTracks in Frameworks */ = {isa = PBXBuildFile; productRef = BA2015BA2B57384F005E59AA /* AutomatticTracks */; };
 		BA289B582BE436EB000E6794 /* ShortcutIntents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = BA289B572BE436EB000E6794 /* ShortcutIntents.intentdefinition */; };
 		BA289B592BE436EB000E6794 /* ShortcutIntents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = BA289B572BE436EB000E6794 /* ShortcutIntents.intentdefinition */; };
+		BA289B5C2BE4371A000E6794 /* ListWidgetIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA289B5A2BE4371A000E6794 /* ListWidgetIntentHandler.swift */; };
+		BA289B5F2BE43728000E6794 /* NoteWidgetIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA289B5D2BE43728000E6794 /* NoteWidgetIntentHandler.swift */; };
+		BA289B602BE43816000E6794 /* NoteWidgetIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA289B5D2BE43728000E6794 /* NoteWidgetIntentHandler.swift */; };
+		BA289B612BE43825000E6794 /* ListWidgetIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA289B5A2BE4371A000E6794 /* ListWidgetIntentHandler.swift */; };
 		BA2D82C6261522F100A1695B /* PublishNoticePresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA2D82C5261522F100A1695B /* PublishNoticePresenter.swift */; };
 		BA3101A926C8C76A00C95F93 /* ListWidgetIntent.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = BA7071E426BB68A300D5DFF0 /* ListWidgetIntent.intentdefinition */; settings = {ATTRIBUTES = (no_codegen, ); }; };
 		BA32A90F26B7469F00727247 /* WidgetError.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA32A90E26B7469F00727247 /* WidgetError.swift */; };
@@ -1130,6 +1134,8 @@
 		BA16C6A82BC4968400C9079F /* Simplenote 7.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Simplenote 7.xcdatamodel"; sourceTree = "<group>"; };
 		BA18532726488DBC00D9A347 /* SignupRemoteTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignupRemoteTests.swift; sourceTree = "<group>"; };
 		BA289B572BE436EB000E6794 /* ShortcutIntents.intentdefinition */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; path = ShortcutIntents.intentdefinition; sourceTree = "<group>"; };
+		BA289B5A2BE4371A000E6794 /* ListWidgetIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListWidgetIntentHandler.swift; sourceTree = "<group>"; };
+		BA289B5D2BE43728000E6794 /* NoteWidgetIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteWidgetIntentHandler.swift; sourceTree = "<group>"; };
 		BA2D82C5261522F100A1695B /* PublishNoticePresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishNoticePresenter.swift; sourceTree = "<group>"; };
 		BA32A90E26B7469F00727247 /* WidgetError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetError.swift; sourceTree = "<group>"; };
 		BA3856CC2681715700F388CC /* CoreDataManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreDataManager.swift; sourceTree = "<group>"; };
@@ -2379,6 +2385,8 @@
 			children = (
 				092FD78026D7BB72006BE8E2 /* Supporting Files */,
 				BAB5762626703C8200B0C56F /* IntentHandler.swift */,
+				BA289B5D2BE43728000E6794 /* NoteWidgetIntentHandler.swift */,
+				BA289B5A2BE4371A000E6794 /* ListWidgetIntentHandler.swift */,
 				BAF8D4AD26AE136D00CA9383 /* Simplenote-Intents-Bridging-Header.h */,
 			);
 			path = SimplenoteIntents;
@@ -3727,10 +3735,12 @@
 			files = (
 				BA86620E26B3A73D00466746 /* UserDefaults+Simplenote.swift in Sources */,
 				BAF8D52826AE173D00CA9383 /* FileManager+Simplenote.swift in Sources */,
+				BA289B5F2BE43728000E6794 /* NoteWidgetIntentHandler.swift in Sources */,
 				BAF8D50026AE171400CA9383 /* CoreDataManager.swift in Sources */,
 				BAE63CB026E05313002BF81A /* NSString+Simplenote.swift in Sources */,
 				BAE63CB226E05325002BF81A /* NSPredicate+Email.swift in Sources */,
 				BAF8D51426AE172600CA9383 /* StorageSettings.swift in Sources */,
+				BA289B5C2BE4371A000E6794 /* ListWidgetIntentHandler.swift in Sources */,
 				BA86616326B35CF000466746 /* BuildConfiguration.swift in Sources */,
 				BAB5762726703C8200B0C56F /* IntentHandler.swift in Sources */,
 				BA289B592BE436EB000E6794 /* ShortcutIntents.intentdefinition in Sources */,
@@ -3796,10 +3806,12 @@
 				BA608EF926BB6F4C00A9D94E /* ListWidgetView.swift in Sources */,
 				BAE63CAF26E05312002BF81A /* NSString+Simplenote.swift in Sources */,
 				BA86626726B3B1B600466746 /* NSSortDescriptor+Simplenote.swift in Sources */,
+				BA289B612BE43825000E6794 /* ListWidgetIntentHandler.swift in Sources */,
 				BAF8D46426AE118800CA9383 /* SPCredentials.swift in Sources */,
 				BA122DC1265EF4C5003D3BC5 /* UITraitCollection+Simplenote.swift in Sources */,
 				BA12B06F26B0D0150026F31D /* SPManagedObject+Widget.swift in Sources */,
 				BAFA93F4265DE4A70009DCFB /* NewNoteWidgetProvider.swift in Sources */,
+				BA289B602BE43816000E6794 /* NoteWidgetIntentHandler.swift in Sources */,
 				BAB27BD726BA425C00AE4ACC /* Color+Simplenote.swift in Sources */,
 				BAB5768726703EA000B0C56F /* NoteWidgetView.swift in Sources */,
 				BAF8D44C26AE10FC00CA9383 /* Note+Widget.swift in Sources */,
diff --git a/SimplenoteIntents/IntentHandler.swift b/SimplenoteIntents/IntentHandler.swift
index d62dd97d0..1e53fb61f 100644
--- a/SimplenoteIntents/IntentHandler.swift
+++ b/SimplenoteIntents/IntentHandler.swift
@@ -2,76 +2,15 @@ import Intents
 import CoreData
 
 class IntentHandler: INExtension {
-    let coreDataWrapper = WidgetCoreDataWrapper()
-
     override func handler(for intent: INIntent) -> Any {
-        return self
-    }
-}
-
-extension IntentHandler: NoteWidgetIntentHandling {
-    func provideNoteOptionsCollection(for intent: NoteWidgetIntent, with completion: @escaping (INObjectCollection<WidgetNote>?, Error?) -> Void) {
-        guard WidgetDefaults.shared.loggedIn else {
-            completion(nil, WidgetError.appConfigurationError)
-            return
-        }
-
-        guard let notes = coreDataWrapper.resultsController()?.notes() else {
-            completion(nil, WidgetError.fetchError)
-            return
-        }
-
-        let collection = widgetNoteInObjectCollection(from: notes)
-        completion(collection, nil)
-    }
-
-    private func widgetNoteInObjectCollection(from notes: [Note]) -> INObjectCollection<WidgetNote> {
-        let widgetNotes = notes.map({ note in
-            WidgetNote(identifier: note.simperiumKey, display: note.title)
-        })
-        return INObjectCollection(items: widgetNotes)
-    }
-
-    func defaultNote(for intent: NoteWidgetIntent) -> WidgetNote? {
-        guard WidgetDefaults.shared.loggedIn,
-              let note = coreDataWrapper.resultsController()?.firstNote() else {
-            return nil
-        }
 
-        return WidgetNote(identifier: note.simperiumKey, display: note.title)
-    }
-}
-
-extension IntentHandler: ListWidgetIntentHandling {
-    func provideTagOptionsCollection(for intent: ListWidgetIntent, with completion: @escaping (INObjectCollection<WidgetTag>?, Error?) -> Void) {
-        guard WidgetDefaults.shared.loggedIn else {
-            completion(nil, WidgetError.appConfigurationError)
-            return
+        switch intent {
+        case is NoteWidgetIntent:
+            return NoteWidgetIntentHandler()
+        case is ListWidgetIntent:
+            return ListWidgetIntentHandler()
+        default:
+            return self
         }
-
-        guard let tags = coreDataWrapper.resultsController()?.tags() else {
-            completion(nil, WidgetError.fetchError)
-            return
-        }
-
-        // Return collection to intents
-        let collection = tagNoteInObjectCollection(from: tags)
-        completion(collection, nil)
-    }
-
-    private func tagNoteInObjectCollection(from tags: [Tag]) -> INObjectCollection<WidgetTag> {
-        var items = [WidgetTag(kind: .allNotes)]
-
-        tags.forEach { tag in
-            let tag = WidgetTag(kind: .tag, name: tag.name)
-            tag.kind = .tag
-            items.append(tag)
-        }
-
-        return INObjectCollection(items: items)
-    }
-
-    func defaultTag(for intent: ListWidgetIntent) -> WidgetTag? {
-        WidgetTag(kind: .allNotes)
     }
 }
diff --git a/SimplenoteIntents/ListWidgetIntentHandler.swift b/SimplenoteIntents/ListWidgetIntentHandler.swift
new file mode 100644
index 000000000..0cd9558d5
--- /dev/null
+++ b/SimplenoteIntents/ListWidgetIntentHandler.swift
@@ -0,0 +1,45 @@
+//
+//  ListWidgetIntentHandler.swift
+//  Simplenote
+//
+//  Created by Charlie Scheer on 5/2/24.
+//  Copyright © 2024 Automattic. All rights reserved.
+//
+
+import Intents
+
+class ListWidgetIntentHandler: NSObject, ListWidgetIntentHandling {
+    let coreDataWrapper = WidgetCoreDataWrapper()
+
+    func provideTagOptionsCollection(for intent: ListWidgetIntent, with completion: @escaping (INObjectCollection<WidgetTag>?, Error?) -> Void) {
+        guard WidgetDefaults.shared.loggedIn else {
+            completion(nil, WidgetError.appConfigurationError)
+            return
+        }
+
+        guard let tags = coreDataWrapper.resultsController()?.tags() else {
+            completion(nil, WidgetError.fetchError)
+            return
+        }
+
+        // Return collection to intents
+        let collection = tagNoteInObjectCollection(from: tags)
+        completion(collection, nil)
+    }
+
+    private func tagNoteInObjectCollection(from tags: [Tag]) -> INObjectCollection<WidgetTag> {
+        var items = [WidgetTag(kind: .allNotes)]
+
+        tags.forEach { tag in
+            let tag = WidgetTag(kind: .tag, name: tag.name)
+            tag.kind = .tag
+            items.append(tag)
+        }
+
+        return INObjectCollection(items: items)
+    }
+
+    func defaultTag(for intent: ListWidgetIntent) -> WidgetTag? {
+        WidgetTag(kind: .allNotes)
+    }
+}
diff --git a/SimplenoteIntents/NoteWidgetIntentHandler.swift b/SimplenoteIntents/NoteWidgetIntentHandler.swift
new file mode 100644
index 000000000..61d980050
--- /dev/null
+++ b/SimplenoteIntents/NoteWidgetIntentHandler.swift
@@ -0,0 +1,44 @@
+//
+//  NoteWidgetIntentHandler.swift
+//  Simplenote
+//
+//  Created by Charlie Scheer on 5/2/24.
+//  Copyright © 2024 Automattic. All rights reserved.
+//
+
+import Intents
+
+class NoteWidgetIntentHandler: NSObject, NoteWidgetIntentHandling {
+    let coreDataWrapper = WidgetCoreDataWrapper()
+
+    func provideNoteOptionsCollection(for intent: NoteWidgetIntent, with completion: @escaping (INObjectCollection<WidgetNote>?, Error?) -> Void) {
+        guard WidgetDefaults.shared.loggedIn else {
+            completion(nil, WidgetError.appConfigurationError)
+            return
+        }
+
+        guard let notes = coreDataWrapper.resultsController()?.notes() else {
+            completion(nil, WidgetError.fetchError)
+            return
+        }
+
+        let collection = widgetNoteInObjectCollection(from: notes)
+        completion(collection, nil)
+    }
+
+    private func widgetNoteInObjectCollection(from notes: [Note]) -> INObjectCollection<WidgetNote> {
+        let widgetNotes = notes.map({ note in
+            WidgetNote(identifier: note.simperiumKey, display: note.title)
+        })
+        return INObjectCollection(items: widgetNotes)
+    }
+
+    func defaultNote(for intent: NoteWidgetIntent) -> WidgetNote? {
+        guard WidgetDefaults.shared.loggedIn,
+              let note = coreDataWrapper.resultsController()?.firstNote() else {
+            return nil
+        }
+
+        return WidgetNote(identifier: note.simperiumKey, display: note.title)
+    }
+}

From 220bd6f60306e9efa26d69406afc30015f39cb92 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 2 May 2024 15:37:47 -0600
Subject: [PATCH 129/547] Added open new note intent and handler

---
 Simplenote.xcodeproj/project.pbxproj          | 24 ++++--
 Simplenote/Classes/ActivityType.swift         |  1 +
 Simplenote/Classes/ShortcutsHandler.swift     |  2 +-
 .../ShortcutIntents.intentdefinition          | 75 +++++++++++++++++--
 .../Supporting Files/Simplenote-Info.plist    |  1 +
 .../ListWidgetIntentHandler.swift             |  0
 .../NoteWidgetIntentHandler.swift             |  0
 .../OpenNewNoteIntentHandler.swift            | 15 ++++
 SimplenoteIntents/IntentHandler.swift         |  2 +
 SimplenoteIntents/Supporting Files/Info.plist |  1 +
 10 files changed, 106 insertions(+), 15 deletions(-)
 rename SimplenoteIntents/{ => Intent Handlers}/ListWidgetIntentHandler.swift (100%)
 rename SimplenoteIntents/{ => Intent Handlers}/NoteWidgetIntentHandler.swift (100%)
 create mode 100644 SimplenoteIntents/Intent Handlers/OpenNewNoteIntentHandler.swift

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index 091438000..891e745ed 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -442,8 +442,9 @@
 		BA289B5F2BE43728000E6794 /* NoteWidgetIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA289B5D2BE43728000E6794 /* NoteWidgetIntentHandler.swift */; };
 		BA289B602BE43816000E6794 /* NoteWidgetIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA289B5D2BE43728000E6794 /* NoteWidgetIntentHandler.swift */; };
 		BA289B612BE43825000E6794 /* ListWidgetIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA289B5A2BE4371A000E6794 /* ListWidgetIntentHandler.swift */; };
+		BA289B642BE43963000E6794 /* OpenNewNoteIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA289B632BE43963000E6794 /* OpenNewNoteIntentHandler.swift */; };
+		BA289B652BE43963000E6794 /* OpenNewNoteIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA289B632BE43963000E6794 /* OpenNewNoteIntentHandler.swift */; };
 		BA2D82C6261522F100A1695B /* PublishNoticePresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA2D82C5261522F100A1695B /* PublishNoticePresenter.swift */; };
-		BA3101A926C8C76A00C95F93 /* ListWidgetIntent.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = BA7071E426BB68A300D5DFF0 /* ListWidgetIntent.intentdefinition */; settings = {ATTRIBUTES = (no_codegen, ); }; };
 		BA32A90F26B7469F00727247 /* WidgetError.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA32A90E26B7469F00727247 /* WidgetError.swift */; };
 		BA32A91926B746A200727247 /* WidgetError.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA32A90E26B7469F00727247 /* WidgetError.swift */; };
 		BA32A91A26B746A300727247 /* WidgetError.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA32A90E26B7469F00727247 /* WidgetError.swift */; };
@@ -513,7 +514,6 @@
 		BAB5762426703C8100B0C56F /* Intents.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BAB5762326703C8100B0C56F /* Intents.framework */; };
 		BAB5762726703C8200B0C56F /* IntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAB5762626703C8200B0C56F /* IntentHandler.swift */; };
 		BAB5762B26703C8200B0C56F /* SimplenoteIntents.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = BAB5762226703C8100B0C56F /* SimplenoteIntents.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
-		BAB5764626703D0000B0C56F /* IntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAB5762626703C8200B0C56F /* IntentHandler.swift */; };
 		BAB5765B26703D0600B0C56F /* NoteWidgetIntent.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = BAB5760A26703C0C00B0C56F /* NoteWidgetIntent.intentdefinition */; };
 		BAB5765C26703D0600B0C56F /* NoteWidgetIntent.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = BAB5760A26703C0C00B0C56F /* NoteWidgetIntent.intentdefinition */; };
 		BAB5768726703EA000B0C56F /* NoteWidgetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAB5767B26703E8100B0C56F /* NoteWidgetView.swift */; };
@@ -562,7 +562,6 @@
 		BAFA93FA265DE8920009DCFB /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E29ADD4D17848E8500E55842 /* Images.xcassets */; };
 		BAFDBBD926B88BD200119615 /* Date+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAFDBBD726B88BD200119615 /* Date+Simplenote.swift */; };
 		BAFDBBDA26B88BD200119615 /* Date+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAFDBBD726B88BD200119615 /* Date+Simplenote.swift */; };
-		BAFDBBE426B88F1300119615 /* NoteWidgetIntent.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = BAB5760A26703C0C00B0C56F /* NoteWidgetIntent.intentdefinition */; settings = {ATTRIBUTES = (no_codegen, ); }; };
 		BAFFCEA626DDA9F6007F5EE3 /* WidgetCoreDataWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAFFCEA526DDA9F6007F5EE3 /* WidgetCoreDataWrapper.swift */; };
 		BAFFCEA726DDA9F6007F5EE3 /* WidgetCoreDataWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAFFCEA526DDA9F6007F5EE3 /* WidgetCoreDataWrapper.swift */; };
 		D435D38FCA5863E8447D5C2C /* Pods_Automattic_SimplenoteShare.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 183BAB896957F07FDCAB6DF5 /* Pods_Automattic_SimplenoteShare.framework */; };
@@ -1136,6 +1135,7 @@
 		BA289B572BE436EB000E6794 /* ShortcutIntents.intentdefinition */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; path = ShortcutIntents.intentdefinition; sourceTree = "<group>"; };
 		BA289B5A2BE4371A000E6794 /* ListWidgetIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListWidgetIntentHandler.swift; sourceTree = "<group>"; };
 		BA289B5D2BE43728000E6794 /* NoteWidgetIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteWidgetIntentHandler.swift; sourceTree = "<group>"; };
+		BA289B632BE43963000E6794 /* OpenNewNoteIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenNewNoteIntentHandler.swift; sourceTree = "<group>"; };
 		BA2D82C5261522F100A1695B /* PublishNoticePresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishNoticePresenter.swift; sourceTree = "<group>"; };
 		BA32A90E26B7469F00727247 /* WidgetError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetError.swift; sourceTree = "<group>"; };
 		BA3856CC2681715700F388CC /* CoreDataManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreDataManager.swift; sourceTree = "<group>"; };
@@ -2319,6 +2319,16 @@
 			path = Providers;
 			sourceTree = "<group>";
 		};
+		BA289B622BE43949000E6794 /* Intent Handlers */ = {
+			isa = PBXGroup;
+			children = (
+				BA289B5D2BE43728000E6794 /* NoteWidgetIntentHandler.swift */,
+				BA289B5A2BE4371A000E6794 /* ListWidgetIntentHandler.swift */,
+				BA289B632BE43963000E6794 /* OpenNewNoteIntentHandler.swift */,
+			);
+			path = "Intent Handlers";
+			sourceTree = "<group>";
+		};
 		BA3FB8CD25FEA09F00EA9A1B /* Notice */ = {
 			isa = PBXGroup;
 			children = (
@@ -2385,8 +2395,7 @@
 			children = (
 				092FD78026D7BB72006BE8E2 /* Supporting Files */,
 				BAB5762626703C8200B0C56F /* IntentHandler.swift */,
-				BA289B5D2BE43728000E6794 /* NoteWidgetIntentHandler.swift */,
-				BA289B5A2BE4371A000E6794 /* ListWidgetIntentHandler.swift */,
+				BA289B622BE43949000E6794 /* Intent Handlers */,
 				BAF8D4AD26AE136D00CA9383 /* Simplenote-Intents-Bridging-Header.h */,
 			);
 			path = SimplenoteIntents;
@@ -3436,7 +3445,6 @@
 				B54D9C592909CC4400D0E0EC /* StoreProduct.swift in Sources */,
 				A6C0589924AD47CB006BC572 /* SPSnappingSlider.swift in Sources */,
 				B550F93122BA65CD00091939 /* ActivityType.swift in Sources */,
-				BA3101A926C8C76A00C95F93 /* ListWidgetIntent.intentdefinition in Sources */,
 				46A3C97817DFA81A002865AE /* PersonTag.m in Sources */,
 				B5BFAEBB21519DCA00918DC8 /* SPPrivacyViewController.swift in Sources */,
 				A6C0DFE725C18E3300B9BE39 /* NoteEditorTagListViewController.swift in Sources */,
@@ -3554,7 +3562,6 @@
 				B5E951E124FEDAD4004B10B8 /* UIPasteboard+Note.swift in Sources */,
 				A6C7648025E9131C00A39067 /* SignupRemote.swift in Sources */,
 				A681C73C2541AC8D00F369C2 /* HuggableTableView.swift in Sources */,
-				BAFDBBE426B88F1300119615 /* NoteWidgetIntent.intentdefinition in Sources */,
 				46A3C99917DFA81A002865AE /* SPTransitionController.m in Sources */,
 				B56A695B22F9CD4E00B90398 /* UINavigationBar+Simplenote.swift in Sources */,
 				46A3C99B17DFA81A002865AE /* Tag.m in Sources */,
@@ -3573,6 +3580,7 @@
 				B5AEC38423FAC5D600D24221 /* DateFormatter+Simplenote.swift in Sources */,
 				B5DF734622A5713600602CE7 /* SortMode.swift in Sources */,
 				BA55B05A25F067DF0042582B /* NoticePresenter.swift in Sources */,
+				BA289B642BE43963000E6794 /* OpenNewNoteIntentHandler.swift in Sources */,
 				46A3C99D17DFA81A002865AE /* SPAddCollaboratorsViewController.m in Sources */,
 				B52646AA22D3E04C00EBF299 /* UIViewController+Simplenote.swift in Sources */,
 				B55E428C22A1A4550018C0CE /* SPSortOrderViewController.swift in Sources */,
@@ -3743,6 +3751,7 @@
 				BA289B5C2BE4371A000E6794 /* ListWidgetIntentHandler.swift in Sources */,
 				BA86616326B35CF000466746 /* BuildConfiguration.swift in Sources */,
 				BAB5762726703C8200B0C56F /* IntentHandler.swift in Sources */,
+				BA289B652BE43963000E6794 /* OpenNewNoteIntentHandler.swift in Sources */,
 				BA289B592BE436EB000E6794 /* ShortcutIntents.intentdefinition in Sources */,
 				BA86625D26B3B14900466746 /* SortMode.swift in Sources */,
 				BA12B07026B0D0150026F31D /* SPManagedObject+Widget.swift in Sources */,
@@ -3830,7 +3839,6 @@
 				BA122DC2265EF4E5003D3BC5 /* SPUserInterface.swift in Sources */,
 				BAB576A826703F4500B0C56F /* NoteWidgetProvider.swift in Sources */,
 				BAF8D4F626AE171400CA9383 /* CoreDataManager.swift in Sources */,
-				BAB5764626703D0000B0C56F /* IntentHandler.swift in Sources */,
 				BAB576C92670514500B0C56F /* NoteWidget.swift in Sources */,
 				BA122DC7265EF92D003D3BC5 /* NewNoteWidgetView.swift in Sources */,
 			);
diff --git a/Simplenote/Classes/ActivityType.swift b/Simplenote/Classes/ActivityType.swift
index f115d11e6..02270a00c 100644
--- a/Simplenote/Classes/ActivityType.swift
+++ b/Simplenote/Classes/ActivityType.swift
@@ -11,6 +11,7 @@ enum ActivityType: String {
     /// New Note Activity
     ///
     case newNote = "com.codality.NotationalFlow.newNote"
+    case newNoteShortcut = "SPOpenNewNoteIntent"
 
     /// Open a Note!
     ///
diff --git a/Simplenote/Classes/ShortcutsHandler.swift b/Simplenote/Classes/ShortcutsHandler.swift
index ae1a4d765..6ce9a5887 100644
--- a/Simplenote/Classes/ShortcutsHandler.swift
+++ b/Simplenote/Classes/ShortcutsHandler.swift
@@ -47,7 +47,7 @@ class ShortcutsHandler: NSObject {
         switch type {
         case .launch:
             break
-        case .newNote:
+        case .newNote, .newNoteShortcut:
             SPAppDelegate.shared().presentNewNoteEditor()
         case .openNote, .openSpotlightItem:
             presentNote(for: userActivity)
diff --git a/Simplenote/Supporting Files/ShortcutIntents.intentdefinition b/Simplenote/Supporting Files/ShortcutIntents.intentdefinition
index 86b3c628c..d8319b130 100644
--- a/Simplenote/Supporting Files/ShortcutIntents.intentdefinition	
+++ b/Simplenote/Supporting Files/ShortcutIntents.intentdefinition	
@@ -2,11 +2,74 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-  <key>INIntents</key>
-  <array>
-  </array>
-  <key>INEnums</key>
-  <array>
-  </array>
+	<key>INEnums</key>
+	<array/>
+	<key>INIntentDefinitionModelVersion</key>
+	<string>1.2</string>
+	<key>INIntentDefinitionNamespace</key>
+	<string>BxdWY5</string>
+	<key>INIntentDefinitionSystemVersion</key>
+	<string>23E214</string>
+	<key>INIntentDefinitionToolsBuildVersion</key>
+	<string>15E204a</string>
+	<key>INIntentDefinitionToolsVersion</key>
+	<string>15.3</string>
+	<key>INIntents</key>
+	<array>
+		<dict>
+			<key>INIntentCategory</key>
+			<string>generic</string>
+			<key>INIntentClassPrefix</key>
+			<string>SP</string>
+			<key>INIntentConfigurable</key>
+			<true/>
+			<key>INIntentDescriptionID</key>
+			<string>fgSbr5</string>
+			<key>INIntentIneligibleForSuggestions</key>
+			<true/>
+			<key>INIntentManagedParameterCombinations</key>
+			<dict>
+				<key></key>
+				<dict>
+					<key>INIntentParameterCombinationSupportsBackgroundExecution</key>
+					<true/>
+					<key>INIntentParameterCombinationTitle</key>
+					<string>Open a new note in Simplenote</string>
+					<key>INIntentParameterCombinationTitleID</key>
+					<string>OZjn1w</string>
+					<key>INIntentParameterCombinationUpdatesLinked</key>
+					<true/>
+				</dict>
+			</dict>
+			<key>INIntentName</key>
+			<string>OpenNewNote</string>
+			<key>INIntentResponse</key>
+			<dict>
+				<key>INIntentResponseCodes</key>
+				<array>
+					<dict>
+						<key>INIntentResponseCodeName</key>
+						<string>success</string>
+						<key>INIntentResponseCodeSuccess</key>
+						<true/>
+					</dict>
+					<dict>
+						<key>INIntentResponseCodeName</key>
+						<string>failure</string>
+					</dict>
+				</array>
+			</dict>
+			<key>INIntentTitle</key>
+			<string>Open New Note</string>
+			<key>INIntentTitleID</key>
+			<string>WsSu5K</string>
+			<key>INIntentType</key>
+			<string>Custom</string>
+			<key>INIntentVerb</key>
+			<string>Do</string>
+		</dict>
+	</array>
+	<key>INTypes</key>
+	<array/>
 </dict>
 </plist>
diff --git a/Simplenote/Supporting Files/Simplenote-Info.plist b/Simplenote/Supporting Files/Simplenote-Info.plist
index 895a310de..b437e5e1d 100644
--- a/Simplenote/Supporting Files/Simplenote-Info.plist	
+++ b/Simplenote/Supporting Files/Simplenote-Info.plist	
@@ -76,6 +76,7 @@
 	<array>
 		<string>ListWidgetIntent</string>
 		<string>NoteWidgetIntent</string>
+		<string>SPOpenNewNoteIntent</string>
 		<string>com.codality.NotationalFlow.launch</string>
 		<string>com.codality.NotationalFlow.newNote</string>
 		<string>com.codality.NotationalFlow.openNote</string>
diff --git a/SimplenoteIntents/ListWidgetIntentHandler.swift b/SimplenoteIntents/Intent Handlers/ListWidgetIntentHandler.swift
similarity index 100%
rename from SimplenoteIntents/ListWidgetIntentHandler.swift
rename to SimplenoteIntents/Intent Handlers/ListWidgetIntentHandler.swift
diff --git a/SimplenoteIntents/NoteWidgetIntentHandler.swift b/SimplenoteIntents/Intent Handlers/NoteWidgetIntentHandler.swift
similarity index 100%
rename from SimplenoteIntents/NoteWidgetIntentHandler.swift
rename to SimplenoteIntents/Intent Handlers/NoteWidgetIntentHandler.swift
diff --git a/SimplenoteIntents/Intent Handlers/OpenNewNoteIntentHandler.swift b/SimplenoteIntents/Intent Handlers/OpenNewNoteIntentHandler.swift
new file mode 100644
index 000000000..96775f6a2
--- /dev/null
+++ b/SimplenoteIntents/Intent Handlers/OpenNewNoteIntentHandler.swift	
@@ -0,0 +1,15 @@
+//
+//  OpenNewNoteIntentHandler.swift
+//  Simplenote
+//
+//  Created by Charlie Scheer on 5/2/24.
+//  Copyright © 2024 Automattic. All rights reserved.
+//
+
+import Intents
+
+class OpenNewNoteIntentHandler: NSObject, SPOpenNewNoteIntentHandling {
+    func handle(intent: SPOpenNewNoteIntent) async -> SPOpenNewNoteIntentResponse {
+        SPOpenNewNoteIntentResponse(code: .continueInApp, userActivity: nil)
+    }
+}
diff --git a/SimplenoteIntents/IntentHandler.swift b/SimplenoteIntents/IntentHandler.swift
index 1e53fb61f..5beb00946 100644
--- a/SimplenoteIntents/IntentHandler.swift
+++ b/SimplenoteIntents/IntentHandler.swift
@@ -9,6 +9,8 @@ class IntentHandler: INExtension {
             return NoteWidgetIntentHandler()
         case is ListWidgetIntent:
             return ListWidgetIntentHandler()
+        case is SPOpenNewNoteIntent:
+            return OpenNewNoteIntentHandler()
         default:
             return self
         }
diff --git a/SimplenoteIntents/Supporting Files/Info.plist b/SimplenoteIntents/Supporting Files/Info.plist
index f632dc379..9c12557fb 100644
--- a/SimplenoteIntents/Supporting Files/Info.plist	
+++ b/SimplenoteIntents/Supporting Files/Info.plist	
@@ -32,6 +32,7 @@
 			<array>
 				<string>ListWidgetIntent</string>
 				<string>NoteWidgetIntent</string>
+				<string>SPOpenNewNoteIntent</string>
 			</array>
 		</dict>
 		<key>NSExtensionPointIdentifier</key>

From ed8495ce19e687f40f32d03f94c24b0aff5b6938 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 2 May 2024 17:32:53 -0600
Subject: [PATCH 130/547] Added open note intent

---
 Simplenote.xcodeproj/project.pbxproj          |   2 -
 Simplenote/Classes/ActivityType.swift         |   1 +
 Simplenote/Classes/ShortcutsHandler.swift     |  13 ++
 .../ShortcutIntents.intentdefinition          | 188 +++++++++++++++++-
 .../Supporting Files/Simplenote-Info.plist    |   1 +
 .../OpenNewNoteIntentHandler.swift            |  35 ++++
 SimplenoteIntents/IntentHandler.swift         |   2 +
 SimplenoteIntents/Supporting Files/Info.plist |   1 +
 8 files changed, 240 insertions(+), 3 deletions(-)

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index 891e745ed..4a97afb8e 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -442,7 +442,6 @@
 		BA289B5F2BE43728000E6794 /* NoteWidgetIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA289B5D2BE43728000E6794 /* NoteWidgetIntentHandler.swift */; };
 		BA289B602BE43816000E6794 /* NoteWidgetIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA289B5D2BE43728000E6794 /* NoteWidgetIntentHandler.swift */; };
 		BA289B612BE43825000E6794 /* ListWidgetIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA289B5A2BE4371A000E6794 /* ListWidgetIntentHandler.swift */; };
-		BA289B642BE43963000E6794 /* OpenNewNoteIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA289B632BE43963000E6794 /* OpenNewNoteIntentHandler.swift */; };
 		BA289B652BE43963000E6794 /* OpenNewNoteIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA289B632BE43963000E6794 /* OpenNewNoteIntentHandler.swift */; };
 		BA2D82C6261522F100A1695B /* PublishNoticePresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA2D82C5261522F100A1695B /* PublishNoticePresenter.swift */; };
 		BA32A90F26B7469F00727247 /* WidgetError.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA32A90E26B7469F00727247 /* WidgetError.swift */; };
@@ -3580,7 +3579,6 @@
 				B5AEC38423FAC5D600D24221 /* DateFormatter+Simplenote.swift in Sources */,
 				B5DF734622A5713600602CE7 /* SortMode.swift in Sources */,
 				BA55B05A25F067DF0042582B /* NoticePresenter.swift in Sources */,
-				BA289B642BE43963000E6794 /* OpenNewNoteIntentHandler.swift in Sources */,
 				46A3C99D17DFA81A002865AE /* SPAddCollaboratorsViewController.m in Sources */,
 				B52646AA22D3E04C00EBF299 /* UIViewController+Simplenote.swift in Sources */,
 				B55E428C22A1A4550018C0CE /* SPSortOrderViewController.swift in Sources */,
diff --git a/Simplenote/Classes/ActivityType.swift b/Simplenote/Classes/ActivityType.swift
index 02270a00c..e3c066138 100644
--- a/Simplenote/Classes/ActivityType.swift
+++ b/Simplenote/Classes/ActivityType.swift
@@ -16,6 +16,7 @@ enum ActivityType: String {
     /// Open a Note!
     ///
     case openNote = "com.codality.NotationalFlow.openNote"
+    case openNoteShortcut = "SPOpenNoteIntent"
 
     /// Open an Item that was indexed by Spotlight
     ///
diff --git a/Simplenote/Classes/ShortcutsHandler.swift b/Simplenote/Classes/ShortcutsHandler.swift
index 6ce9a5887..5def63a65 100644
--- a/Simplenote/Classes/ShortcutsHandler.swift
+++ b/Simplenote/Classes/ShortcutsHandler.swift
@@ -1,5 +1,6 @@
 import Foundation
 import CoreSpotlight
+import Intents
 
 // MARK: - AppDelegate Shortcuts Methods
 //
@@ -51,6 +52,8 @@ class ShortcutsHandler: NSObject {
             SPAppDelegate.shared().presentNewNoteEditor()
         case .openNote, .openSpotlightItem:
             presentNote(for: userActivity)
+        case .openNoteShortcut:
+            presentNote(for: userActivity.interaction)
         }
 
         return true
@@ -155,4 +158,14 @@ private extension ShortcutsHandler {
 
         SPAppDelegate.shared().presentNoteWithSimperiumKey(uniqueIdentifier)
     }
+
+    func presentNote(for interaction: INInteraction?) {
+        guard let interaction,
+              let activity = interaction.intentResponse?.userActivity,
+              let uniqueIdentifier = activity.userInfo?["OpenNoteIntentHandlerIdentifierKey"] as? String else {
+            return
+        }
+
+        SPAppDelegate.shared().presentNoteWithSimperiumKey(uniqueIdentifier)
+    }
 }
diff --git a/Simplenote/Supporting Files/ShortcutIntents.intentdefinition b/Simplenote/Supporting Files/ShortcutIntents.intentdefinition
index d8319b130..ba5aedc51 100644
--- a/Simplenote/Supporting Files/ShortcutIntents.intentdefinition	
+++ b/Simplenote/Supporting Files/ShortcutIntents.intentdefinition	
@@ -68,8 +68,194 @@
 			<key>INIntentVerb</key>
 			<string>Do</string>
 		</dict>
+		<dict>
+			<key>INIntentCategory</key>
+			<string>information</string>
+			<key>INIntentClassPrefix</key>
+			<string>SP</string>
+			<key>INIntentConfigurable</key>
+			<true/>
+			<key>INIntentDescription</key>
+			<string>Open Note in Simplenote</string>
+			<key>INIntentDescriptionID</key>
+			<string>sqM3pN</string>
+			<key>INIntentIneligibleForSuggestions</key>
+			<true/>
+			<key>INIntentLastParameterTag</key>
+			<integer>2</integer>
+			<key>INIntentManagedParameterCombinations</key>
+			<dict>
+				<key>note</key>
+				<dict>
+					<key>INIntentParameterCombinationSupportsBackgroundExecution</key>
+					<true/>
+					<key>INIntentParameterCombinationTitle</key>
+					<string>Open ${note} in Simplenote</string>
+					<key>INIntentParameterCombinationTitleID</key>
+					<string>bjR9IG</string>
+					<key>INIntentParameterCombinationUpdatesLinked</key>
+					<true/>
+				</dict>
+			</dict>
+			<key>INIntentName</key>
+			<string>OpenNote</string>
+			<key>INIntentParameters</key>
+			<array>
+				<dict>
+					<key>INIntentParameterConfigurable</key>
+					<true/>
+					<key>INIntentParameterDisplayName</key>
+					<string>note</string>
+					<key>INIntentParameterDisplayNameID</key>
+					<string>4OEbmY</string>
+					<key>INIntentParameterDisplayPriority</key>
+					<integer>1</integer>
+					<key>INIntentParameterName</key>
+					<string>note</string>
+					<key>INIntentParameterObjectType</key>
+					<string>IntentNote</string>
+					<key>INIntentParameterObjectTypeNamespace</key>
+					<string>BxdWY5</string>
+					<key>INIntentParameterPromptDialogs</key>
+					<array>
+						<dict>
+							<key>INIntentParameterPromptDialogCustom</key>
+							<true/>
+							<key>INIntentParameterPromptDialogType</key>
+							<string>Configuration</string>
+						</dict>
+						<dict>
+							<key>INIntentParameterPromptDialogCustom</key>
+							<true/>
+							<key>INIntentParameterPromptDialogFormatString</key>
+							<string>${note}</string>
+							<key>INIntentParameterPromptDialogFormatStringID</key>
+							<string>hDNku0</string>
+							<key>INIntentParameterPromptDialogType</key>
+							<string>Primary</string>
+						</dict>
+						<dict>
+							<key>INIntentParameterPromptDialogCustom</key>
+							<true/>
+							<key>INIntentParameterPromptDialogFormatString</key>
+							<string>There are ${count} options matching ‘${note}’.</string>
+							<key>INIntentParameterPromptDialogFormatStringID</key>
+							<string>n3Yy85</string>
+							<key>INIntentParameterPromptDialogType</key>
+							<string>DisambiguationIntroduction</string>
+						</dict>
+						<dict>
+							<key>INIntentParameterPromptDialogCustom</key>
+							<true/>
+							<key>INIntentParameterPromptDialogFormatString</key>
+							<string>Just to confirm, you wanted ‘${note}’?</string>
+							<key>INIntentParameterPromptDialogFormatStringID</key>
+							<string>v8y9Kh</string>
+							<key>INIntentParameterPromptDialogType</key>
+							<string>Confirmation</string>
+						</dict>
+					</array>
+					<key>INIntentParameterSupportsDynamicEnumeration</key>
+					<true/>
+					<key>INIntentParameterTag</key>
+					<integer>2</integer>
+					<key>INIntentParameterType</key>
+					<string>Object</string>
+				</dict>
+			</array>
+			<key>INIntentResponse</key>
+			<dict>
+				<key>INIntentResponseCodes</key>
+				<array>
+					<dict>
+						<key>INIntentResponseCodeName</key>
+						<string>success</string>
+						<key>INIntentResponseCodeSuccess</key>
+						<true/>
+					</dict>
+					<dict>
+						<key>INIntentResponseCodeName</key>
+						<string>failure</string>
+					</dict>
+				</array>
+			</dict>
+			<key>INIntentTitle</key>
+			<string>Open Note</string>
+			<key>INIntentTitleID</key>
+			<string>IQnYW1</string>
+			<key>INIntentType</key>
+			<string>Custom</string>
+			<key>INIntentVerb</key>
+			<string>Open</string>
+		</dict>
 	</array>
 	<key>INTypes</key>
-	<array/>
+	<array>
+		<dict>
+			<key>INTypeClassPrefix</key>
+			<string>SP</string>
+			<key>INTypeDisplayName</key>
+			<string>Note</string>
+			<key>INTypeDisplayNameID</key>
+			<string>I19gXv</string>
+			<key>INTypeLastPropertyTag</key>
+			<integer>99</integer>
+			<key>INTypeName</key>
+			<string>IntentNote</string>
+			<key>INTypeProperties</key>
+			<array>
+				<dict>
+					<key>INTypePropertyDefault</key>
+					<true/>
+					<key>INTypePropertyDisplayPriority</key>
+					<integer>1</integer>
+					<key>INTypePropertyName</key>
+					<string>identifier</string>
+					<key>INTypePropertyTag</key>
+					<integer>1</integer>
+					<key>INTypePropertyType</key>
+					<string>String</string>
+				</dict>
+				<dict>
+					<key>INTypePropertyDefault</key>
+					<true/>
+					<key>INTypePropertyDisplayPriority</key>
+					<integer>2</integer>
+					<key>INTypePropertyName</key>
+					<string>displayString</string>
+					<key>INTypePropertyTag</key>
+					<integer>2</integer>
+					<key>INTypePropertyType</key>
+					<string>String</string>
+				</dict>
+				<dict>
+					<key>INTypePropertyDefault</key>
+					<true/>
+					<key>INTypePropertyDisplayPriority</key>
+					<integer>3</integer>
+					<key>INTypePropertyName</key>
+					<string>pronunciationHint</string>
+					<key>INTypePropertyTag</key>
+					<integer>3</integer>
+					<key>INTypePropertyType</key>
+					<string>String</string>
+				</dict>
+				<dict>
+					<key>INTypePropertyDefault</key>
+					<true/>
+					<key>INTypePropertyDisplayPriority</key>
+					<integer>4</integer>
+					<key>INTypePropertyName</key>
+					<string>alternativeSpeakableMatches</string>
+					<key>INTypePropertySupportsMultipleValues</key>
+					<true/>
+					<key>INTypePropertyTag</key>
+					<integer>4</integer>
+					<key>INTypePropertyType</key>
+					<string>SpeakableString</string>
+				</dict>
+			</array>
+		</dict>
+	</array>
 </dict>
 </plist>
diff --git a/Simplenote/Supporting Files/Simplenote-Info.plist b/Simplenote/Supporting Files/Simplenote-Info.plist
index b437e5e1d..abcc93ef3 100644
--- a/Simplenote/Supporting Files/Simplenote-Info.plist	
+++ b/Simplenote/Supporting Files/Simplenote-Info.plist	
@@ -77,6 +77,7 @@
 		<string>ListWidgetIntent</string>
 		<string>NoteWidgetIntent</string>
 		<string>SPOpenNewNoteIntent</string>
+		<string>SPOpenNoteIntent</string>
 		<string>com.codality.NotationalFlow.launch</string>
 		<string>com.codality.NotationalFlow.newNote</string>
 		<string>com.codality.NotationalFlow.openNote</string>
diff --git a/SimplenoteIntents/Intent Handlers/OpenNewNoteIntentHandler.swift b/SimplenoteIntents/Intent Handlers/OpenNewNoteIntentHandler.swift
index 96775f6a2..f9cb5bbe3 100644
--- a/SimplenoteIntents/Intent Handlers/OpenNewNoteIntentHandler.swift	
+++ b/SimplenoteIntents/Intent Handlers/OpenNewNoteIntentHandler.swift	
@@ -13,3 +13,38 @@ class OpenNewNoteIntentHandler: NSObject, SPOpenNewNoteIntentHandling {
         SPOpenNewNoteIntentResponse(code: .continueInApp, userActivity: nil)
     }
 }
+
+class OpenNoteIntentHandler: NSObject, SPOpenNoteIntentHandling {
+    let coreDataWrapper = WidgetCoreDataWrapper()
+
+    func resolveNote(for intent: SPOpenNoteIntent) async -> SPIntentNoteResolutionResult {
+        guard let identifier = intent.note?.identifier,
+              let note = coreDataWrapper.resultsController()?.note(forSimperiumKey: identifier) else {
+            return SPIntentNoteResolutionResult.confirmationRequired(with: nil)
+        }
+
+        return SPIntentNoteResolutionResult.success(with: SPIntentNote(identifier: note.simperiumKey, display: note.title))
+    }
+
+    func provideNoteOptionsCollection(for intent: SPOpenNoteIntent) async throws -> INObjectCollection<SPIntentNote> {
+        guard let notes = coreDataWrapper.resultsController()?.notes() else {
+            throw NSError(domain: "intents", code: 404)
+        }
+
+        let intentNotes = notes.map({
+            SPIntentNote(identifier: $0.simperiumKey, display: $0.title)
+        })
+        return INObjectCollection(items: intentNotes)
+    }
+
+    func handle(intent: SPOpenNoteIntent) async -> SPOpenNoteIntentResponse {
+        guard let identifier = intent.note?.identifier else {
+            return SPOpenNoteIntentResponse(code: .failure, userActivity: nil)
+        }
+        let activity = NSUserActivity(activityType: "SPOpenNoteIntent")
+        activity.userInfo = [Self.noteIdentifierKey: identifier]
+        return SPOpenNoteIntentResponse(code: .continueInApp, userActivity: activity)
+    }
+
+    static let noteIdentifierKey = "OpenNoteIntentHandlerIdentifierKey"
+}
diff --git a/SimplenoteIntents/IntentHandler.swift b/SimplenoteIntents/IntentHandler.swift
index 5beb00946..337138b1e 100644
--- a/SimplenoteIntents/IntentHandler.swift
+++ b/SimplenoteIntents/IntentHandler.swift
@@ -11,6 +11,8 @@ class IntentHandler: INExtension {
             return ListWidgetIntentHandler()
         case is SPOpenNewNoteIntent:
             return OpenNewNoteIntentHandler()
+        case is SPOpenNoteIntent:
+            return OpenNoteIntentHandler()
         default:
             return self
         }
diff --git a/SimplenoteIntents/Supporting Files/Info.plist b/SimplenoteIntents/Supporting Files/Info.plist
index 9c12557fb..5061d9aec 100644
--- a/SimplenoteIntents/Supporting Files/Info.plist	
+++ b/SimplenoteIntents/Supporting Files/Info.plist	
@@ -33,6 +33,7 @@
 				<string>ListWidgetIntent</string>
 				<string>NoteWidgetIntent</string>
 				<string>SPOpenNewNoteIntent</string>
+				<string>SPOpenNoteIntent</string>
 			</array>
 		</dict>
 		<key>NSExtensionPointIdentifier</key>

From 7bab3bb70f44ac3a07f07b38b233f4d1645297ef Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 2 May 2024 17:34:49 -0600
Subject: [PATCH 131/547] Added intents constants to save on duplication across
 targets

---
 Simplenote.xcodeproj/project.pbxproj                |  6 ++++++
 Simplenote/Classes/ShortcutsHandler.swift           |  2 +-
 .../Intent Handlers/OpenNewNoteIntentHandler.swift  |  4 +---
 SimplenoteIntents/IntentsConstants.swift            | 13 +++++++++++++
 4 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 SimplenoteIntents/IntentsConstants.swift

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index 4a97afb8e..1c53243c2 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -443,6 +443,8 @@
 		BA289B602BE43816000E6794 /* NoteWidgetIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA289B5D2BE43728000E6794 /* NoteWidgetIntentHandler.swift */; };
 		BA289B612BE43825000E6794 /* ListWidgetIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA289B5A2BE4371A000E6794 /* ListWidgetIntentHandler.swift */; };
 		BA289B652BE43963000E6794 /* OpenNewNoteIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA289B632BE43963000E6794 /* OpenNewNoteIntentHandler.swift */; };
+		BA289B722BE45A39000E6794 /* IntentsConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA289B702BE45A39000E6794 /* IntentsConstants.swift */; };
+		BA289B732BE45A3C000E6794 /* IntentsConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA289B702BE45A39000E6794 /* IntentsConstants.swift */; };
 		BA2D82C6261522F100A1695B /* PublishNoticePresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA2D82C5261522F100A1695B /* PublishNoticePresenter.swift */; };
 		BA32A90F26B7469F00727247 /* WidgetError.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA32A90E26B7469F00727247 /* WidgetError.swift */; };
 		BA32A91926B746A200727247 /* WidgetError.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA32A90E26B7469F00727247 /* WidgetError.swift */; };
@@ -1135,6 +1137,7 @@
 		BA289B5A2BE4371A000E6794 /* ListWidgetIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListWidgetIntentHandler.swift; sourceTree = "<group>"; };
 		BA289B5D2BE43728000E6794 /* NoteWidgetIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteWidgetIntentHandler.swift; sourceTree = "<group>"; };
 		BA289B632BE43963000E6794 /* OpenNewNoteIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenNewNoteIntentHandler.swift; sourceTree = "<group>"; };
+		BA289B702BE45A39000E6794 /* IntentsConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntentsConstants.swift; sourceTree = "<group>"; };
 		BA2D82C5261522F100A1695B /* PublishNoticePresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishNoticePresenter.swift; sourceTree = "<group>"; };
 		BA32A90E26B7469F00727247 /* WidgetError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetError.swift; sourceTree = "<group>"; };
 		BA3856CC2681715700F388CC /* CoreDataManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreDataManager.swift; sourceTree = "<group>"; };
@@ -2394,6 +2397,7 @@
 			children = (
 				092FD78026D7BB72006BE8E2 /* Supporting Files */,
 				BAB5762626703C8200B0C56F /* IntentHandler.swift */,
+				BA289B702BE45A39000E6794 /* IntentsConstants.swift */,
 				BA289B622BE43949000E6794 /* Intent Handlers */,
 				BAF8D4AD26AE136D00CA9383 /* Simplenote-Intents-Bridging-Header.h */,
 			);
@@ -3557,6 +3561,7 @@
 				A6C3D8B7256687970042F584 /* SPObjectManager+Simplenote.swift in Sources */,
 				46A3C99817DFA81A002865AE /* SPEntryListCell.m in Sources */,
 				BAB017722609456D007A9CC3 /* PublishController.swift in Sources */,
+				BA289B732BE45A3C000E6794 /* IntentsConstants.swift in Sources */,
 				BAF4A96F26DB085D00C51C1D /* NSURLComponents+Simplenote.swift in Sources */,
 				B5E951E124FEDAD4004B10B8 /* UIPasteboard+Note.swift in Sources */,
 				A6C7648025E9131C00A39067 /* SignupRemote.swift in Sources */,
@@ -3748,6 +3753,7 @@
 				BAF8D51426AE172600CA9383 /* StorageSettings.swift in Sources */,
 				BA289B5C2BE4371A000E6794 /* ListWidgetIntentHandler.swift in Sources */,
 				BA86616326B35CF000466746 /* BuildConfiguration.swift in Sources */,
+				BA289B722BE45A39000E6794 /* IntentsConstants.swift in Sources */,
 				BAB5762726703C8200B0C56F /* IntentHandler.swift in Sources */,
 				BA289B652BE43963000E6794 /* OpenNewNoteIntentHandler.swift in Sources */,
 				BA289B592BE436EB000E6794 /* ShortcutIntents.intentdefinition in Sources */,
diff --git a/Simplenote/Classes/ShortcutsHandler.swift b/Simplenote/Classes/ShortcutsHandler.swift
index 5def63a65..27b309d21 100644
--- a/Simplenote/Classes/ShortcutsHandler.swift
+++ b/Simplenote/Classes/ShortcutsHandler.swift
@@ -162,7 +162,7 @@ private extension ShortcutsHandler {
     func presentNote(for interaction: INInteraction?) {
         guard let interaction,
               let activity = interaction.intentResponse?.userActivity,
-              let uniqueIdentifier = activity.userInfo?["OpenNoteIntentHandlerIdentifierKey"] as? String else {
+              let uniqueIdentifier = activity.userInfo?[IntentsConstants.noteIdentifierKey] as? String else {
             return
         }
 
diff --git a/SimplenoteIntents/Intent Handlers/OpenNewNoteIntentHandler.swift b/SimplenoteIntents/Intent Handlers/OpenNewNoteIntentHandler.swift
index f9cb5bbe3..a5a13de29 100644
--- a/SimplenoteIntents/Intent Handlers/OpenNewNoteIntentHandler.swift	
+++ b/SimplenoteIntents/Intent Handlers/OpenNewNoteIntentHandler.swift	
@@ -42,9 +42,7 @@ class OpenNoteIntentHandler: NSObject, SPOpenNoteIntentHandling {
             return SPOpenNoteIntentResponse(code: .failure, userActivity: nil)
         }
         let activity = NSUserActivity(activityType: "SPOpenNoteIntent")
-        activity.userInfo = [Self.noteIdentifierKey: identifier]
+        activity.userInfo = [IntentsConstants.noteIdentifierKey: identifier]
         return SPOpenNoteIntentResponse(code: .continueInApp, userActivity: activity)
     }
-
-    static let noteIdentifierKey = "OpenNoteIntentHandlerIdentifierKey"
 }
diff --git a/SimplenoteIntents/IntentsConstants.swift b/SimplenoteIntents/IntentsConstants.swift
new file mode 100644
index 000000000..18e8bfdb8
--- /dev/null
+++ b/SimplenoteIntents/IntentsConstants.swift
@@ -0,0 +1,13 @@
+//
+//  IntentsConstants.swift
+//  Simplenote
+//
+//  Created by Charlie Scheer on 5/2/24.
+//  Copyright © 2024 Automattic. All rights reserved.
+//
+
+import Foundation
+
+struct IntentsConstants {
+    static let noteIdentifierKey = "OpenNoteIntentHandlerIdentifierKey"
+}

From 2894b96a510f097286cd87f7c74ecceccac22891 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 2 May 2024 17:39:16 -0600
Subject: [PATCH 132/547] Dropped SP leading class name on new intent classes

---
 .../ShortcutIntents.intentdefinition          |  6 +++++
 .../Supporting Files/Simplenote-Info.plist    |  4 ++--
 .../OpenNewNoteIntentHandler.swift            | 24 +++++++++----------
 SimplenoteIntents/IntentHandler.swift         |  4 ++--
 SimplenoteIntents/Supporting Files/Info.plist |  4 ++--
 5 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/Simplenote/Supporting Files/ShortcutIntents.intentdefinition b/Simplenote/Supporting Files/ShortcutIntents.intentdefinition
index ba5aedc51..646123ee2 100644
--- a/Simplenote/Supporting Files/ShortcutIntents.intentdefinition	
+++ b/Simplenote/Supporting Files/ShortcutIntents.intentdefinition	
@@ -19,6 +19,8 @@
 		<dict>
 			<key>INIntentCategory</key>
 			<string>generic</string>
+			<key>INIntentClassName</key>
+			<string>OpenNewNoteIntent</string>
 			<key>INIntentClassPrefix</key>
 			<string>SP</string>
 			<key>INIntentConfigurable</key>
@@ -71,6 +73,8 @@
 		<dict>
 			<key>INIntentCategory</key>
 			<string>information</string>
+			<key>INIntentClassName</key>
+			<string>OpenNoteIntent</string>
 			<key>INIntentClassPrefix</key>
 			<string>SP</string>
 			<key>INIntentConfigurable</key>
@@ -192,6 +196,8 @@
 	<key>INTypes</key>
 	<array>
 		<dict>
+			<key>INTypeClassName</key>
+			<string>IntentNote</string>
 			<key>INTypeClassPrefix</key>
 			<string>SP</string>
 			<key>INTypeDisplayName</key>
diff --git a/Simplenote/Supporting Files/Simplenote-Info.plist b/Simplenote/Supporting Files/Simplenote-Info.plist
index abcc93ef3..8d25ca1f2 100644
--- a/Simplenote/Supporting Files/Simplenote-Info.plist	
+++ b/Simplenote/Supporting Files/Simplenote-Info.plist	
@@ -76,8 +76,8 @@
 	<array>
 		<string>ListWidgetIntent</string>
 		<string>NoteWidgetIntent</string>
-		<string>SPOpenNewNoteIntent</string>
-		<string>SPOpenNoteIntent</string>
+		<string>OpenNewNoteIntent</string>
+		<string>OpenNoteIntent</string>
 		<string>com.codality.NotationalFlow.launch</string>
 		<string>com.codality.NotationalFlow.newNote</string>
 		<string>com.codality.NotationalFlow.openNote</string>
diff --git a/SimplenoteIntents/Intent Handlers/OpenNewNoteIntentHandler.swift b/SimplenoteIntents/Intent Handlers/OpenNewNoteIntentHandler.swift
index a5a13de29..6dfcdf2a7 100644
--- a/SimplenoteIntents/Intent Handlers/OpenNewNoteIntentHandler.swift	
+++ b/SimplenoteIntents/Intent Handlers/OpenNewNoteIntentHandler.swift	
@@ -8,41 +8,41 @@
 
 import Intents
 
-class OpenNewNoteIntentHandler: NSObject, SPOpenNewNoteIntentHandling {
-    func handle(intent: SPOpenNewNoteIntent) async -> SPOpenNewNoteIntentResponse {
-        SPOpenNewNoteIntentResponse(code: .continueInApp, userActivity: nil)
+class OpenNewNoteIntentHandler: NSObject, OpenNewNoteIntentHandling {
+    func handle(intent: OpenNewNoteIntent) async -> OpenNewNoteIntentResponse {
+        OpenNewNoteIntentResponse(code: .continueInApp, userActivity: nil)
     }
 }
 
-class OpenNoteIntentHandler: NSObject, SPOpenNoteIntentHandling {
+class OpenNoteIntentHandler: NSObject, OpenNoteIntentHandling {
     let coreDataWrapper = WidgetCoreDataWrapper()
 
-    func resolveNote(for intent: SPOpenNoteIntent) async -> SPIntentNoteResolutionResult {
+    func resolveNote(for intent: OpenNoteIntent) async -> IntentNoteResolutionResult {
         guard let identifier = intent.note?.identifier,
               let note = coreDataWrapper.resultsController()?.note(forSimperiumKey: identifier) else {
-            return SPIntentNoteResolutionResult.confirmationRequired(with: nil)
+            return IntentNoteResolutionResult.confirmationRequired(with: nil)
         }
 
-        return SPIntentNoteResolutionResult.success(with: SPIntentNote(identifier: note.simperiumKey, display: note.title))
+        return IntentNoteResolutionResult.success(with: IntentNote(identifier: note.simperiumKey, display: note.title))
     }
 
-    func provideNoteOptionsCollection(for intent: SPOpenNoteIntent) async throws -> INObjectCollection<SPIntentNote> {
+    func provideNoteOptionsCollection(for intent: OpenNoteIntent) async throws -> INObjectCollection<IntentNote> {
         guard let notes = coreDataWrapper.resultsController()?.notes() else {
             throw NSError(domain: "intents", code: 404)
         }
 
         let intentNotes = notes.map({
-            SPIntentNote(identifier: $0.simperiumKey, display: $0.title)
+            IntentNote(identifier: $0.simperiumKey, display: $0.title)
         })
         return INObjectCollection(items: intentNotes)
     }
 
-    func handle(intent: SPOpenNoteIntent) async -> SPOpenNoteIntentResponse {
+    func handle(intent: OpenNoteIntent) async -> OpenNoteIntentResponse {
         guard let identifier = intent.note?.identifier else {
-            return SPOpenNoteIntentResponse(code: .failure, userActivity: nil)
+            return OpenNoteIntentResponse(code: .failure, userActivity: nil)
         }
         let activity = NSUserActivity(activityType: "SPOpenNoteIntent")
         activity.userInfo = [IntentsConstants.noteIdentifierKey: identifier]
-        return SPOpenNoteIntentResponse(code: .continueInApp, userActivity: activity)
+        return OpenNoteIntentResponse(code: .continueInApp, userActivity: activity)
     }
 }
diff --git a/SimplenoteIntents/IntentHandler.swift b/SimplenoteIntents/IntentHandler.swift
index 337138b1e..cb357191a 100644
--- a/SimplenoteIntents/IntentHandler.swift
+++ b/SimplenoteIntents/IntentHandler.swift
@@ -9,9 +9,9 @@ class IntentHandler: INExtension {
             return NoteWidgetIntentHandler()
         case is ListWidgetIntent:
             return ListWidgetIntentHandler()
-        case is SPOpenNewNoteIntent:
+        case is OpenNewNoteIntent:
             return OpenNewNoteIntentHandler()
-        case is SPOpenNoteIntent:
+        case is OpenNoteIntent:
             return OpenNoteIntentHandler()
         default:
             return self
diff --git a/SimplenoteIntents/Supporting Files/Info.plist b/SimplenoteIntents/Supporting Files/Info.plist
index 5061d9aec..a7c260143 100644
--- a/SimplenoteIntents/Supporting Files/Info.plist	
+++ b/SimplenoteIntents/Supporting Files/Info.plist	
@@ -32,8 +32,8 @@
 			<array>
 				<string>ListWidgetIntent</string>
 				<string>NoteWidgetIntent</string>
-				<string>SPOpenNewNoteIntent</string>
-				<string>SPOpenNoteIntent</string>
+				<string>OpenNewNoteIntent</string>
+				<string>OpenNoteIntent</string>
 			</array>
 		</dict>
 		<key>NSExtensionPointIdentifier</key>

From 721b42e7f04c8f78db8ca2be0e435992f29fc657 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 2 May 2024 17:41:59 -0600
Subject: [PATCH 133/547] Moved open note intent handler to its own file

---
 Simplenote.xcodeproj/project.pbxproj          |  6 +++
 .../OpenNewNoteIntentHandler.swift            | 33 ---------------
 .../OpenNoteIntentHandler.swift               | 42 +++++++++++++++++++
 3 files changed, 48 insertions(+), 33 deletions(-)
 create mode 100644 SimplenoteIntents/Intent Handlers/OpenNoteIntentHandler.swift

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index 1c53243c2..046f25fd1 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -445,6 +445,8 @@
 		BA289B652BE43963000E6794 /* OpenNewNoteIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA289B632BE43963000E6794 /* OpenNewNoteIntentHandler.swift */; };
 		BA289B722BE45A39000E6794 /* IntentsConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA289B702BE45A39000E6794 /* IntentsConstants.swift */; };
 		BA289B732BE45A3C000E6794 /* IntentsConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA289B702BE45A39000E6794 /* IntentsConstants.swift */; };
+		BA289B762BE45BBB000E6794 /* OpenNoteIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA289B742BE45BBB000E6794 /* OpenNoteIntentHandler.swift */; };
+		BA289B782BE45BFB000E6794 /* ActivityType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B550F93022BA65CD00091939 /* ActivityType.swift */; };
 		BA2D82C6261522F100A1695B /* PublishNoticePresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA2D82C5261522F100A1695B /* PublishNoticePresenter.swift */; };
 		BA32A90F26B7469F00727247 /* WidgetError.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA32A90E26B7469F00727247 /* WidgetError.swift */; };
 		BA32A91926B746A200727247 /* WidgetError.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA32A90E26B7469F00727247 /* WidgetError.swift */; };
@@ -1138,6 +1140,7 @@
 		BA289B5D2BE43728000E6794 /* NoteWidgetIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteWidgetIntentHandler.swift; sourceTree = "<group>"; };
 		BA289B632BE43963000E6794 /* OpenNewNoteIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenNewNoteIntentHandler.swift; sourceTree = "<group>"; };
 		BA289B702BE45A39000E6794 /* IntentsConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntentsConstants.swift; sourceTree = "<group>"; };
+		BA289B742BE45BBB000E6794 /* OpenNoteIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenNoteIntentHandler.swift; sourceTree = "<group>"; };
 		BA2D82C5261522F100A1695B /* PublishNoticePresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishNoticePresenter.swift; sourceTree = "<group>"; };
 		BA32A90E26B7469F00727247 /* WidgetError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetError.swift; sourceTree = "<group>"; };
 		BA3856CC2681715700F388CC /* CoreDataManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreDataManager.swift; sourceTree = "<group>"; };
@@ -2327,6 +2330,7 @@
 				BA289B5D2BE43728000E6794 /* NoteWidgetIntentHandler.swift */,
 				BA289B5A2BE4371A000E6794 /* ListWidgetIntentHandler.swift */,
 				BA289B632BE43963000E6794 /* OpenNewNoteIntentHandler.swift */,
+				BA289B742BE45BBB000E6794 /* OpenNoteIntentHandler.swift */,
 			);
 			path = "Intent Handlers";
 			sourceTree = "<group>";
@@ -3760,9 +3764,11 @@
 				BA86625D26B3B14900466746 /* SortMode.swift in Sources */,
 				BA12B07026B0D0150026F31D /* SPManagedObject+Widget.swift in Sources */,
 				BAF4A9AA26DB138600C51C1D /* NoteContentHelper.swift in Sources */,
+				BA289B782BE45BFB000E6794 /* ActivityType.swift in Sources */,
 				BA7071E626BB68A300D5DFF0 /* ListWidgetIntent.intentdefinition in Sources */,
 				BA86622426B3AE4A00466746 /* WidgetResultsController.swift in Sources */,
 				BABFFF2426CF9094003A4C25 /* WidgetDefaults.swift in Sources */,
+				BA289B762BE45BBB000E6794 /* OpenNoteIntentHandler.swift in Sources */,
 				BAF8D46E26AE118800CA9383 /* SPCredentials.swift in Sources */,
 				BAF8D5C526AE254100CA9383 /* Simplenote.xcdatamodeld in Sources */,
 				BAB6C04426BA49F3007495C4 /* ContentSlice.swift in Sources */,
diff --git a/SimplenoteIntents/Intent Handlers/OpenNewNoteIntentHandler.swift b/SimplenoteIntents/Intent Handlers/OpenNewNoteIntentHandler.swift
index 6dfcdf2a7..00bf44ac7 100644
--- a/SimplenoteIntents/Intent Handlers/OpenNewNoteIntentHandler.swift	
+++ b/SimplenoteIntents/Intent Handlers/OpenNewNoteIntentHandler.swift	
@@ -13,36 +13,3 @@ class OpenNewNoteIntentHandler: NSObject, OpenNewNoteIntentHandling {
         OpenNewNoteIntentResponse(code: .continueInApp, userActivity: nil)
     }
 }
-
-class OpenNoteIntentHandler: NSObject, OpenNoteIntentHandling {
-    let coreDataWrapper = WidgetCoreDataWrapper()
-
-    func resolveNote(for intent: OpenNoteIntent) async -> IntentNoteResolutionResult {
-        guard let identifier = intent.note?.identifier,
-              let note = coreDataWrapper.resultsController()?.note(forSimperiumKey: identifier) else {
-            return IntentNoteResolutionResult.confirmationRequired(with: nil)
-        }
-
-        return IntentNoteResolutionResult.success(with: IntentNote(identifier: note.simperiumKey, display: note.title))
-    }
-
-    func provideNoteOptionsCollection(for intent: OpenNoteIntent) async throws -> INObjectCollection<IntentNote> {
-        guard let notes = coreDataWrapper.resultsController()?.notes() else {
-            throw NSError(domain: "intents", code: 404)
-        }
-
-        let intentNotes = notes.map({
-            IntentNote(identifier: $0.simperiumKey, display: $0.title)
-        })
-        return INObjectCollection(items: intentNotes)
-    }
-
-    func handle(intent: OpenNoteIntent) async -> OpenNoteIntentResponse {
-        guard let identifier = intent.note?.identifier else {
-            return OpenNoteIntentResponse(code: .failure, userActivity: nil)
-        }
-        let activity = NSUserActivity(activityType: "SPOpenNoteIntent")
-        activity.userInfo = [IntentsConstants.noteIdentifierKey: identifier]
-        return OpenNoteIntentResponse(code: .continueInApp, userActivity: activity)
-    }
-}
diff --git a/SimplenoteIntents/Intent Handlers/OpenNoteIntentHandler.swift b/SimplenoteIntents/Intent Handlers/OpenNoteIntentHandler.swift
new file mode 100644
index 000000000..9ad6d1746
--- /dev/null
+++ b/SimplenoteIntents/Intent Handlers/OpenNoteIntentHandler.swift	
@@ -0,0 +1,42 @@
+//
+//  OpenNoteIntentHandler.swift
+//  Simplenote
+//
+//  Created by Charlie Scheer on 5/2/24.
+//  Copyright © 2024 Automattic. All rights reserved.
+//
+
+import Intents
+
+class OpenNoteIntentHandler: NSObject, OpenNoteIntentHandling {
+    let coreDataWrapper = WidgetCoreDataWrapper()
+
+    func resolveNote(for intent: OpenNoteIntent) async -> IntentNoteResolutionResult {
+        guard let identifier = intent.note?.identifier,
+              let note = coreDataWrapper.resultsController()?.note(forSimperiumKey: identifier) else {
+            return IntentNoteResolutionResult.confirmationRequired(with: nil)
+        }
+
+        return IntentNoteResolutionResult.success(with: IntentNote(identifier: note.simperiumKey, display: note.title))
+    }
+
+    func provideNoteOptionsCollection(for intent: OpenNoteIntent) async throws -> INObjectCollection<IntentNote> {
+        guard let notes = coreDataWrapper.resultsController()?.notes() else {
+            throw fatalError("Could not fetch notes")
+        }
+
+        let intentNotes = notes.map({
+            IntentNote(identifier: $0.simperiumKey, display: $0.title)
+        })
+        return INObjectCollection(items: intentNotes)
+    }
+
+    func handle(intent: OpenNoteIntent) async -> OpenNoteIntentResponse {
+        guard let identifier = intent.note?.identifier else {
+            return OpenNoteIntentResponse(code: .failure, userActivity: nil)
+        }
+        let activity = NSUserActivity(activityType: ActivityType.openNoteShortcut.rawValue)
+        activity.userInfo = [IntentsConstants.noteIdentifierKey: identifier]
+        return OpenNoteIntentResponse(code: .continueInApp, userActivity: activity)
+    }
+}

From 2cf7858b4f1ae6409baa548a99743465c8053100 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Fri, 3 May 2024 15:03:17 -0600
Subject: [PATCH 134/547] Renamed widgetsCoreDataWrapper to reflect it being
 used in intents

---
 .../Intent Handlers/ListWidgetIntentHandler.swift           | 2 +-
 .../Intent Handlers/NoteWidgetIntentHandler.swift           | 2 +-
 .../Intent Handlers/OpenNoteIntentHandler.swift             | 2 +-
 SimplenoteWidgets/Providers/ListWidgetProvider.swift        | 2 +-
 SimplenoteWidgets/Providers/NoteWidgetProvider.swift        | 2 +-
 SimplenoteWidgets/Tools/WidgetCoreDataWrapper.swift         | 6 +++---
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/SimplenoteIntents/Intent Handlers/ListWidgetIntentHandler.swift b/SimplenoteIntents/Intent Handlers/ListWidgetIntentHandler.swift
index 0cd9558d5..99c95b427 100644
--- a/SimplenoteIntents/Intent Handlers/ListWidgetIntentHandler.swift	
+++ b/SimplenoteIntents/Intent Handlers/ListWidgetIntentHandler.swift	
@@ -9,7 +9,7 @@
 import Intents
 
 class ListWidgetIntentHandler: NSObject, ListWidgetIntentHandling {
-    let coreDataWrapper = WidgetCoreDataWrapper()
+    let coreDataWrapper = ExtensionCoreDataWrapper()
 
     func provideTagOptionsCollection(for intent: ListWidgetIntent, with completion: @escaping (INObjectCollection<WidgetTag>?, Error?) -> Void) {
         guard WidgetDefaults.shared.loggedIn else {
diff --git a/SimplenoteIntents/Intent Handlers/NoteWidgetIntentHandler.swift b/SimplenoteIntents/Intent Handlers/NoteWidgetIntentHandler.swift
index 61d980050..0d9d34f8e 100644
--- a/SimplenoteIntents/Intent Handlers/NoteWidgetIntentHandler.swift	
+++ b/SimplenoteIntents/Intent Handlers/NoteWidgetIntentHandler.swift	
@@ -9,7 +9,7 @@
 import Intents
 
 class NoteWidgetIntentHandler: NSObject, NoteWidgetIntentHandling {
-    let coreDataWrapper = WidgetCoreDataWrapper()
+    let coreDataWrapper = ExtensionCoreDataWrapper()
 
     func provideNoteOptionsCollection(for intent: NoteWidgetIntent, with completion: @escaping (INObjectCollection<WidgetNote>?, Error?) -> Void) {
         guard WidgetDefaults.shared.loggedIn else {
diff --git a/SimplenoteIntents/Intent Handlers/OpenNoteIntentHandler.swift b/SimplenoteIntents/Intent Handlers/OpenNoteIntentHandler.swift
index 9ad6d1746..f7984b4c5 100644
--- a/SimplenoteIntents/Intent Handlers/OpenNoteIntentHandler.swift	
+++ b/SimplenoteIntents/Intent Handlers/OpenNoteIntentHandler.swift	
@@ -9,7 +9,7 @@
 import Intents
 
 class OpenNoteIntentHandler: NSObject, OpenNoteIntentHandling {
-    let coreDataWrapper = WidgetCoreDataWrapper()
+    let coreDataWrapper = ExtensionCoreDataWrapper()
 
     func resolveNote(for intent: OpenNoteIntent) async -> IntentNoteResolutionResult {
         guard let identifier = intent.note?.identifier,
diff --git a/SimplenoteWidgets/Providers/ListWidgetProvider.swift b/SimplenoteWidgets/Providers/ListWidgetProvider.swift
index 823971869..213d985d8 100644
--- a/SimplenoteWidgets/Providers/ListWidgetProvider.swift
+++ b/SimplenoteWidgets/Providers/ListWidgetProvider.swift
@@ -42,7 +42,7 @@ struct ListWidgetProvider: IntentTimelineProvider {
     typealias Intent = ListWidgetIntent
     typealias Entry = ListWidgetEntry
 
-    let coreDataWrapper = WidgetCoreDataWrapper()
+    let coreDataWrapper = ExtensionCoreDataWrapper()
 
     func placeholder(in context: Context) -> ListWidgetEntry {
         return ListWidgetEntry.placeholder()
diff --git a/SimplenoteWidgets/Providers/NoteWidgetProvider.swift b/SimplenoteWidgets/Providers/NoteWidgetProvider.swift
index 642c956b4..67e240948 100644
--- a/SimplenoteWidgets/Providers/NoteWidgetProvider.swift
+++ b/SimplenoteWidgets/Providers/NoteWidgetProvider.swift
@@ -40,7 +40,7 @@ struct NoteWidgetProvider: IntentTimelineProvider {
     typealias Intent = NoteWidgetIntent
     typealias Entry = NoteWidgetEntry
 
-    let coreDataWrapper = WidgetCoreDataWrapper()
+    let coreDataWrapper = ExtensionCoreDataWrapper()
 
     func placeholder(in context: Context) -> NoteWidgetEntry {
         return NoteWidgetEntry.placeholder()
diff --git a/SimplenoteWidgets/Tools/WidgetCoreDataWrapper.swift b/SimplenoteWidgets/Tools/WidgetCoreDataWrapper.swift
index 40d3048cf..8ef1bb4c6 100644
--- a/SimplenoteWidgets/Tools/WidgetCoreDataWrapper.swift
+++ b/SimplenoteWidgets/Tools/WidgetCoreDataWrapper.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-class WidgetCoreDataWrapper {
+class ExtensionCoreDataWrapper {
     private lazy var coreDataManager: CoreDataManager = {
         do {
             return try CoreDataManager(StorageSettings().sharedStorageURL, for: .widgets)
@@ -9,7 +9,7 @@ class WidgetCoreDataWrapper {
         }
     }()
 
-    private lazy var widgetResultsController: WidgetResultsController = {
+    private lazy var extensionResultsController: WidgetResultsController = {
         WidgetResultsController(context: coreDataManager.managedObjectContext)
     }()
 
@@ -17,6 +17,6 @@ class WidgetCoreDataWrapper {
         guard FileManager.default.fileExists(atPath: StorageSettings().sharedStorageURL.path) else {
             return nil
         }
-        return widgetResultsController
+        return extensionResultsController
     }
 }

From 406ec4569450ec4028e01e4f25d4d2518568fd42 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Fri, 3 May 2024 15:04:05 -0600
Subject: [PATCH 135/547] Renamed widgetCoreDataWrapper file

---
 Simplenote.xcodeproj/project.pbxproj                 | 12 ++++++------
 ...aWrapper.swift => ExtensionCoreDataWrapper.swift} |  0
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename SimplenoteWidgets/Tools/{WidgetCoreDataWrapper.swift => ExtensionCoreDataWrapper.swift} (100%)

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index 046f25fd1..bb77f3519 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -565,8 +565,8 @@
 		BAFA93FA265DE8920009DCFB /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E29ADD4D17848E8500E55842 /* Images.xcassets */; };
 		BAFDBBD926B88BD200119615 /* Date+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAFDBBD726B88BD200119615 /* Date+Simplenote.swift */; };
 		BAFDBBDA26B88BD200119615 /* Date+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAFDBBD726B88BD200119615 /* Date+Simplenote.swift */; };
-		BAFFCEA626DDA9F6007F5EE3 /* WidgetCoreDataWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAFFCEA526DDA9F6007F5EE3 /* WidgetCoreDataWrapper.swift */; };
-		BAFFCEA726DDA9F6007F5EE3 /* WidgetCoreDataWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAFFCEA526DDA9F6007F5EE3 /* WidgetCoreDataWrapper.swift */; };
+		BAFFCEA626DDA9F6007F5EE3 /* ExtensionCoreDataWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAFFCEA526DDA9F6007F5EE3 /* ExtensionCoreDataWrapper.swift */; };
+		BAFFCEA726DDA9F6007F5EE3 /* ExtensionCoreDataWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAFFCEA526DDA9F6007F5EE3 /* ExtensionCoreDataWrapper.swift */; };
 		D435D38FCA5863E8447D5C2C /* Pods_Automattic_SimplenoteShare.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 183BAB896957F07FDCAB6DF5 /* Pods_Automattic_SimplenoteShare.framework */; };
 		D82BFE4B2624A8AB003DFA32 /* Settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = D82BFE4A2624A8AB003DFA32 /* Settings.swift */; };
 		D82BFE542624A8C5003DFA32 /* SimplenoteUISmokeTestsSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = D82BFE532624A8C5003DFA32 /* SimplenoteUISmokeTestsSettings.swift */; };
@@ -1218,7 +1218,7 @@
 		BAFA93EE265DE3B90009DCFB /* NewNoteWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewNoteWidget.swift; sourceTree = "<group>"; };
 		BAFA93F0265DE45D0009DCFB /* NewNoteWidgetProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewNoteWidgetProvider.swift; sourceTree = "<group>"; };
 		BAFDBBD726B88BD200119615 /* Date+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Date+Simplenote.swift"; sourceTree = "<group>"; };
-		BAFFCEA526DDA9F6007F5EE3 /* WidgetCoreDataWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetCoreDataWrapper.swift; sourceTree = "<group>"; };
+		BAFFCEA526DDA9F6007F5EE3 /* ExtensionCoreDataWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExtensionCoreDataWrapper.swift; sourceTree = "<group>"; };
 		C07B32800E3C783BDF105B3A /* Pods-Automattic-SimplenoteShare.distribution alpha.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Automattic-SimplenoteShare.distribution alpha.xcconfig"; path = "Pods/Target Support Files/Pods-Automattic-SimplenoteShare/Pods-Automattic-SimplenoteShare.distribution alpha.xcconfig"; sourceTree = "<group>"; };
 		D82BFE4A2624A8AB003DFA32 /* Settings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Settings.swift; sourceTree = "<group>"; };
 		D82BFE532624A8C5003DFA32 /* SimplenoteUISmokeTestsSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SimplenoteUISmokeTestsSettings.swift; sourceTree = "<group>"; };
@@ -2425,7 +2425,7 @@
 				BA88765026B79324001C9C9E /* DemoContent.swift */,
 				BAADC8A326C634DB004CAAA9 /* WidgetConstants.swift */,
 				BABFFF2126CF9094003A4C25 /* WidgetDefaults.swift */,
-				BAFFCEA526DDA9F6007F5EE3 /* WidgetCoreDataWrapper.swift */,
+				BAFFCEA526DDA9F6007F5EE3 /* ExtensionCoreDataWrapper.swift */,
 				BA524A0126DF1AE800DAC945 /* WidgetsState.swift */,
 			);
 			path = Tools;
@@ -3782,7 +3782,7 @@
 				BA86627226B3B1B700466746 /* NSSortDescriptor+Simplenote.swift in Sources */,
 				BAADC8A526C634DB004CAAA9 /* WidgetConstants.swift in Sources */,
 				BAF8D45526AE10FC00CA9383 /* Tag+Widget.swift in Sources */,
-				BAFFCEA726DDA9F6007F5EE3 /* WidgetCoreDataWrapper.swift in Sources */,
+				BAFFCEA726DDA9F6007F5EE3 /* ExtensionCoreDataWrapper.swift in Sources */,
 				BAF8D53C26AE175C00CA9383 /* Bundle+Simplenote.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -3820,7 +3820,7 @@
 				BA86615926B35CEF00466746 /* BuildConfiguration.swift in Sources */,
 				BAF4A97926DB10BD00C51C1D /* NoteContentHelper.swift in Sources */,
 				BAE63CB126E05325002BF81A /* NSPredicate+Email.swift in Sources */,
-				BAFFCEA626DDA9F6007F5EE3 /* WidgetCoreDataWrapper.swift in Sources */,
+				BAFFCEA626DDA9F6007F5EE3 /* ExtensionCoreDataWrapper.swift in Sources */,
 				BA122DBC265EF410003D3BC5 /* ColorStudio.swift in Sources */,
 				BA608EF926BB6F4C00A9D94E /* ListWidgetView.swift in Sources */,
 				BAE63CAF26E05312002BF81A /* NSString+Simplenote.swift in Sources */,
diff --git a/SimplenoteWidgets/Tools/WidgetCoreDataWrapper.swift b/SimplenoteWidgets/Tools/ExtensionCoreDataWrapper.swift
similarity index 100%
rename from SimplenoteWidgets/Tools/WidgetCoreDataWrapper.swift
rename to SimplenoteWidgets/Tools/ExtensionCoreDataWrapper.swift

From 03819f916bc717d2f7565c31ea648526b7c151cf Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Fri, 3 May 2024 15:07:48 -0600
Subject: [PATCH 136/547] Added intents error enum

---
 Simplenote.xcodeproj/project.pbxproj          |  4 +++
 .../OpenNoteIntentHandler.swift               |  2 +-
 SimplenoteIntents/IntentsError.swift          | 27 +++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 SimplenoteIntents/IntentsError.swift

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index bb77f3519..83c4ebbe9 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -475,6 +475,7 @@
 		BA69A5192BE0127C0096E50F /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = BA69A5182BE0127C0096E50F /* PrivacyInfo.xcprivacy */; };
 		BA69A51B2BE015640096E50F /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = BA69A51A2BE015640096E50F /* PrivacyInfo.xcprivacy */; };
 		BA69A51D2BE015BF0096E50F /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = BA69A51C2BE015BF0096E50F /* PrivacyInfo.xcprivacy */; };
+		BA6D7B8B2BE588F0006AE368 /* IntentsError.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA6D7B8A2BE588F0006AE368 /* IntentsError.swift */; };
 		BA6DA19126DB5F1B000464C8 /* URLComponents.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA6DA19026DB5F1B000464C8 /* URLComponents.swift */; };
 		BA6DA19226DB5F1B000464C8 /* URLComponents.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA6DA19026DB5F1B000464C8 /* URLComponents.swift */; };
 		BA7071E526BB68A300D5DFF0 /* ListWidgetIntent.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = BA7071E426BB68A300D5DFF0 /* ListWidgetIntent.intentdefinition */; };
@@ -1166,6 +1167,7 @@
 		BA69A5182BE0127C0096E50F /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		BA69A51A2BE015640096E50F /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		BA69A51C2BE015BF0096E50F /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
+		BA6D7B8A2BE588F0006AE368 /* IntentsError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntentsError.swift; sourceTree = "<group>"; };
 		BA6DA19026DB5F1B000464C8 /* URLComponents.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLComponents.swift; sourceTree = "<group>"; };
 		BA7071E426BB68A300D5DFF0 /* ListWidgetIntent.intentdefinition */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; path = ListWidgetIntent.intentdefinition; sourceTree = "<group>"; };
 		BA75D87D26C0843600883FFA /* Text+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Text+Simplenote.swift"; sourceTree = "<group>"; };
@@ -2401,6 +2403,7 @@
 			children = (
 				092FD78026D7BB72006BE8E2 /* Supporting Files */,
 				BAB5762626703C8200B0C56F /* IntentHandler.swift */,
+				BA6D7B8A2BE588F0006AE368 /* IntentsError.swift */,
 				BA289B702BE45A39000E6794 /* IntentsConstants.swift */,
 				BA289B622BE43949000E6794 /* Intent Handlers */,
 				BAF8D4AD26AE136D00CA9383 /* Simplenote-Intents-Bridging-Header.h */,
@@ -3764,6 +3767,7 @@
 				BA86625D26B3B14900466746 /* SortMode.swift in Sources */,
 				BA12B07026B0D0150026F31D /* SPManagedObject+Widget.swift in Sources */,
 				BAF4A9AA26DB138600C51C1D /* NoteContentHelper.swift in Sources */,
+				BA6D7B8B2BE588F0006AE368 /* IntentsError.swift in Sources */,
 				BA289B782BE45BFB000E6794 /* ActivityType.swift in Sources */,
 				BA7071E626BB68A300D5DFF0 /* ListWidgetIntent.intentdefinition in Sources */,
 				BA86622426B3AE4A00466746 /* WidgetResultsController.swift in Sources */,
diff --git a/SimplenoteIntents/Intent Handlers/OpenNoteIntentHandler.swift b/SimplenoteIntents/Intent Handlers/OpenNoteIntentHandler.swift
index f7984b4c5..5d678ee4a 100644
--- a/SimplenoteIntents/Intent Handlers/OpenNoteIntentHandler.swift	
+++ b/SimplenoteIntents/Intent Handlers/OpenNoteIntentHandler.swift	
@@ -22,7 +22,7 @@ class OpenNoteIntentHandler: NSObject, OpenNoteIntentHandling {
 
     func provideNoteOptionsCollection(for intent: OpenNoteIntent) async throws -> INObjectCollection<IntentNote> {
         guard let notes = coreDataWrapper.resultsController()?.notes() else {
-            throw fatalError("Could not fetch notes")
+            throw IntentsError.couldNotFetchNotes
         }
 
         let intentNotes = notes.map({
diff --git a/SimplenoteIntents/IntentsError.swift b/SimplenoteIntents/IntentsError.swift
new file mode 100644
index 000000000..b3c149d2b
--- /dev/null
+++ b/SimplenoteIntents/IntentsError.swift
@@ -0,0 +1,27 @@
+//
+//  IntentsError.swift
+//  SimplenoteIntents
+//
+//  Created by Charlie Scheer on 5/3/24.
+//  Copyright © 2024 Automattic. All rights reserved.
+//
+
+import Foundation
+
+enum IntentsError: Error {
+    case couldNotFetchNotes
+
+    var title: String {
+        switch self {
+        case .couldNotFetchNotes:
+            return NSLocalizedString("Could not fetch Notes", comment: "Note fetch error title")
+        }
+    }
+
+    var message: String {
+        switch self {
+        case .couldNotFetchNotes:
+            return NSLocalizedString("Attempt to fetch notes failed.  Please try again later.", comment: "Data Fetch error message")
+        }
+    }
+}

From c60cea20d0ab03cf8cde9d83d2a50cd710035b25 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Fri, 3 May 2024 16:25:50 -0600
Subject: [PATCH 137/547] Revert "Updated package.resolved"

This reverts commit c6adbb45e72896878e5989a3cd3da060d398804e.
---
 .../xcshareddata/swiftpm/Package.resolved             | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 82138b2dd..cd06d10ef 100644
--- a/Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,13 +1,12 @@
 {
-  "originHash" : "4c803bfc0eef41e640a11de86de8bd9cb6ec711e343dadfe7d14d904ae2a7283",
   "pins" : [
     {
       "identity" : "automattic-tracks-ios",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/Automattic/Automattic-Tracks-iOS",
       "state" : {
-        "revision" : "bd981ad3a08c6af6113834eb62ee7466cb8aa71c",
-        "version" : "3.4.0"
+        "revision" : "b6979ef69b4b094c8809ba83661222dcd0d7667e",
+        "version" : "3.2.0"
       }
     },
     {
@@ -24,8 +23,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/getsentry/sentry-cocoa",
       "state" : {
-        "revision" : "82af013792dca3784a2dc5e7f975159fb9d263b3",
-        "version" : "8.25.0"
+        "revision" : "3b9a8e69ca296bd8cd0e317ad7a448e5daf4a342",
+        "version" : "8.18.0"
       }
     },
     {
@@ -83,5 +82,5 @@
       }
     }
   ],
-  "version" : 3
+  "version" : 2
 }

From a5982b1c84dac7ed8cb5b310a0aa0b1efe72de28 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Tue, 7 May 2024 10:30:46 -0600
Subject: [PATCH 138/547] Added append note intent

---
 Simplenote.xcodeproj/project.pbxproj          |   4 +
 .../ShortcutIntents.intentdefinition          | 152 +++++++++++++++++-
 .../Supporting Files/Simplenote-Info.plist    |   1 +
 .../AppendNoteIntentHandler.swift             |  60 +++++++
 SimplenoteIntents/IntentHandler.swift         |   2 +
 SimplenoteIntents/Supporting Files/Info.plist |   1 +
 .../Tools/ExtensionCoreDataWrapper.swift      |   5 +
 7 files changed, 220 insertions(+), 5 deletions(-)
 create mode 100644 SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index 83c4ebbe9..24bb23637 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -451,6 +451,7 @@
 		BA32A90F26B7469F00727247 /* WidgetError.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA32A90E26B7469F00727247 /* WidgetError.swift */; };
 		BA32A91926B746A200727247 /* WidgetError.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA32A90E26B7469F00727247 /* WidgetError.swift */; };
 		BA32A91A26B746A300727247 /* WidgetError.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA32A90E26B7469F00727247 /* WidgetError.swift */; };
+		BA3580902BE95BE100CE1590 /* AppendNoteIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA35808F2BE95BE100CE1590 /* AppendNoteIntentHandler.swift */; };
 		BA3856CD2681715700F388CC /* CoreDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA3856CC2681715700F388CC /* CoreDataManager.swift */; };
 		BA3CE86226D5DF3800EFF9EB /* WidgetTag+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA3CE86126D5DF3800EFF9EB /* WidgetTag+Helpers.swift */; };
 		BA3CE8D926D5E21C00EFF9EB /* WidgetTag+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA3CE86126D5DF3800EFF9EB /* WidgetTag+Helpers.swift */; };
@@ -1144,6 +1145,7 @@
 		BA289B742BE45BBB000E6794 /* OpenNoteIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenNoteIntentHandler.swift; sourceTree = "<group>"; };
 		BA2D82C5261522F100A1695B /* PublishNoticePresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishNoticePresenter.swift; sourceTree = "<group>"; };
 		BA32A90E26B7469F00727247 /* WidgetError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetError.swift; sourceTree = "<group>"; };
+		BA35808F2BE95BE100CE1590 /* AppendNoteIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppendNoteIntentHandler.swift; sourceTree = "<group>"; };
 		BA3856CC2681715700F388CC /* CoreDataManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreDataManager.swift; sourceTree = "<group>"; };
 		BA3CE86126D5DF3800EFF9EB /* WidgetTag+Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WidgetTag+Helpers.swift"; sourceTree = "<group>"; };
 		BA3FB8CE25FEA0C500EA9A1B /* NoticeControllerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoticeControllerTests.swift; sourceTree = "<group>"; };
@@ -2333,6 +2335,7 @@
 				BA289B5A2BE4371A000E6794 /* ListWidgetIntentHandler.swift */,
 				BA289B632BE43963000E6794 /* OpenNewNoteIntentHandler.swift */,
 				BA289B742BE45BBB000E6794 /* OpenNoteIntentHandler.swift */,
+				BA35808F2BE95BE100CE1590 /* AppendNoteIntentHandler.swift */,
 			);
 			path = "Intent Handlers";
 			sourceTree = "<group>";
@@ -3769,6 +3772,7 @@
 				BAF4A9AA26DB138600C51C1D /* NoteContentHelper.swift in Sources */,
 				BA6D7B8B2BE588F0006AE368 /* IntentsError.swift in Sources */,
 				BA289B782BE45BFB000E6794 /* ActivityType.swift in Sources */,
+				BA3580902BE95BE100CE1590 /* AppendNoteIntentHandler.swift in Sources */,
 				BA7071E626BB68A300D5DFF0 /* ListWidgetIntent.intentdefinition in Sources */,
 				BA86622426B3AE4A00466746 /* WidgetResultsController.swift in Sources */,
 				BABFFF2426CF9094003A4C25 /* WidgetDefaults.swift in Sources */,
diff --git a/Simplenote/Supporting Files/ShortcutIntents.intentdefinition b/Simplenote/Supporting Files/ShortcutIntents.intentdefinition
index 646123ee2..63acac2fc 100644
--- a/Simplenote/Supporting Files/ShortcutIntents.intentdefinition	
+++ b/Simplenote/Supporting Files/ShortcutIntents.intentdefinition	
@@ -138,13 +138,109 @@
 							<key>INIntentParameterPromptDialogType</key>
 							<string>Primary</string>
 						</dict>
+					</array>
+					<key>INIntentParameterSupportsDynamicEnumeration</key>
+					<true/>
+					<key>INIntentParameterTag</key>
+					<integer>2</integer>
+					<key>INIntentParameterType</key>
+					<string>Object</string>
+				</dict>
+			</array>
+			<key>INIntentResponse</key>
+			<dict>
+				<key>INIntentResponseCodes</key>
+				<array>
+					<dict>
+						<key>INIntentResponseCodeName</key>
+						<string>success</string>
+						<key>INIntentResponseCodeSuccess</key>
+						<true/>
+					</dict>
+					<dict>
+						<key>INIntentResponseCodeName</key>
+						<string>failure</string>
+					</dict>
+				</array>
+			</dict>
+			<key>INIntentTitle</key>
+			<string>Open Note</string>
+			<key>INIntentTitleID</key>
+			<string>IQnYW1</string>
+			<key>INIntentType</key>
+			<string>Custom</string>
+			<key>INIntentVerb</key>
+			<string>Open</string>
+		</dict>
+		<dict>
+			<key>INIntentCategory</key>
+			<string>generic</string>
+			<key>INIntentClassName</key>
+			<string>AppendNoteIntent</string>
+			<key>INIntentClassPrefix</key>
+			<string>SP</string>
+			<key>INIntentConfigurable</key>
+			<true/>
+			<key>INIntentDescriptionID</key>
+			<string>EeqvcH</string>
+			<key>INIntentIneligibleForSuggestions</key>
+			<true/>
+			<key>INIntentLastParameterTag</key>
+			<integer>3</integer>
+			<key>INIntentManagedParameterCombinations</key>
+			<dict>
+				<key>note,content</key>
+				<dict>
+					<key>INIntentParameterCombinationSupportsBackgroundExecution</key>
+					<true/>
+					<key>INIntentParameterCombinationTitle</key>
+					<string>Append ${content}to ${note}</string>
+					<key>INIntentParameterCombinationTitleID</key>
+					<string>lSBG7V</string>
+					<key>INIntentParameterCombinationUpdatesLinked</key>
+					<true/>
+				</dict>
+			</dict>
+			<key>INIntentName</key>
+			<string>AppendNote</string>
+			<key>INIntentParameters</key>
+			<array>
+				<dict>
+					<key>INIntentParameterConfigurable</key>
+					<true/>
+					<key>INIntentParameterDisplayName</key>
+					<string>Note</string>
+					<key>INIntentParameterDisplayNameID</key>
+					<string>PaQ5Kk</string>
+					<key>INIntentParameterDisplayPriority</key>
+					<integer>1</integer>
+					<key>INIntentParameterName</key>
+					<string>note</string>
+					<key>INIntentParameterObjectType</key>
+					<string>IntentNote</string>
+					<key>INIntentParameterObjectTypeNamespace</key>
+					<string>BxdWY5</string>
+					<key>INIntentParameterPromptDialogs</key>
+					<array>
+						<dict>
+							<key>INIntentParameterPromptDialogCustom</key>
+							<true/>
+							<key>INIntentParameterPromptDialogType</key>
+							<string>Configuration</string>
+						</dict>
+						<dict>
+							<key>INIntentParameterPromptDialogCustom</key>
+							<true/>
+							<key>INIntentParameterPromptDialogType</key>
+							<string>Primary</string>
+						</dict>
 						<dict>
 							<key>INIntentParameterPromptDialogCustom</key>
 							<true/>
 							<key>INIntentParameterPromptDialogFormatString</key>
 							<string>There are ${count} options matching ‘${note}’.</string>
 							<key>INIntentParameterPromptDialogFormatStringID</key>
-							<string>n3Yy85</string>
+							<string>5Cplu9</string>
 							<key>INIntentParameterPromptDialogType</key>
 							<string>DisambiguationIntroduction</string>
 						</dict>
@@ -154,7 +250,7 @@
 							<key>INIntentParameterPromptDialogFormatString</key>
 							<string>Just to confirm, you wanted ‘${note}’?</string>
 							<key>INIntentParameterPromptDialogFormatStringID</key>
-							<string>v8y9Kh</string>
+							<string>P8Wb3q</string>
 							<key>INIntentParameterPromptDialogType</key>
 							<string>Confirmation</string>
 						</dict>
@@ -166,6 +262,52 @@
 					<key>INIntentParameterType</key>
 					<string>Object</string>
 				</dict>
+				<dict>
+					<key>INIntentParameterConfigurable</key>
+					<true/>
+					<key>INIntentParameterDisplayName</key>
+					<string>Content</string>
+					<key>INIntentParameterDisplayNameID</key>
+					<string>cqm5AM</string>
+					<key>INIntentParameterDisplayPriority</key>
+					<integer>2</integer>
+					<key>INIntentParameterMetadata</key>
+					<dict>
+						<key>INIntentParameterMetadataCapitalization</key>
+						<string>Sentences</string>
+						<key>INIntentParameterMetadataDefaultValueID</key>
+						<string>skTbDU</string>
+						<key>INIntentParameterMetadataMultiline</key>
+						<true/>
+					</dict>
+					<key>INIntentParameterName</key>
+					<string>content</string>
+					<key>INIntentParameterPromptDialogs</key>
+					<array>
+						<dict>
+							<key>INIntentParameterPromptDialogCustom</key>
+							<true/>
+							<key>INIntentParameterPromptDialogType</key>
+							<string>Configuration</string>
+						</dict>
+						<dict>
+							<key>INIntentParameterPromptDialogCustom</key>
+							<true/>
+							<key>INIntentParameterPromptDialogFormatString</key>
+							<string>What would you like to append to ${note}</string>
+							<key>INIntentParameterPromptDialogFormatStringID</key>
+							<string>m6yrkX</string>
+							<key>INIntentParameterPromptDialogType</key>
+							<string>Primary</string>
+						</dict>
+					</array>
+					<key>INIntentParameterSupportsResolution</key>
+					<true/>
+					<key>INIntentParameterTag</key>
+					<integer>3</integer>
+					<key>INIntentParameterType</key>
+					<string>String</string>
+				</dict>
 			</array>
 			<key>INIntentResponse</key>
 			<dict>
@@ -184,13 +326,13 @@
 				</array>
 			</dict>
 			<key>INIntentTitle</key>
-			<string>Open Note</string>
+			<string>Append To Note</string>
 			<key>INIntentTitleID</key>
-			<string>IQnYW1</string>
+			<string>d6MjpX</string>
 			<key>INIntentType</key>
 			<string>Custom</string>
 			<key>INIntentVerb</key>
-			<string>Open</string>
+			<string>Do</string>
 		</dict>
 	</array>
 	<key>INTypes</key>
diff --git a/Simplenote/Supporting Files/Simplenote-Info.plist b/Simplenote/Supporting Files/Simplenote-Info.plist
index 8d25ca1f2..c70500170 100644
--- a/Simplenote/Supporting Files/Simplenote-Info.plist	
+++ b/Simplenote/Supporting Files/Simplenote-Info.plist	
@@ -74,6 +74,7 @@
 	<string>This app does not require Photo Library access.</string>
 	<key>NSUserActivityTypes</key>
 	<array>
+		<string>AppendNoteIntent</string>
 		<string>ListWidgetIntent</string>
 		<string>NoteWidgetIntent</string>
 		<string>OpenNewNoteIntent</string>
diff --git a/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift b/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift
new file mode 100644
index 000000000..09e82e788
--- /dev/null
+++ b/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift	
@@ -0,0 +1,60 @@
+//
+//  AppendNoteIntentHandler.swift
+//  SimplenoteIntents
+//
+//  Created by Charlie Scheer on 5/6/24.
+//  Copyright © 2024 Automattic. All rights reserved.
+//
+
+import Intents
+
+class AppendNoteIntentHandler: NSObject, AppendNoteIntentHandling {
+    let coreDataWrapper = ExtensionCoreDataWrapper()
+
+    func resolveContent(for intent: AppendNoteIntent) async -> INStringResolutionResult {
+        guard let content = intent.content else {
+            return INStringResolutionResult.confirmationRequired(with: nil)
+        }
+        return INStringResolutionResult.success(with: content)
+    }
+
+    func resolveNote(for intent: AppendNoteIntent) async -> IntentNoteResolutionResult {
+        guard let identifier = intent.note?.identifier,
+              let note = coreDataWrapper.resultsController()?.note(forSimperiumKey: identifier) else {
+            return IntentNoteResolutionResult.confirmationRequired(with: nil)
+        }
+
+        return IntentNoteResolutionResult.success(with: IntentNote(identifier: note.simperiumKey, display: note.title))
+    }
+
+    func provideNoteOptionsCollection(for intent: AppendNoteIntent) async throws -> INObjectCollection<IntentNote> {
+        guard let notes = coreDataWrapper.resultsController()?.notes() else {
+            throw IntentsError.couldNotFetchNotes
+        }
+
+        let intentNotes = notes.map({
+            IntentNote(identifier: $0.simperiumKey, display: $0.title)
+        })
+        return INObjectCollection(items: intentNotes)
+    }
+
+    func handle(intent: AppendNoteIntent) async -> AppendNoteIntentResponse {
+        guard let identifier = intent.note?.identifier,
+              let content = intent.content else {
+            return AppendNoteIntentResponse(code: .failure, userActivity: nil)
+        }
+
+        guard let note = coreDataWrapper.resultsController()?.note(forSimperiumKey: identifier) else {
+            return AppendNoteIntentResponse(code: .failure, userActivity: nil)
+        }
+
+        do {
+            note.content? += " \n\n\(content)"
+            try coreDataWrapper.context().save()
+        } catch {
+            return AppendNoteIntentResponse(code: .failure, userActivity: nil)
+        }
+
+        return AppendNoteIntentResponse(code: .success, userActivity: nil)
+    }
+}
diff --git a/SimplenoteIntents/IntentHandler.swift b/SimplenoteIntents/IntentHandler.swift
index cb357191a..5cc6c985f 100644
--- a/SimplenoteIntents/IntentHandler.swift
+++ b/SimplenoteIntents/IntentHandler.swift
@@ -13,6 +13,8 @@ class IntentHandler: INExtension {
             return OpenNewNoteIntentHandler()
         case is OpenNoteIntent:
             return OpenNoteIntentHandler()
+        case is AppendNoteIntent:
+            return AppendNoteIntentHandler()
         default:
             return self
         }
diff --git a/SimplenoteIntents/Supporting Files/Info.plist b/SimplenoteIntents/Supporting Files/Info.plist
index a7c260143..43b7164eb 100644
--- a/SimplenoteIntents/Supporting Files/Info.plist	
+++ b/SimplenoteIntents/Supporting Files/Info.plist	
@@ -30,6 +30,7 @@
 			<array/>
 			<key>IntentsSupported</key>
 			<array>
+				<string>AppendNoteIntent</string>
 				<string>ListWidgetIntent</string>
 				<string>NoteWidgetIntent</string>
 				<string>OpenNewNoteIntent</string>
diff --git a/SimplenoteWidgets/Tools/ExtensionCoreDataWrapper.swift b/SimplenoteWidgets/Tools/ExtensionCoreDataWrapper.swift
index 8ef1bb4c6..777740db1 100644
--- a/SimplenoteWidgets/Tools/ExtensionCoreDataWrapper.swift
+++ b/SimplenoteWidgets/Tools/ExtensionCoreDataWrapper.swift
@@ -1,4 +1,5 @@
 import Foundation
+import CoreData
 
 class ExtensionCoreDataWrapper {
     private lazy var coreDataManager: CoreDataManager = {
@@ -19,4 +20,8 @@ class ExtensionCoreDataWrapper {
         }
         return extensionResultsController
     }
+
+    func context() -> NSManagedObjectContext {
+        coreDataManager.managedObjectContext
+    }
 }

From c770e5caba99877d20b26999aa402497633fa894 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Tue, 7 May 2024 17:22:01 -0600
Subject: [PATCH 139/547] Updated append note intent to use simperium api to
 update notes

---
 Simplenote.xcodeproj/project.pbxproj          | 10 +++++++
 .../AppendNoteIntentHandler.swift             | 17 +++++-------
 .../Simplenote-Intents-Bridging-Header.h      |  1 +
 .../SimplenoteIntents-Debug.entitlements      |  4 +++
 ...noteIntents-DistributionAlpha.entitlements |  4 +++
 ...eIntents-DistributionInternal.entitlements |  4 +++
 .../SimplenoteIntents-Release.entitlements    |  4 +++
 SimplenoteWidgets/Models/Note+Widget.swift    | 27 ++++++++++++++++---
 .../Models/SPManagedObject+Widget.swift       |  2 +-
 9 files changed, 58 insertions(+), 15 deletions(-)

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index 24bb23637..eb034ce58 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -420,6 +420,8 @@
 		BA0890A526BB9B680035CA48 /* NoteListRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA0890A426BB9B680035CA48 /* NoteListRow.swift */; };
 		BA0890A726BB9BE20035CA48 /* ListWidgetHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA0890A626BB9BE20035CA48 /* ListWidgetHeaderView.swift */; };
 		BA0890A926BB9BF80035CA48 /* NewNoteButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA0890A826BB9BF80035CA48 /* NewNoteButton.swift */; };
+		BA0AF10D2BE996600050EEBD /* KeychainManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B59560DF251A46D500A06788 /* KeychainManager.swift */; };
+		BA0AF10E2BE996630050EEBD /* KeychainPasswordItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37FD30471FC4CFA2008D0B78 /* KeychainPasswordItem.swift */; };
 		BA0ED16E26D708AC002533B6 /* Color+Widgets.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA0ED16D26D708AC002533B6 /* Color+Widgets.swift */; };
 		BA0F5E0426B62A8B0098C605 /* RemoteError.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA0F5E0326B62A8B0098C605 /* RemoteError.swift */; };
 		BA113E4D269E860500F3E3B4 /* markdown-light.css in Resources */ = {isa = PBXBuildFile; fileRef = BA113E4C269E860500F3E3B4 /* markdown-light.css */; };
@@ -451,6 +453,9 @@
 		BA32A90F26B7469F00727247 /* WidgetError.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA32A90E26B7469F00727247 /* WidgetError.swift */; };
 		BA32A91926B746A200727247 /* WidgetError.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA32A90E26B7469F00727247 /* WidgetError.swift */; };
 		BA32A91A26B746A300727247 /* WidgetError.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA32A90E26B7469F00727247 /* WidgetError.swift */; };
+		BA34B04C2BEAE9E800580E15 /* Uploader.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5CFFFE622AA9DB100B968CD /* Uploader.swift */; };
+		BA34B04D2BEAE9FE00580E15 /* SPConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = B59314D61A486B3800B651ED /* SPConstants.m */; };
+		BA34B04E2BEAEB4100580E15 /* NSURLSessionConfiguration+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AD7AB01D1C82D3009725FB /* NSURLSessionConfiguration+Extensions.swift */; };
 		BA3580902BE95BE100CE1590 /* AppendNoteIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA35808F2BE95BE100CE1590 /* AppendNoteIntentHandler.swift */; };
 		BA3856CD2681715700F388CC /* CoreDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA3856CC2681715700F388CC /* CoreDataManager.swift */; };
 		BA3CE86226D5DF3800EFF9EB /* WidgetTag+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA3CE86126D5DF3800EFF9EB /* WidgetTag+Helpers.swift */; };
@@ -3756,6 +3761,7 @@
 			files = (
 				BA86620E26B3A73D00466746 /* UserDefaults+Simplenote.swift in Sources */,
 				BAF8D52826AE173D00CA9383 /* FileManager+Simplenote.swift in Sources */,
+				BA34B04D2BEAE9FE00580E15 /* SPConstants.m in Sources */,
 				BA289B5F2BE43728000E6794 /* NoteWidgetIntentHandler.swift in Sources */,
 				BAF8D50026AE171400CA9383 /* CoreDataManager.swift in Sources */,
 				BAE63CB026E05313002BF81A /* NSString+Simplenote.swift in Sources */,
@@ -3763,10 +3769,12 @@
 				BAF8D51426AE172600CA9383 /* StorageSettings.swift in Sources */,
 				BA289B5C2BE4371A000E6794 /* ListWidgetIntentHandler.swift in Sources */,
 				BA86616326B35CF000466746 /* BuildConfiguration.swift in Sources */,
+				BA34B04C2BEAE9E800580E15 /* Uploader.swift in Sources */,
 				BA289B722BE45A39000E6794 /* IntentsConstants.swift in Sources */,
 				BAB5762726703C8200B0C56F /* IntentHandler.swift in Sources */,
 				BA289B652BE43963000E6794 /* OpenNewNoteIntentHandler.swift in Sources */,
 				BA289B592BE436EB000E6794 /* ShortcutIntents.intentdefinition in Sources */,
+				BA0AF10D2BE996600050EEBD /* KeychainManager.swift in Sources */,
 				BA86625D26B3B14900466746 /* SortMode.swift in Sources */,
 				BA12B07026B0D0150026F31D /* SPManagedObject+Widget.swift in Sources */,
 				BAF4A9AA26DB138600C51C1D /* NoteContentHelper.swift in Sources */,
@@ -3788,7 +3796,9 @@
 				BAFDBBDA26B88BD200119615 /* Date+Simplenote.swift in Sources */,
 				BA3CE8D926D5E21C00EFF9EB /* WidgetTag+Helpers.swift in Sources */,
 				BA86627226B3B1B700466746 /* NSSortDescriptor+Simplenote.swift in Sources */,
+				BA0AF10E2BE996630050EEBD /* KeychainPasswordItem.swift in Sources */,
 				BAADC8A526C634DB004CAAA9 /* WidgetConstants.swift in Sources */,
+				BA34B04E2BEAEB4100580E15 /* NSURLSessionConfiguration+Extensions.swift in Sources */,
 				BAF8D45526AE10FC00CA9383 /* Tag+Widget.swift in Sources */,
 				BAFFCEA726DDA9F6007F5EE3 /* ExtensionCoreDataWrapper.swift in Sources */,
 				BAF8D53C26AE175C00CA9383 /* Bundle+Simplenote.swift in Sources */,
diff --git a/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift b/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift
index 09e82e788..e32e88e74 100644
--- a/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift	
+++ b/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift	
@@ -40,20 +40,15 @@ class AppendNoteIntentHandler: NSObject, AppendNoteIntentHandling {
 
     func handle(intent: AppendNoteIntent) async -> AppendNoteIntentResponse {
         guard let identifier = intent.note?.identifier,
-              let content = intent.content else {
+              let content = intent.content,
+              let note = coreDataWrapper.resultsController()?.note(forSimperiumKey: identifier),
+              let token = KeychainManager.extensionToken else {
             return AppendNoteIntentResponse(code: .failure, userActivity: nil)
         }
 
-        guard let note = coreDataWrapper.resultsController()?.note(forSimperiumKey: identifier) else {
-            return AppendNoteIntentResponse(code: .failure, userActivity: nil)
-        }
-
-        do {
-            note.content? += " \n\n\(content)"
-            try coreDataWrapper.context().save()
-        } catch {
-            return AppendNoteIntentResponse(code: .failure, userActivity: nil)
-        }
+        note.content? += "\n\n\(content)"
+        let uploader = Uploader(simperiumToken: token)
+        uploader.send(note)
 
         return AppendNoteIntentResponse(code: .success, userActivity: nil)
     }
diff --git a/SimplenoteIntents/Simplenote-Intents-Bridging-Header.h b/SimplenoteIntents/Simplenote-Intents-Bridging-Header.h
index 401ca562b..4df3baf3c 100644
--- a/SimplenoteIntents/Simplenote-Intents-Bridging-Header.h
+++ b/SimplenoteIntents/Simplenote-Intents-Bridging-Header.h
@@ -4,3 +4,4 @@
 
 
 #import "Foundation/Foundation.h"
+#import "SPConstants.h"
diff --git a/SimplenoteIntents/Supporting Files/SimplenoteIntents-Debug.entitlements b/SimplenoteIntents/Supporting Files/SimplenoteIntents-Debug.entitlements
index 5de89cd5d..ee3f29675 100644
--- a/SimplenoteIntents/Supporting Files/SimplenoteIntents-Debug.entitlements	
+++ b/SimplenoteIntents/Supporting Files/SimplenoteIntents-Debug.entitlements	
@@ -6,5 +6,9 @@
 	<array>
 		<string>group.com.codality.NotationalFlow.Development</string>
 	</array>
+	<key>keychain-access-groups</key>
+	<array>
+		<string>$(AppIdentifierPrefix)com.codality.NotationalFlow.Development</string>
+	</array>
 </dict>
 </plist>
diff --git a/SimplenoteIntents/Supporting Files/SimplenoteIntents-DistributionAlpha.entitlements b/SimplenoteIntents/Supporting Files/SimplenoteIntents-DistributionAlpha.entitlements
index 402ef9d34..d65b0e5ff 100644
--- a/SimplenoteIntents/Supporting Files/SimplenoteIntents-DistributionAlpha.entitlements	
+++ b/SimplenoteIntents/Supporting Files/SimplenoteIntents-DistributionAlpha.entitlements	
@@ -6,5 +6,9 @@
 	<array>
 		<string>group.com.codality.NotationalFlow.Alpha</string>
 	</array>
+	<key>keychain-access-groups</key>
+	<array>
+		<string>$(AppIdentifierPrefix)com.codality.NotationalFlow.Development</string>
+	</array>
 </dict>
 </plist>
diff --git a/SimplenoteIntents/Supporting Files/SimplenoteIntents-DistributionInternal.entitlements b/SimplenoteIntents/Supporting Files/SimplenoteIntents-DistributionInternal.entitlements
index bd8e7994c..d2102e458 100644
--- a/SimplenoteIntents/Supporting Files/SimplenoteIntents-DistributionInternal.entitlements	
+++ b/SimplenoteIntents/Supporting Files/SimplenoteIntents-DistributionInternal.entitlements	
@@ -6,5 +6,9 @@
 	<array>
 		<string>group.com.codality.NotationalFlow.Internal</string>
 	</array>
+	<key>keychain-access-groups</key>
+	<array>
+		<string>$(AppIdentifierPrefix)com.codality.NotationalFlow.Development</string>
+	</array>
 </dict>
 </plist>
diff --git a/SimplenoteIntents/Supporting Files/SimplenoteIntents-Release.entitlements b/SimplenoteIntents/Supporting Files/SimplenoteIntents-Release.entitlements
index b11d6f107..065b3dbe3 100644
--- a/SimplenoteIntents/Supporting Files/SimplenoteIntents-Release.entitlements	
+++ b/SimplenoteIntents/Supporting Files/SimplenoteIntents-Release.entitlements	
@@ -6,6 +6,10 @@
 	<array>
 		<string>group.com.codality.NotationalFlow</string>
 	</array>
+	<key>keychain-access-groups</key>
+	<array>
+		<string>$(AppIdentifierPrefix)com.codality.NotationalFlow.Development</string>
+	</array>
 	<key>previous-application-identifiers</key>
 	<array>
 		<string>4ESDVWK654.com.codality.NotationalFlow</string>
diff --git a/SimplenoteWidgets/Models/Note+Widget.swift b/SimplenoteWidgets/Models/Note+Widget.swift
index 093fe923f..a889e71a6 100644
--- a/SimplenoteWidgets/Models/Note+Widget.swift
+++ b/SimplenoteWidgets/Models/Note+Widget.swift
@@ -60,11 +60,32 @@ extension Note {
     }
 
     var url: URL {
-        guard let simperiumKey = simperiumKey else {
-            return URL(string: .simplenotePath())!
-        }
         return URL(string: .simplenotePath(withHost: SimplenoteConstants.simplenoteInterlinkHost) + simperiumKey)!
     }
+
+    func toDictionary() -> [String: Any] {
+        var systemTags = [String]()
+
+        return [
+            "tags": [],
+            "deleted": 0,
+            "shareURL": String(),
+            "publishURL": String(),
+            "content": content ?? "",
+            "systemTags": systemTags,
+            "creationDate": (creationDate ?? .now).timeIntervalSince1970,
+            "modificationDate": (modificationDate ?? .now).timeIntervalSince1970
+        ]
+    }
+
+    func toJsonData() -> Data? {
+        do {
+            return try JSONSerialization.data(withJSONObject: toDictionary(), options: .prettyPrinted)
+        } catch {
+            print("Error converting Note to JSON: \(error)")
+            return nil
+        }
+    }
 }
 
 private struct Constants {
diff --git a/SimplenoteWidgets/Models/SPManagedObject+Widget.swift b/SimplenoteWidgets/Models/SPManagedObject+Widget.swift
index c695f28fe..73c0eb618 100644
--- a/SimplenoteWidgets/Models/SPManagedObject+Widget.swift
+++ b/SimplenoteWidgets/Models/SPManagedObject+Widget.swift
@@ -17,5 +17,5 @@ extension SPManagedObject {
     }
 
     @NSManaged public var ghostData: String?
-    @NSManaged public var simperiumKey: String?
+    @NSManaged public var simperiumKey: String
 }

From 5ae21cc51c24a6fc987535c736ed31b4d90e379c Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Tue, 7 May 2024 17:23:59 -0600
Subject: [PATCH 140/547] Updated intent keychain entitlements to match share
 extension

---
 Simplenote.xcodeproj/project.pbxproj          |  4 +++-
 .../SimplenoteIntentsRelease.entitlements     | 19 +++++++++++++++++++
 ...noteIntents-DistributionAlpha.entitlements |  2 +-
 ...eIntents-DistributionInternal.entitlements |  2 +-
 .../SimplenoteIntents-Release.entitlements    |  3 ++-
 5 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 SimplenoteIntents/SimplenoteIntentsRelease.entitlements

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index eb034ce58..14a0c1700 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -1150,6 +1150,7 @@
 		BA289B742BE45BBB000E6794 /* OpenNoteIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenNoteIntentHandler.swift; sourceTree = "<group>"; };
 		BA2D82C5261522F100A1695B /* PublishNoticePresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishNoticePresenter.swift; sourceTree = "<group>"; };
 		BA32A90E26B7469F00727247 /* WidgetError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetError.swift; sourceTree = "<group>"; };
+		BA34B04F2BEAEF4800580E15 /* SimplenoteIntentsRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = SimplenoteIntentsRelease.entitlements; sourceTree = "<group>"; };
 		BA35808F2BE95BE100CE1590 /* AppendNoteIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppendNoteIntentHandler.swift; sourceTree = "<group>"; };
 		BA3856CC2681715700F388CC /* CoreDataManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreDataManager.swift; sourceTree = "<group>"; };
 		BA3CE86126D5DF3800EFF9EB /* WidgetTag+Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WidgetTag+Helpers.swift"; sourceTree = "<group>"; };
@@ -2409,6 +2410,7 @@
 		BAB5762526703C8200B0C56F /* SimplenoteIntents */ = {
 			isa = PBXGroup;
 			children = (
+				BA34B04F2BEAEF4800580E15 /* SimplenoteIntentsRelease.entitlements */,
 				092FD78026D7BB72006BE8E2 /* Supporting Files */,
 				BAB5762626703C8200B0C56F /* IntentHandler.swift */,
 				BA6D7B8A2BE588F0006AE368 /* IntentsError.swift */,
@@ -5352,7 +5354,7 @@
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CODE_SIGN_ENTITLEMENTS = "SimplenoteIntents/Supporting Files/SimplenoteIntents-Release.entitlements";
+				CODE_SIGN_ENTITLEMENTS = SimplenoteIntents/SimplenoteIntentsRelease.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
diff --git a/SimplenoteIntents/SimplenoteIntentsRelease.entitlements b/SimplenoteIntents/SimplenoteIntentsRelease.entitlements
new file mode 100644
index 000000000..084553593
--- /dev/null
+++ b/SimplenoteIntents/SimplenoteIntentsRelease.entitlements
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>group.com.codality.NotationalFlow</string>
+	</array>
+	<key>keychain-access-groups</key>
+	<array>
+		<string>$(AppIdentifierPrefix)com.codality.NotationalFlow</string>
+		<string>$(AppIdentifierPrefix)4ESDVWK654.com.codality.NotationalFlow</string>
+	</array>
+	<key>previous-application-identifiers</key>
+	<array>
+		<string>4ESDVWK654.com.codality.NotationalFlow</string>
+	</array>
+</dict>
+</plist>
diff --git a/SimplenoteIntents/Supporting Files/SimplenoteIntents-DistributionAlpha.entitlements b/SimplenoteIntents/Supporting Files/SimplenoteIntents-DistributionAlpha.entitlements
index d65b0e5ff..2483a1da9 100644
--- a/SimplenoteIntents/Supporting Files/SimplenoteIntents-DistributionAlpha.entitlements	
+++ b/SimplenoteIntents/Supporting Files/SimplenoteIntents-DistributionAlpha.entitlements	
@@ -8,7 +8,7 @@
 	</array>
 	<key>keychain-access-groups</key>
 	<array>
-		<string>$(AppIdentifierPrefix)com.codality.NotationalFlow.Development</string>
+		<string>$(AppIdentifierPrefix)com.codality.NotationalFlow.Alpha</string>
 	</array>
 </dict>
 </plist>
diff --git a/SimplenoteIntents/Supporting Files/SimplenoteIntents-DistributionInternal.entitlements b/SimplenoteIntents/Supporting Files/SimplenoteIntents-DistributionInternal.entitlements
index d2102e458..f69540697 100644
--- a/SimplenoteIntents/Supporting Files/SimplenoteIntents-DistributionInternal.entitlements	
+++ b/SimplenoteIntents/Supporting Files/SimplenoteIntents-DistributionInternal.entitlements	
@@ -8,7 +8,7 @@
 	</array>
 	<key>keychain-access-groups</key>
 	<array>
-		<string>$(AppIdentifierPrefix)com.codality.NotationalFlow.Development</string>
+		<string>$(AppIdentifierPrefix)com.codality.NotationalFlow.Internal</string>
 	</array>
 </dict>
 </plist>
diff --git a/SimplenoteIntents/Supporting Files/SimplenoteIntents-Release.entitlements b/SimplenoteIntents/Supporting Files/SimplenoteIntents-Release.entitlements
index 065b3dbe3..084553593 100644
--- a/SimplenoteIntents/Supporting Files/SimplenoteIntents-Release.entitlements	
+++ b/SimplenoteIntents/Supporting Files/SimplenoteIntents-Release.entitlements	
@@ -8,7 +8,8 @@
 	</array>
 	<key>keychain-access-groups</key>
 	<array>
-		<string>$(AppIdentifierPrefix)com.codality.NotationalFlow.Development</string>
+		<string>$(AppIdentifierPrefix)com.codality.NotationalFlow</string>
+		<string>$(AppIdentifierPrefix)4ESDVWK654.com.codality.NotationalFlow</string>
 	</array>
 	<key>previous-application-identifiers</key>
 	<array>

From 8099d7809e997d840a9f26e2667a698730c77ce9 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Tue, 7 May 2024 18:12:36 -0600
Subject: [PATCH 141/547] Fixed issue where running append note intent would
 overwrite tags

---
 SimplenoteWidgets/Models/Note+Widget.swift | 31 +++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/SimplenoteWidgets/Models/Note+Widget.swift b/SimplenoteWidgets/Models/Note+Widget.swift
index a889e71a6..83eebc3b8 100644
--- a/SimplenoteWidgets/Models/Note+Widget.swift
+++ b/SimplenoteWidgets/Models/Note+Widget.swift
@@ -63,16 +63,41 @@ extension Note {
         return URL(string: .simplenotePath(withHost: SimplenoteConstants.simplenoteInterlinkHost) + simperiumKey)!
     }
 
+    private func objectFromJSONString(_ json: String) -> Any? {
+        guard let data = json.data(using: .utf8) else {
+            return nil
+        }
+
+        return try? JSONSerialization.jsonObject(with: data)
+    }
+
+    var tagsArray: [String] {
+        guard let tagsString = tags,
+              let array = objectFromJSONString(tagsString) as? [String] else {
+            return []
+        }
+
+        return array
+    }
+
+    var systemTagsArray: [String] {
+        guard let systemTagsString = systemTags,
+              let array = objectFromJSONString(systemTagsString) as? [String] else {
+            return []
+        }
+
+        return array
+    }
+
     func toDictionary() -> [String: Any] {
-        var systemTags = [String]()
 
         return [
-            "tags": [],
+            "tags": tagsArray,
             "deleted": 0,
             "shareURL": String(),
             "publishURL": String(),
             "content": content ?? "",
-            "systemTags": systemTags,
+            "systemTags": systemTagsArray,
             "creationDate": (creationDate ?? .now).timeIntervalSince1970,
             "modificationDate": (modificationDate ?? .now).timeIntervalSince1970
         ]

From 7aa5424c5af769b0a9c0d6676a15df7ce7562a03 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Wed, 8 May 2024 11:29:21 -0600
Subject: [PATCH 142/547] Fixed issue where append note might overwrite publish
 or share urls

---
 SimplenoteWidgets/Models/Note+Widget.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SimplenoteWidgets/Models/Note+Widget.swift b/SimplenoteWidgets/Models/Note+Widget.swift
index 83eebc3b8..5530b0ddb 100644
--- a/SimplenoteWidgets/Models/Note+Widget.swift
+++ b/SimplenoteWidgets/Models/Note+Widget.swift
@@ -94,8 +94,8 @@ extension Note {
         return [
             "tags": tagsArray,
             "deleted": 0,
-            "shareURL": String(),
-            "publishURL": String(),
+            "shareURL": shareURL ?? String(),
+            "publishURL": publishURL ?? String(),
             "content": content ?? "",
             "systemTags": systemTagsArray,
             "creationDate": (creationDate ?? .now).timeIntervalSince1970,

From 4e13ca1b906adb26ca0294a22b2bb2d58b974684 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Wed, 8 May 2024 15:20:32 -0600
Subject: [PATCH 143/547] Removed some code duplication in append and open note
 intents

---
 Simplenote.xcodeproj/project.pbxproj          | 12 +++++++
 .../AppendNoteIntentHandler.swift             | 15 ++------
 .../OpenNoteIntentHandler.swift               | 15 ++------
 .../IntentNote+Helpers.swift                  | 34 +++++++++++++++++++
 .../Tools/WidgetResultsController.swift       |  4 +++
 5 files changed, 54 insertions(+), 26 deletions(-)
 create mode 100644 SimplenoteIntents/ResolutionResults/IntentNote+Helpers.swift

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index 14a0c1700..e176d1187 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -456,6 +456,7 @@
 		BA34B04C2BEAE9E800580E15 /* Uploader.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5CFFFE622AA9DB100B968CD /* Uploader.swift */; };
 		BA34B04D2BEAE9FE00580E15 /* SPConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = B59314D61A486B3800B651ED /* SPConstants.m */; };
 		BA34B04E2BEAEB4100580E15 /* NSURLSessionConfiguration+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AD7AB01D1C82D3009725FB /* NSURLSessionConfiguration+Extensions.swift */; };
+		BA34B0572BEC216B00580E15 /* IntentNote+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA34B0562BEC216B00580E15 /* IntentNote+Helpers.swift */; };
 		BA3580902BE95BE100CE1590 /* AppendNoteIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA35808F2BE95BE100CE1590 /* AppendNoteIntentHandler.swift */; };
 		BA3856CD2681715700F388CC /* CoreDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA3856CC2681715700F388CC /* CoreDataManager.swift */; };
 		BA3CE86226D5DF3800EFF9EB /* WidgetTag+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA3CE86126D5DF3800EFF9EB /* WidgetTag+Helpers.swift */; };
@@ -1151,6 +1152,7 @@
 		BA2D82C5261522F100A1695B /* PublishNoticePresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishNoticePresenter.swift; sourceTree = "<group>"; };
 		BA32A90E26B7469F00727247 /* WidgetError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetError.swift; sourceTree = "<group>"; };
 		BA34B04F2BEAEF4800580E15 /* SimplenoteIntentsRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = SimplenoteIntentsRelease.entitlements; sourceTree = "<group>"; };
+		BA34B0562BEC216B00580E15 /* IntentNote+Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "IntentNote+Helpers.swift"; sourceTree = "<group>"; };
 		BA35808F2BE95BE100CE1590 /* AppendNoteIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppendNoteIntentHandler.swift; sourceTree = "<group>"; };
 		BA3856CC2681715700F388CC /* CoreDataManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreDataManager.swift; sourceTree = "<group>"; };
 		BA3CE86126D5DF3800EFF9EB /* WidgetTag+Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WidgetTag+Helpers.swift"; sourceTree = "<group>"; };
@@ -2346,6 +2348,14 @@
 			path = "Intent Handlers";
 			sourceTree = "<group>";
 		};
+		BA34B0552BEC214800580E15 /* ResolutionResults */ = {
+			isa = PBXGroup;
+			children = (
+				BA34B0562BEC216B00580E15 /* IntentNote+Helpers.swift */,
+			);
+			path = ResolutionResults;
+			sourceTree = "<group>";
+		};
 		BA3FB8CD25FEA09F00EA9A1B /* Notice */ = {
 			isa = PBXGroup;
 			children = (
@@ -2416,6 +2426,7 @@
 				BA6D7B8A2BE588F0006AE368 /* IntentsError.swift */,
 				BA289B702BE45A39000E6794 /* IntentsConstants.swift */,
 				BA289B622BE43949000E6794 /* Intent Handlers */,
+				BA34B0552BEC214800580E15 /* ResolutionResults */,
 				BAF8D4AD26AE136D00CA9383 /* Simplenote-Intents-Bridging-Header.h */,
 			);
 			path = SimplenoteIntents;
@@ -3773,6 +3784,7 @@
 				BA86616326B35CF000466746 /* BuildConfiguration.swift in Sources */,
 				BA34B04C2BEAE9E800580E15 /* Uploader.swift in Sources */,
 				BA289B722BE45A39000E6794 /* IntentsConstants.swift in Sources */,
+				BA34B0572BEC216B00580E15 /* IntentNote+Helpers.swift in Sources */,
 				BAB5762726703C8200B0C56F /* IntentHandler.swift in Sources */,
 				BA289B652BE43963000E6794 /* OpenNewNoteIntentHandler.swift in Sources */,
 				BA289B592BE436EB000E6794 /* ShortcutIntents.intentdefinition in Sources */,
diff --git a/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift b/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift
index e32e88e74..54a53e653 100644
--- a/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift	
+++ b/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift	
@@ -19,22 +19,11 @@ class AppendNoteIntentHandler: NSObject, AppendNoteIntentHandling {
     }
 
     func resolveNote(for intent: AppendNoteIntent) async -> IntentNoteResolutionResult {
-        guard let identifier = intent.note?.identifier,
-              let note = coreDataWrapper.resultsController()?.note(forSimperiumKey: identifier) else {
-            return IntentNoteResolutionResult.confirmationRequired(with: nil)
-        }
-
-        return IntentNoteResolutionResult.success(with: IntentNote(identifier: note.simperiumKey, display: note.title))
+        IntentNoteResolutionResult.resolve(intent.note, in: coreDataWrapper)
     }
 
     func provideNoteOptionsCollection(for intent: AppendNoteIntent) async throws -> INObjectCollection<IntentNote> {
-        guard let notes = coreDataWrapper.resultsController()?.notes() else {
-            throw IntentsError.couldNotFetchNotes
-        }
-
-        let intentNotes = notes.map({
-            IntentNote(identifier: $0.simperiumKey, display: $0.title)
-        })
+        let intentNotes = try IntentNote.allNotes(in: coreDataWrapper)
         return INObjectCollection(items: intentNotes)
     }
 
diff --git a/SimplenoteIntents/Intent Handlers/OpenNoteIntentHandler.swift b/SimplenoteIntents/Intent Handlers/OpenNoteIntentHandler.swift
index 5d678ee4a..1fec7c593 100644
--- a/SimplenoteIntents/Intent Handlers/OpenNoteIntentHandler.swift	
+++ b/SimplenoteIntents/Intent Handlers/OpenNoteIntentHandler.swift	
@@ -12,22 +12,11 @@ class OpenNoteIntentHandler: NSObject, OpenNoteIntentHandling {
     let coreDataWrapper = ExtensionCoreDataWrapper()
 
     func resolveNote(for intent: OpenNoteIntent) async -> IntentNoteResolutionResult {
-        guard let identifier = intent.note?.identifier,
-              let note = coreDataWrapper.resultsController()?.note(forSimperiumKey: identifier) else {
-            return IntentNoteResolutionResult.confirmationRequired(with: nil)
-        }
-
-        return IntentNoteResolutionResult.success(with: IntentNote(identifier: note.simperiumKey, display: note.title))
+        IntentNoteResolutionResult.resolve(intent.note, in: coreDataWrapper)
     }
 
     func provideNoteOptionsCollection(for intent: OpenNoteIntent) async throws -> INObjectCollection<IntentNote> {
-        guard let notes = coreDataWrapper.resultsController()?.notes() else {
-            throw IntentsError.couldNotFetchNotes
-        }
-
-        let intentNotes = notes.map({
-            IntentNote(identifier: $0.simperiumKey, display: $0.title)
-        })
+        let intentNotes = try IntentNote.allNotes(in: coreDataWrapper)
         return INObjectCollection(items: intentNotes)
     }
 
diff --git a/SimplenoteIntents/ResolutionResults/IntentNote+Helpers.swift b/SimplenoteIntents/ResolutionResults/IntentNote+Helpers.swift
new file mode 100644
index 000000000..6d2824ebe
--- /dev/null
+++ b/SimplenoteIntents/ResolutionResults/IntentNote+Helpers.swift
@@ -0,0 +1,34 @@
+//
+//  IntentNote+Helpers.swift
+//  SimplenoteIntents
+//
+//  Created by Charlie Scheer on 5/8/24.
+//  Copyright © 2024 Automattic. All rights reserved.
+//
+
+import Intents
+
+extension IntentNoteResolutionResult {
+    static func resolve(_ intentNote: IntentNote?, in coreDataWrapper: ExtensionCoreDataWrapper) -> IntentNoteResolutionResult {
+        guard let intentNote = intentNote,
+              let identifier = intentNote.identifier else {
+            return IntentNoteResolutionResult.needsValue()
+        }
+
+        guard coreDataWrapper.resultsController()?.noteExists(forSimperiumKey: identifier) == true else {
+            return IntentNoteResolutionResult.unsupported()
+        }
+
+        return IntentNoteResolutionResult.success(with: intentNote)
+    }
+}
+
+extension IntentNote {
+    static func allNotes(in coreDataWrapper: ExtensionCoreDataWrapper) throws -> [IntentNote] {
+        guard let notes = coreDataWrapper.resultsController()?.notes() else {
+            throw IntentsError.couldNotFetchNotes
+        }
+
+        return notes.map({ IntentNote(identifier: $0.simperiumKey, display: $0.title) })
+    }
+}
diff --git a/SimplenoteWidgets/Tools/WidgetResultsController.swift b/SimplenoteWidgets/Tools/WidgetResultsController.swift
index 61b775a0b..0440652a2 100644
--- a/SimplenoteWidgets/Tools/WidgetResultsController.swift
+++ b/SimplenoteWidgets/Tools/WidgetResultsController.swift
@@ -44,6 +44,10 @@ class WidgetResultsController {
         return fetched?.first
     }
 
+    func noteExists(forSimperiumKey key: String) -> Bool {
+        note(forSimperiumKey: key) != nil
+    }
+
     /// Creates a predicate for notes given a tag name.  If not specified the predicate is for all notes that are not deleted
     ///
     private func predicateForNotes(filteredBy tagFilter: TagsFilter = .allNotes) -> NSPredicate {

From 007b947591d8027a28ceaff424ff06bcb9392952 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Wed, 8 May 2024 15:22:12 -0600
Subject: [PATCH 144/547] Renamed widgetResultsController to
 ExtensionResultsController

---
 Simplenote.xcodeproj/project.pbxproj                 | 12 ++++++------
 .../Tools/ExtensionCoreDataWrapper.swift             |  6 +++---
 ...roller.swift => ExtensionResultsController.swift} |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)
 rename SimplenoteWidgets/Tools/{WidgetResultsController.swift => ExtensionResultsController.swift} (99%)

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index e176d1187..f3b376944 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -496,8 +496,8 @@
 		BA86616326B35CF000466746 /* BuildConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = F920265A2294661C0061B1DE /* BuildConfiguration.swift */; };
 		BA86620E26B3A73D00466746 /* UserDefaults+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DF734322A56E2800602CE7 /* UserDefaults+Simplenote.swift */; };
 		BA86621826B3A73D00466746 /* UserDefaults+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DF734322A56E2800602CE7 /* UserDefaults+Simplenote.swift */; };
-		BA86622326B3AE4A00466746 /* WidgetResultsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA86622226B3AE4A00466746 /* WidgetResultsController.swift */; };
-		BA86622426B3AE4A00466746 /* WidgetResultsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA86622226B3AE4A00466746 /* WidgetResultsController.swift */; };
+		BA86622326B3AE4A00466746 /* ExtensionResultsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA86622226B3AE4A00466746 /* ExtensionResultsController.swift */; };
+		BA86622426B3AE4A00466746 /* ExtensionResultsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA86622226B3AE4A00466746 /* ExtensionResultsController.swift */; };
 		BA86624926B3B05100466746 /* SimplenoteConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5095DC824632E3300812711 /* SimplenoteConstants.swift */; };
 		BA86625326B3B14800466746 /* SortMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DF734522A5713600602CE7 /* SortMode.swift */; };
 		BA86625D26B3B14900466746 /* SortMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DF734522A5713600602CE7 /* SortMode.swift */; };
@@ -1189,7 +1189,7 @@
 		BA8661D626B3A08700466746 /* SimplenoteIntents-Debug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "SimplenoteIntents-Debug.entitlements"; sourceTree = "<group>"; };
 		BA8661D726B3A0A000466746 /* SimplenoteIntents-Release.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "SimplenoteIntents-Release.entitlements"; sourceTree = "<group>"; };
 		BA8661D826B3A0B000466746 /* SimplenoteIntents-DistributionInternal.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "SimplenoteIntents-DistributionInternal.entitlements"; sourceTree = "<group>"; };
-		BA86622226B3AE4A00466746 /* WidgetResultsController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetResultsController.swift; sourceTree = "<group>"; };
+		BA86622226B3AE4A00466746 /* ExtensionResultsController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExtensionResultsController.swift; sourceTree = "<group>"; };
 		BA88765026B79324001C9C9E /* DemoContent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoContent.swift; sourceTree = "<group>"; };
 		BA8FC2A4267AC7470082962E /* SharedStorageMigrator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharedStorageMigrator.swift; sourceTree = "<group>"; };
 		BA9B19F826A8EF3200692366 /* SpinnerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpinnerViewController.swift; sourceTree = "<group>"; };
@@ -2445,7 +2445,7 @@
 		BAF8D4CB26AE142C00CA9383 /* Tools */ = {
 			isa = PBXGroup;
 			children = (
-				BA86622226B3AE4A00466746 /* WidgetResultsController.swift */,
+				BA86622226B3AE4A00466746 /* ExtensionResultsController.swift */,
 				BA88765026B79324001C9C9E /* DemoContent.swift */,
 				BAADC8A326C634DB004CAAA9 /* WidgetConstants.swift */,
 				BABFFF2126CF9094003A4C25 /* WidgetDefaults.swift */,
@@ -3796,7 +3796,7 @@
 				BA289B782BE45BFB000E6794 /* ActivityType.swift in Sources */,
 				BA3580902BE95BE100CE1590 /* AppendNoteIntentHandler.swift in Sources */,
 				BA7071E626BB68A300D5DFF0 /* ListWidgetIntent.intentdefinition in Sources */,
-				BA86622426B3AE4A00466746 /* WidgetResultsController.swift in Sources */,
+				BA86622426B3AE4A00466746 /* ExtensionResultsController.swift in Sources */,
 				BABFFF2426CF9094003A4C25 /* WidgetDefaults.swift in Sources */,
 				BA289B762BE45BBB000E6794 /* OpenNoteIntentHandler.swift in Sources */,
 				BAF8D46E26AE118800CA9383 /* SPCredentials.swift in Sources */,
@@ -3845,7 +3845,7 @@
 				BAB6C04226BA496F007495C4 /* String+Simplenote.swift in Sources */,
 				BA122DBB265EF40E003D3BC5 /* UIColor+Helpers.swift in Sources */,
 				BA75D8BA26C0865C00883FFA /* Filling.swift in Sources */,
-				BA86622326B3AE4A00466746 /* WidgetResultsController.swift in Sources */,
+				BA86622326B3AE4A00466746 /* ExtensionResultsController.swift in Sources */,
 				BA0890A926BB9BF80035CA48 /* NewNoteButton.swift in Sources */,
 				BA122DBA265EF402003D3BC5 /* SimplenoteConstants.swift in Sources */,
 				BAF8D51E26AE173D00CA9383 /* FileManager+Simplenote.swift in Sources */,
diff --git a/SimplenoteWidgets/Tools/ExtensionCoreDataWrapper.swift b/SimplenoteWidgets/Tools/ExtensionCoreDataWrapper.swift
index 777740db1..a688a7788 100644
--- a/SimplenoteWidgets/Tools/ExtensionCoreDataWrapper.swift
+++ b/SimplenoteWidgets/Tools/ExtensionCoreDataWrapper.swift
@@ -10,11 +10,11 @@ class ExtensionCoreDataWrapper {
         }
     }()
 
-    private lazy var extensionResultsController: WidgetResultsController = {
-        WidgetResultsController(context: coreDataManager.managedObjectContext)
+    private lazy var extensionResultsController: ExtensionResultsController = {
+        ExtensionResultsController(context: coreDataManager.managedObjectContext)
     }()
 
-    func resultsController() -> WidgetResultsController? {
+    func resultsController() -> ExtensionResultsController? {
         guard FileManager.default.fileExists(atPath: StorageSettings().sharedStorageURL.path) else {
             return nil
         }
diff --git a/SimplenoteWidgets/Tools/WidgetResultsController.swift b/SimplenoteWidgets/Tools/ExtensionResultsController.swift
similarity index 99%
rename from SimplenoteWidgets/Tools/WidgetResultsController.swift
rename to SimplenoteWidgets/Tools/ExtensionResultsController.swift
index 0440652a2..9ddf181a3 100644
--- a/SimplenoteWidgets/Tools/WidgetResultsController.swift
+++ b/SimplenoteWidgets/Tools/ExtensionResultsController.swift
@@ -3,7 +3,7 @@ import SimplenoteFoundation
 import SimplenoteSearch
 import CoreData
 
-class WidgetResultsController {
+class ExtensionResultsController {
 
     /// Data Controller
     ///

From 1ada14c5a631b03209015f488fa054d10814e8ab Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Wed, 8 May 2024 15:23:48 -0600
Subject: [PATCH 145/547] Updated append note intent to return correct response
 if missing content

---
 SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift b/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift
index 54a53e653..07fe62c7e 100644
--- a/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift	
+++ b/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift	
@@ -13,7 +13,7 @@ class AppendNoteIntentHandler: NSObject, AppendNoteIntentHandling {
 
     func resolveContent(for intent: AppendNoteIntent) async -> INStringResolutionResult {
         guard let content = intent.content else {
-            return INStringResolutionResult.confirmationRequired(with: nil)
+            return INStringResolutionResult.needsValue()
         }
         return INStringResolutionResult.success(with: content)
     }

From a98c7262b2abc39ec4f81fc542cf94bc1d0aa9ae Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Wed, 8 May 2024 16:54:20 -0600
Subject: [PATCH 146/547] Added new note with content intent

---
 .../ShortcutIntents.intentdefinition          | 119 +++++++++++++++---
 .../Supporting Files/Simplenote-Info.plist    |   1 +
 SimplenoteIntents/Supporting Files/Info.plist |   1 +
 3 files changed, 101 insertions(+), 20 deletions(-)

diff --git a/Simplenote/Supporting Files/ShortcutIntents.intentdefinition b/Simplenote/Supporting Files/ShortcutIntents.intentdefinition
index 63acac2fc..7d7af764b 100644
--- a/Simplenote/Supporting Files/ShortcutIntents.intentdefinition	
+++ b/Simplenote/Supporting Files/ShortcutIntents.intentdefinition	
@@ -234,26 +234,6 @@
 							<key>INIntentParameterPromptDialogType</key>
 							<string>Primary</string>
 						</dict>
-						<dict>
-							<key>INIntentParameterPromptDialogCustom</key>
-							<true/>
-							<key>INIntentParameterPromptDialogFormatString</key>
-							<string>There are ${count} options matching ‘${note}’.</string>
-							<key>INIntentParameterPromptDialogFormatStringID</key>
-							<string>5Cplu9</string>
-							<key>INIntentParameterPromptDialogType</key>
-							<string>DisambiguationIntroduction</string>
-						</dict>
-						<dict>
-							<key>INIntentParameterPromptDialogCustom</key>
-							<true/>
-							<key>INIntentParameterPromptDialogFormatString</key>
-							<string>Just to confirm, you wanted ‘${note}’?</string>
-							<key>INIntentParameterPromptDialogFormatStringID</key>
-							<string>P8Wb3q</string>
-							<key>INIntentParameterPromptDialogType</key>
-							<string>Confirmation</string>
-						</dict>
 					</array>
 					<key>INIntentParameterSupportsDynamicEnumeration</key>
 					<true/>
@@ -334,6 +314,105 @@
 			<key>INIntentVerb</key>
 			<string>Do</string>
 		</dict>
+		<dict>
+			<key>INIntentCategory</key>
+			<string>create</string>
+			<key>INIntentClassPrefix</key>
+			<string>SP</string>
+			<key>INIntentConfigurable</key>
+			<true/>
+			<key>INIntentDescription</key>
+			<string>Creates a note with supplied content and saves it in Simplenote</string>
+			<key>INIntentDescriptionID</key>
+			<string>sXkMgW</string>
+			<key>INIntentIneligibleForSuggestions</key>
+			<true/>
+			<key>INIntentInput</key>
+			<string>content</string>
+			<key>INIntentLastParameterTag</key>
+			<integer>1</integer>
+			<key>INIntentManagedParameterCombinations</key>
+			<dict>
+				<key>content</key>
+				<dict>
+					<key>INIntentParameterCombinationSupportsBackgroundExecution</key>
+					<true/>
+					<key>INIntentParameterCombinationTitle</key>
+					<string>Create new note with ${content}</string>
+					<key>INIntentParameterCombinationTitleID</key>
+					<string>CNjhWs</string>
+					<key>INIntentParameterCombinationUpdatesLinked</key>
+					<true/>
+				</dict>
+			</dict>
+			<key>INIntentName</key>
+			<string>CreateNewNoteWithContent</string>
+			<key>INIntentParameters</key>
+			<array>
+				<dict>
+					<key>INIntentParameterConfigurable</key>
+					<true/>
+					<key>INIntentParameterDisplayName</key>
+					<string>Content</string>
+					<key>INIntentParameterDisplayNameID</key>
+					<string>U9Yl4n</string>
+					<key>INIntentParameterDisplayPriority</key>
+					<integer>1</integer>
+					<key>INIntentParameterMetadata</key>
+					<dict>
+						<key>INIntentParameterMetadataCapitalization</key>
+						<string>Sentences</string>
+						<key>INIntentParameterMetadataDefaultValueID</key>
+						<string>hM7vDg</string>
+					</dict>
+					<key>INIntentParameterName</key>
+					<string>content</string>
+					<key>INIntentParameterPromptDialogs</key>
+					<array>
+						<dict>
+							<key>INIntentParameterPromptDialogCustom</key>
+							<true/>
+							<key>INIntentParameterPromptDialogType</key>
+							<string>Configuration</string>
+						</dict>
+						<dict>
+							<key>INIntentParameterPromptDialogCustom</key>
+							<true/>
+							<key>INIntentParameterPromptDialogType</key>
+							<string>Primary</string>
+						</dict>
+					</array>
+					<key>INIntentParameterTag</key>
+					<integer>1</integer>
+					<key>INIntentParameterType</key>
+					<string>String</string>
+				</dict>
+			</array>
+			<key>INIntentResponse</key>
+			<dict>
+				<key>INIntentResponseCodes</key>
+				<array>
+					<dict>
+						<key>INIntentResponseCodeName</key>
+						<string>success</string>
+						<key>INIntentResponseCodeSuccess</key>
+						<true/>
+					</dict>
+					<dict>
+						<key>INIntentResponseCodeName</key>
+						<string>failure</string>
+					</dict>
+				</array>
+			</dict>
+			<key>INIntentTitle</key>
+			<string>Create New Note With Content</string>
+			<key>INIntentTitleID</key>
+			<string>Ag8ugh</string>
+			<key>INIntentType</key>
+			<string>Custom</string>
+			<key>INIntentVerb</key>
+			<string>Create</string>
+		</dict>
 	</array>
 	<key>INTypes</key>
 	<array>
diff --git a/Simplenote/Supporting Files/Simplenote-Info.plist b/Simplenote/Supporting Files/Simplenote-Info.plist
index c70500170..3d798e4d9 100644
--- a/Simplenote/Supporting Files/Simplenote-Info.plist	
+++ b/Simplenote/Supporting Files/Simplenote-Info.plist	
@@ -79,6 +79,7 @@
 		<string>NoteWidgetIntent</string>
 		<string>OpenNewNoteIntent</string>
 		<string>OpenNoteIntent</string>
+		<string>SPCreateNewNoteWithContentIntent</string>
 		<string>com.codality.NotationalFlow.launch</string>
 		<string>com.codality.NotationalFlow.newNote</string>
 		<string>com.codality.NotationalFlow.openNote</string>
diff --git a/SimplenoteIntents/Supporting Files/Info.plist b/SimplenoteIntents/Supporting Files/Info.plist
index 43b7164eb..37df635d6 100644
--- a/SimplenoteIntents/Supporting Files/Info.plist	
+++ b/SimplenoteIntents/Supporting Files/Info.plist	
@@ -35,6 +35,7 @@
 				<string>NoteWidgetIntent</string>
 				<string>OpenNewNoteIntent</string>
 				<string>OpenNoteIntent</string>
+				<string>SPCreateNewNoteWithContentIntent</string>
 			</array>
 		</dict>
 		<key>NSExtensionPointIdentifier</key>

From aa2ca7ee49236b46b61fad002c1c23b697c53a30 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Wed, 8 May 2024 17:27:22 -0600
Subject: [PATCH 147/547] Updated created basic handler for create new note
 intent

---
 Simplenote.xcodeproj/project.pbxproj             |  4 ++++
 .../ShortcutIntents.intentdefinition             | 10 ++++++++--
 .../Supporting Files/Simplenote-Info.plist       |  2 +-
 .../CreateNewNoteWithContentIntentHandler.swift  | 16 ++++++++++++++++
 SimplenoteIntents/Supporting Files/Info.plist    |  2 +-
 5 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 SimplenoteIntents/Intent Handlers/CreateNewNoteWithContentIntentHandler.swift

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index f3b376944..d0d6bcdf5 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -535,6 +535,7 @@
 		BAB6C04426BA49F3007495C4 /* ContentSlice.swift in Sources */ = {isa = PBXBuildFile; fileRef = A64DE6E8255D1C9F001D0526 /* ContentSlice.swift */; };
 		BAB6C04526BA4A04007495C4 /* String+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5476BC023D8E5D0000E7723 /* String+Simplenote.swift */; };
 		BAB6C04726BA4CAF007495C4 /* WidgetController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAB6C04626BA4CAF007495C4 /* WidgetController.swift */; };
+		BAB898D32BEC404200E238B8 /* CreateNewNoteWithContentIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAB898D22BEC404200E238B8 /* CreateNewNoteWithContentIntentHandler.swift */; };
 		BABFFF2226CF9094003A4C25 /* WidgetDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = BABFFF2126CF9094003A4C25 /* WidgetDefaults.swift */; };
 		BABFFF2326CF9094003A4C25 /* WidgetDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = BABFFF2126CF9094003A4C25 /* WidgetDefaults.swift */; };
 		BABFFF2426CF9094003A4C25 /* WidgetDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = BABFFF2126CF9094003A4C25 /* WidgetDefaults.swift */; };
@@ -1213,6 +1214,7 @@
 		BAB5769226703F0E00B0C56F /* NoteWidgetProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteWidgetProvider.swift; sourceTree = "<group>"; };
 		BAB576BD2670512C00B0C56F /* NoteWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteWidget.swift; sourceTree = "<group>"; };
 		BAB6C04626BA4CAF007495C4 /* WidgetController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetController.swift; sourceTree = "<group>"; };
+		BAB898D22BEC404200E238B8 /* CreateNewNoteWithContentIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateNewNoteWithContentIntentHandler.swift; sourceTree = "<group>"; };
 		BABFFF2126CF9094003A4C25 /* WidgetDefaults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetDefaults.swift; sourceTree = "<group>"; };
 		BAC7264D2BD96E7C0002FA68 /* SPAddCollaboratorsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPAddCollaboratorsViewController.swift; sourceTree = "<group>"; };
 		BAE08625261282D1009D40CD /* Note+Publish.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Note+Publish.swift"; sourceTree = "<group>"; };
@@ -2344,6 +2346,7 @@
 				BA289B632BE43963000E6794 /* OpenNewNoteIntentHandler.swift */,
 				BA289B742BE45BBB000E6794 /* OpenNoteIntentHandler.swift */,
 				BA35808F2BE95BE100CE1590 /* AppendNoteIntentHandler.swift */,
+				BAB898D22BEC404200E238B8 /* CreateNewNoteWithContentIntentHandler.swift */,
 			);
 			path = "Intent Handlers";
 			sourceTree = "<group>";
@@ -3790,6 +3793,7 @@
 				BA289B592BE436EB000E6794 /* ShortcutIntents.intentdefinition in Sources */,
 				BA0AF10D2BE996600050EEBD /* KeychainManager.swift in Sources */,
 				BA86625D26B3B14900466746 /* SortMode.swift in Sources */,
+				BAB898D32BEC404200E238B8 /* CreateNewNoteWithContentIntentHandler.swift in Sources */,
 				BA12B07026B0D0150026F31D /* SPManagedObject+Widget.swift in Sources */,
 				BAF4A9AA26DB138600C51C1D /* NoteContentHelper.swift in Sources */,
 				BA6D7B8B2BE588F0006AE368 /* IntentsError.swift in Sources */,
diff --git a/Simplenote/Supporting Files/ShortcutIntents.intentdefinition b/Simplenote/Supporting Files/ShortcutIntents.intentdefinition
index 7d7af764b..538bca056 100644
--- a/Simplenote/Supporting Files/ShortcutIntents.intentdefinition	
+++ b/Simplenote/Supporting Files/ShortcutIntents.intentdefinition	
@@ -25,6 +25,8 @@
 			<string>SP</string>
 			<key>INIntentConfigurable</key>
 			<true/>
+			<key>INIntentDescription</key>
+			<string>Open Simplenote and create a new note</string>
 			<key>INIntentDescriptionID</key>
 			<string>fgSbr5</string>
 			<key>INIntentIneligibleForSuggestions</key>
@@ -181,6 +183,8 @@
 			<string>SP</string>
 			<key>INIntentConfigurable</key>
 			<true/>
+			<key>INIntentDescription</key>
+			<string>Append content to an existing note in Simplenote</string>
 			<key>INIntentDescriptionID</key>
 			<string>EeqvcH</string>
 			<key>INIntentIneligibleForSuggestions</key>
@@ -317,12 +321,14 @@
 		<dict>
 			<key>INIntentCategory</key>
 			<string>create</string>
+			<key>INIntentClassName</key>
+			<string>CreateNewNoteIntent</string>
 			<key>INIntentClassPrefix</key>
 			<string>SP</string>
 			<key>INIntentConfigurable</key>
 			<true/>
 			<key>INIntentDescription</key>
-			<string>Creates a note with supplied content and saves it in Simplenote</string>
+			<string>Creates a note with supplied content and save it in Simplenote</string>
 			<key>INIntentDescriptionID</key>
 			<string>sXkMgW</string>
 			<key>INIntentIneligibleForSuggestions</key>
@@ -346,7 +352,7 @@
 				</dict>
 			</dict>
 			<key>INIntentName</key>
-			<string>CreateNewNoteWithContent</string>
+			<string>CreateNewNote</string>
 			<key>INIntentParameters</key>
 			<array>
 				<dict>
diff --git a/Simplenote/Supporting Files/Simplenote-Info.plist b/Simplenote/Supporting Files/Simplenote-Info.plist
index 3d798e4d9..db83424a6 100644
--- a/Simplenote/Supporting Files/Simplenote-Info.plist	
+++ b/Simplenote/Supporting Files/Simplenote-Info.plist	
@@ -75,11 +75,11 @@
 	<key>NSUserActivityTypes</key>
 	<array>
 		<string>AppendNoteIntent</string>
+		<string>CreateNewNoteIntent</string>
 		<string>ListWidgetIntent</string>
 		<string>NoteWidgetIntent</string>
 		<string>OpenNewNoteIntent</string>
 		<string>OpenNoteIntent</string>
-		<string>SPCreateNewNoteWithContentIntent</string>
 		<string>com.codality.NotationalFlow.launch</string>
 		<string>com.codality.NotationalFlow.newNote</string>
 		<string>com.codality.NotationalFlow.openNote</string>
diff --git a/SimplenoteIntents/Intent Handlers/CreateNewNoteWithContentIntentHandler.swift b/SimplenoteIntents/Intent Handlers/CreateNewNoteWithContentIntentHandler.swift
new file mode 100644
index 000000000..1cfea4d0f
--- /dev/null
+++ b/SimplenoteIntents/Intent Handlers/CreateNewNoteWithContentIntentHandler.swift	
@@ -0,0 +1,16 @@
+//
+//  CreateNewNoteWithContentIntentHandler.swift
+//  SimplenoteIntents
+//
+//  Created by Charlie Scheer on 5/8/24.
+//  Copyright © 2024 Automattic. All rights reserved.
+//
+
+import Intents
+
+class CreateNewNoteWithContentIntentHandler: NSObject, CreateNewNoteIntentHandling {
+
+    func handle(intent: CreateNewNoteIntent) async -> CreateNewNoteIntentResponse {
+        CreateNewNoteIntentResponse(code: .failure, userActivity: nil)
+    }
+}
diff --git a/SimplenoteIntents/Supporting Files/Info.plist b/SimplenoteIntents/Supporting Files/Info.plist
index 37df635d6..69a4ffa8d 100644
--- a/SimplenoteIntents/Supporting Files/Info.plist	
+++ b/SimplenoteIntents/Supporting Files/Info.plist	
@@ -31,11 +31,11 @@
 			<key>IntentsSupported</key>
 			<array>
 				<string>AppendNoteIntent</string>
+				<string>CreateNewNoteIntent</string>
 				<string>ListWidgetIntent</string>
 				<string>NoteWidgetIntent</string>
 				<string>OpenNewNoteIntent</string>
 				<string>OpenNoteIntent</string>
-				<string>SPCreateNewNoteWithContentIntent</string>
 			</array>
 		</dict>
 		<key>NSExtensionPointIdentifier</key>

From c7734065c526dae82c9c8fe75a7935a7d3a96f72 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Wed, 8 May 2024 17:28:03 -0600
Subject: [PATCH 148/547] Renamed file for CreateNewNoteIntentHandler

---
 Simplenote.xcodeproj/project.pbxproj                      | 8 ++++----
 ...tentHandler.swift => CreateNewNoteIntentHandler.swift} | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename SimplenoteIntents/Intent Handlers/{CreateNewNoteWithContentIntentHandler.swift => CreateNewNoteIntentHandler.swift} (69%)

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index d0d6bcdf5..86bccc92d 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -535,7 +535,7 @@
 		BAB6C04426BA49F3007495C4 /* ContentSlice.swift in Sources */ = {isa = PBXBuildFile; fileRef = A64DE6E8255D1C9F001D0526 /* ContentSlice.swift */; };
 		BAB6C04526BA4A04007495C4 /* String+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5476BC023D8E5D0000E7723 /* String+Simplenote.swift */; };
 		BAB6C04726BA4CAF007495C4 /* WidgetController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAB6C04626BA4CAF007495C4 /* WidgetController.swift */; };
-		BAB898D32BEC404200E238B8 /* CreateNewNoteWithContentIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAB898D22BEC404200E238B8 /* CreateNewNoteWithContentIntentHandler.swift */; };
+		BAB898D32BEC404200E238B8 /* CreateNewNoteIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAB898D22BEC404200E238B8 /* CreateNewNoteIntentHandler.swift */; };
 		BABFFF2226CF9094003A4C25 /* WidgetDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = BABFFF2126CF9094003A4C25 /* WidgetDefaults.swift */; };
 		BABFFF2326CF9094003A4C25 /* WidgetDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = BABFFF2126CF9094003A4C25 /* WidgetDefaults.swift */; };
 		BABFFF2426CF9094003A4C25 /* WidgetDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = BABFFF2126CF9094003A4C25 /* WidgetDefaults.swift */; };
@@ -1214,7 +1214,7 @@
 		BAB5769226703F0E00B0C56F /* NoteWidgetProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteWidgetProvider.swift; sourceTree = "<group>"; };
 		BAB576BD2670512C00B0C56F /* NoteWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteWidget.swift; sourceTree = "<group>"; };
 		BAB6C04626BA4CAF007495C4 /* WidgetController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetController.swift; sourceTree = "<group>"; };
-		BAB898D22BEC404200E238B8 /* CreateNewNoteWithContentIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateNewNoteWithContentIntentHandler.swift; sourceTree = "<group>"; };
+		BAB898D22BEC404200E238B8 /* CreateNewNoteIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateNewNoteIntentHandler.swift; sourceTree = "<group>"; };
 		BABFFF2126CF9094003A4C25 /* WidgetDefaults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetDefaults.swift; sourceTree = "<group>"; };
 		BAC7264D2BD96E7C0002FA68 /* SPAddCollaboratorsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPAddCollaboratorsViewController.swift; sourceTree = "<group>"; };
 		BAE08625261282D1009D40CD /* Note+Publish.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Note+Publish.swift"; sourceTree = "<group>"; };
@@ -2346,7 +2346,7 @@
 				BA289B632BE43963000E6794 /* OpenNewNoteIntentHandler.swift */,
 				BA289B742BE45BBB000E6794 /* OpenNoteIntentHandler.swift */,
 				BA35808F2BE95BE100CE1590 /* AppendNoteIntentHandler.swift */,
-				BAB898D22BEC404200E238B8 /* CreateNewNoteWithContentIntentHandler.swift */,
+				BAB898D22BEC404200E238B8 /* CreateNewNoteIntentHandler.swift */,
 			);
 			path = "Intent Handlers";
 			sourceTree = "<group>";
@@ -3793,7 +3793,7 @@
 				BA289B592BE436EB000E6794 /* ShortcutIntents.intentdefinition in Sources */,
 				BA0AF10D2BE996600050EEBD /* KeychainManager.swift in Sources */,
 				BA86625D26B3B14900466746 /* SortMode.swift in Sources */,
-				BAB898D32BEC404200E238B8 /* CreateNewNoteWithContentIntentHandler.swift in Sources */,
+				BAB898D32BEC404200E238B8 /* CreateNewNoteIntentHandler.swift in Sources */,
 				BA12B07026B0D0150026F31D /* SPManagedObject+Widget.swift in Sources */,
 				BAF4A9AA26DB138600C51C1D /* NoteContentHelper.swift in Sources */,
 				BA6D7B8B2BE588F0006AE368 /* IntentsError.swift in Sources */,
diff --git a/SimplenoteIntents/Intent Handlers/CreateNewNoteWithContentIntentHandler.swift b/SimplenoteIntents/Intent Handlers/CreateNewNoteIntentHandler.swift
similarity index 69%
rename from SimplenoteIntents/Intent Handlers/CreateNewNoteWithContentIntentHandler.swift
rename to SimplenoteIntents/Intent Handlers/CreateNewNoteIntentHandler.swift
index 1cfea4d0f..ba968a5d1 100644
--- a/SimplenoteIntents/Intent Handlers/CreateNewNoteWithContentIntentHandler.swift	
+++ b/SimplenoteIntents/Intent Handlers/CreateNewNoteIntentHandler.swift	
@@ -1,5 +1,5 @@
 //
-//  CreateNewNoteWithContentIntentHandler.swift
+//  CreateNewNoteIntentHandler.swift
 //  SimplenoteIntents
 //
 //  Created by Charlie Scheer on 5/8/24.
@@ -8,7 +8,7 @@
 
 import Intents
 
-class CreateNewNoteWithContentIntentHandler: NSObject, CreateNewNoteIntentHandling {
+class CreateNewNoteIntentHandler: NSObject, CreateNewNoteIntentHandling {
 
     func handle(intent: CreateNewNoteIntent) async -> CreateNewNoteIntentResponse {
         CreateNewNoteIntentResponse(code: .failure, userActivity: nil)

From e1e16c3eef53868c456d43bbbe8ef439a78dfabe Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 9 May 2024 09:12:32 -0600
Subject: [PATCH 149/547] Added handler method for create new note intent

---
 .../CreateNewNoteIntentHandler.swift           | 18 +++++++++++++++++-
 SimplenoteIntents/IntentHandler.swift          |  2 ++
 SimplenoteWidgets/Models/Note+Widget.swift     |  8 ++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/SimplenoteIntents/Intent Handlers/CreateNewNoteIntentHandler.swift b/SimplenoteIntents/Intent Handlers/CreateNewNoteIntentHandler.swift
index ba968a5d1..e105c7436 100644
--- a/SimplenoteIntents/Intent Handlers/CreateNewNoteIntentHandler.swift	
+++ b/SimplenoteIntents/Intent Handlers/CreateNewNoteIntentHandler.swift	
@@ -9,8 +9,24 @@
 import Intents
 
 class CreateNewNoteIntentHandler: NSObject, CreateNewNoteIntentHandling {
+    let coreDataWrapper = ExtensionCoreDataWrapper()
 
     func handle(intent: CreateNewNoteIntent) async -> CreateNewNoteIntentResponse {
-        CreateNewNoteIntentResponse(code: .failure, userActivity: nil)
+        guard let content = intent.content,
+              let token = KeychainManager.extensionToken else {
+            return CreateNewNoteIntentResponse(code: .failure, userActivity: nil)
+        }
+
+        Uploader(simperiumToken: token).send(note(with: content))
+        return CreateNewNoteIntentResponse(code: .success, userActivity: nil)
+    }
+
+    private func note(with content: String) -> Note {
+        let note = Note(context: coreDataWrapper.context())
+        note.creationDate = .now
+        note.modificationDate = .now
+        note.content = content
+
+        return note
     }
 }
diff --git a/SimplenoteIntents/IntentHandler.swift b/SimplenoteIntents/IntentHandler.swift
index 5cc6c985f..d6d073690 100644
--- a/SimplenoteIntents/IntentHandler.swift
+++ b/SimplenoteIntents/IntentHandler.swift
@@ -15,6 +15,8 @@ class IntentHandler: INExtension {
             return OpenNoteIntentHandler()
         case is AppendNoteIntent:
             return AppendNoteIntentHandler()
+        case is CreateNewNoteIntent:
+            return CreateNewNoteIntentHandler()
         default:
             return self
         }
diff --git a/SimplenoteWidgets/Models/Note+Widget.swift b/SimplenoteWidgets/Models/Note+Widget.swift
index 5530b0ddb..e9cf7a01a 100644
--- a/SimplenoteWidgets/Models/Note+Widget.swift
+++ b/SimplenoteWidgets/Models/Note+Widget.swift
@@ -16,6 +16,14 @@ extension Note {
         return NSFetchRequest<Note>(entityName: "Note")
     }
 
+    public override func awakeFromInsert() {
+        super.awakeFromInsert()
+
+        if simperiumKey.isEmpty {
+            simperiumKey = UUID().uuidString.replacingOccurrences(of: "-", with: "")
+        }
+    }
+
     @NSManaged public var content: String?
     @NSManaged public var creationDate: Date?
     @NSManaged public override var isDeleted: Bool

From c9952b59e8f36ed49fed34e3ec10d879cd577d50 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 9 May 2024 12:12:58 -0600
Subject: [PATCH 150/547] Added file definition for find note with content
 intent

---
 .../ShortcutIntents.intentdefinition          | 126 ++++++++++++++++++
 .../Supporting Files/Simplenote-Info.plist    |   1 +
 SimplenoteIntents/Supporting Files/Info.plist |   1 +
 3 files changed, 128 insertions(+)

diff --git a/Simplenote/Supporting Files/ShortcutIntents.intentdefinition b/Simplenote/Supporting Files/ShortcutIntents.intentdefinition
index 538bca056..cb8b7bbbd 100644
--- a/Simplenote/Supporting Files/ShortcutIntents.intentdefinition	
+++ b/Simplenote/Supporting Files/ShortcutIntents.intentdefinition	
@@ -189,6 +189,8 @@
 			<string>EeqvcH</string>
 			<key>INIntentIneligibleForSuggestions</key>
 			<true/>
+			<key>INIntentInput</key>
+			<string>note</string>
 			<key>INIntentLastParameterTag</key>
 			<integer>3</integer>
 			<key>INIntentManagedParameterCombinations</key>
@@ -419,6 +421,130 @@
 			<key>INIntentVerb</key>
 			<string>Create</string>
 		</dict>
+		<dict>
+			<key>INIntentCategory</key>
+			<string>search</string>
+			<key>INIntentClassName</key>
+			<string>FindNoteIntent</string>
+			<key>INIntentClassPrefix</key>
+			<string>SP</string>
+			<key>INIntentConfigurable</key>
+			<true/>
+			<key>INIntentDescription</key>
+			<string>Search the content of your notes to find a note to use in shortcuts</string>
+			<key>INIntentDescriptionID</key>
+			<string>V4ssp4</string>
+			<key>INIntentIneligibleForSuggestions</key>
+			<true/>
+			<key>INIntentLastParameterTag</key>
+			<integer>4</integer>
+			<key>INIntentManagedParameterCombinations</key>
+			<dict>
+				<key>content</key>
+				<dict>
+					<key>INIntentParameterCombinationSupportsBackgroundExecution</key>
+					<true/>
+					<key>INIntentParameterCombinationTitle</key>
+					<string>Find a note with ${content}</string>
+					<key>INIntentParameterCombinationTitleID</key>
+					<string>VDjU7n</string>
+					<key>INIntentParameterCombinationUpdatesLinked</key>
+					<true/>
+				</dict>
+			</dict>
+			<key>INIntentName</key>
+			<string>FindNote</string>
+			<key>INIntentParameters</key>
+			<array>
+				<dict>
+					<key>INIntentParameterConfigurable</key>
+					<true/>
+					<key>INIntentParameterDisplayName</key>
+					<string>Content</string>
+					<key>INIntentParameterDisplayNameID</key>
+					<string>VGM0yX</string>
+					<key>INIntentParameterDisplayPriority</key>
+					<integer>1</integer>
+					<key>INIntentParameterMetadata</key>
+					<dict>
+						<key>INIntentParameterMetadataCapitalization</key>
+						<string>Sentences</string>
+						<key>INIntentParameterMetadataDefaultValueID</key>
+						<string>g3QW1u</string>
+					</dict>
+					<key>INIntentParameterName</key>
+					<string>content</string>
+					<key>INIntentParameterPromptDialogs</key>
+					<array>
+						<dict>
+							<key>INIntentParameterPromptDialogCustom</key>
+							<true/>
+							<key>INIntentParameterPromptDialogType</key>
+							<string>Configuration</string>
+						</dict>
+						<dict>
+							<key>INIntentParameterPromptDialogCustom</key>
+							<true/>
+							<key>INIntentParameterPromptDialogType</key>
+							<string>Primary</string>
+						</dict>
+					</array>
+					<key>INIntentParameterTag</key>
+					<integer>4</integer>
+					<key>INIntentParameterType</key>
+					<string>String</string>
+				</dict>
+			</array>
+			<key>INIntentResponse</key>
+			<dict>
+				<key>INIntentResponseCodes</key>
+				<array>
+					<dict>
+						<key>INIntentResponseCodeName</key>
+						<string>success</string>
+						<key>INIntentResponseCodeSuccess</key>
+						<true/>
+					</dict>
+					<dict>
+						<key>INIntentResponseCodeName</key>
+						<string>failure</string>
+					</dict>
+				</array>
+				<key>INIntentResponseLastParameterTag</key>
+				<integer>4</integer>
+				<key>INIntentResponseOutput</key>
+				<string>note</string>
+				<key>INIntentResponseParameters</key>
+				<array>
+					<dict>
+						<key>INIntentResponseParameterDisplayName</key>
+						<string>Note</string>
+						<key>INIntentResponseParameterDisplayNameID</key>
+						<string>Mz9mrb</string>
+						<key>INIntentResponseParameterDisplayPriority</key>
+						<integer>1</integer>
+						<key>INIntentResponseParameterName</key>
+						<string>note</string>
+						<key>INIntentResponseParameterObjectType</key>
+						<string>IntentNote</string>
+						<key>INIntentResponseParameterObjectTypeNamespace</key>
+						<string>BxdWY5</string>
+						<key>INIntentResponseParameterTag</key>
+						<integer>4</integer>
+						<key>INIntentResponseParameterType</key>
+						<string>Object</string>
+					</dict>
+				</array>
+			</dict>
+			<key>INIntentTitle</key>
+			<string>Find Note With Content</string>
+			<key>INIntentTitleID</key>
+			<string>oawbyy</string>
+			<key>INIntentType</key>
+			<string>Custom</string>
+			<key>INIntentVerb</key>
+			<string>Search</string>
+		</dict>
 	</array>
 	<key>INTypes</key>
 	<array>
diff --git a/Simplenote/Supporting Files/Simplenote-Info.plist b/Simplenote/Supporting Files/Simplenote-Info.plist
index db83424a6..2fe3542f2 100644
--- a/Simplenote/Supporting Files/Simplenote-Info.plist	
+++ b/Simplenote/Supporting Files/Simplenote-Info.plist	
@@ -76,6 +76,7 @@
 	<array>
 		<string>AppendNoteIntent</string>
 		<string>CreateNewNoteIntent</string>
+		<string>FindNoteIntent</string>
 		<string>ListWidgetIntent</string>
 		<string>NoteWidgetIntent</string>
 		<string>OpenNewNoteIntent</string>
diff --git a/SimplenoteIntents/Supporting Files/Info.plist b/SimplenoteIntents/Supporting Files/Info.plist
index 69a4ffa8d..946c2d7fc 100644
--- a/SimplenoteIntents/Supporting Files/Info.plist	
+++ b/SimplenoteIntents/Supporting Files/Info.plist	
@@ -32,6 +32,7 @@
 			<array>
 				<string>AppendNoteIntent</string>
 				<string>CreateNewNoteIntent</string>
+				<string>FindNoteIntent</string>
 				<string>ListWidgetIntent</string>
 				<string>NoteWidgetIntent</string>
 				<string>OpenNewNoteIntent</string>

From ec0bd58bbae8f8043340917838387034fbb0e2b7 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 9 May 2024 12:13:54 -0600
Subject: [PATCH 151/547] Added basic structure for find note intent handler

---
 Simplenote.xcodeproj/project.pbxproj          |  4 ++
 .../FindNoteIntentHandler.swift               | 49 +++++++++++++++++++
 SimplenoteIntents/IntentHandler.swift         |  3 ++
 3 files changed, 56 insertions(+)
 create mode 100644 SimplenoteIntents/Intent Handlers/FindNoteIntentHandler.swift

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index 86bccc92d..5b869b878 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -540,6 +540,7 @@
 		BABFFF2326CF9094003A4C25 /* WidgetDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = BABFFF2126CF9094003A4C25 /* WidgetDefaults.swift */; };
 		BABFFF2426CF9094003A4C25 /* WidgetDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = BABFFF2126CF9094003A4C25 /* WidgetDefaults.swift */; };
 		BAC7264E2BD96E7C0002FA68 /* SPAddCollaboratorsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAC7264D2BD96E7C0002FA68 /* SPAddCollaboratorsViewController.swift */; };
+		BAD0F1ED2BED49C200E73E45 /* FindNoteIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAD0F1EC2BED49C200E73E45 /* FindNoteIntentHandler.swift */; };
 		BAE08626261282D1009D40CD /* Note+Publish.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAE08625261282D1009D40CD /* Note+Publish.swift */; };
 		BAE63CAF26E05312002BF81A /* NSString+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = B59188C124005B8A0069EF96 /* NSString+Simplenote.swift */; };
 		BAE63CB026E05313002BF81A /* NSString+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = B59188C124005B8A0069EF96 /* NSString+Simplenote.swift */; };
@@ -1217,6 +1218,7 @@
 		BAB898D22BEC404200E238B8 /* CreateNewNoteIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateNewNoteIntentHandler.swift; sourceTree = "<group>"; };
 		BABFFF2126CF9094003A4C25 /* WidgetDefaults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetDefaults.swift; sourceTree = "<group>"; };
 		BAC7264D2BD96E7C0002FA68 /* SPAddCollaboratorsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPAddCollaboratorsViewController.swift; sourceTree = "<group>"; };
+		BAD0F1EC2BED49C200E73E45 /* FindNoteIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FindNoteIntentHandler.swift; sourceTree = "<group>"; };
 		BAE08625261282D1009D40CD /* Note+Publish.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Note+Publish.swift"; sourceTree = "<group>"; };
 		BAF4A96E26DB085D00C51C1D /* NSURLComponents+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSURLComponents+Simplenote.swift"; sourceTree = "<group>"; };
 		BAF8D42226AE10F100CA9383 /* Tag+Widget.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Tag+Widget.swift"; sourceTree = "<group>"; };
@@ -2347,6 +2349,7 @@
 				BA289B742BE45BBB000E6794 /* OpenNoteIntentHandler.swift */,
 				BA35808F2BE95BE100CE1590 /* AppendNoteIntentHandler.swift */,
 				BAB898D22BEC404200E238B8 /* CreateNewNoteIntentHandler.swift */,
+				BAD0F1EC2BED49C200E73E45 /* FindNoteIntentHandler.swift */,
 			);
 			path = "Intent Handlers";
 			sourceTree = "<group>";
@@ -3776,6 +3779,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				BA86620E26B3A73D00466746 /* UserDefaults+Simplenote.swift in Sources */,
+				BAD0F1ED2BED49C200E73E45 /* FindNoteIntentHandler.swift in Sources */,
 				BAF8D52826AE173D00CA9383 /* FileManager+Simplenote.swift in Sources */,
 				BA34B04D2BEAE9FE00580E15 /* SPConstants.m in Sources */,
 				BA289B5F2BE43728000E6794 /* NoteWidgetIntentHandler.swift in Sources */,
diff --git a/SimplenoteIntents/Intent Handlers/FindNoteIntentHandler.swift b/SimplenoteIntents/Intent Handlers/FindNoteIntentHandler.swift
new file mode 100644
index 000000000..d762d1f6f
--- /dev/null
+++ b/SimplenoteIntents/Intent Handlers/FindNoteIntentHandler.swift	
@@ -0,0 +1,49 @@
+//
+//  FindNoteIntentHandler.swift
+//  SimplenoteIntents
+//
+//  Created by Charlie Scheer on 5/9/24.
+//  Copyright © 2024 Automattic. All rights reserved.
+//
+
+import Intents
+
+class FindNoteIntentHandler: NSObject, FindNoteIntentHandling {
+    let coreDataWrapper = ExtensionCoreDataWrapper()
+
+    func handle(intent: FindNoteIntent) async -> FindNoteIntentResponse {
+        guard let notes = coreDataWrapper.resultsController()?.notes() else {
+            return FindNoteIntentResponse(code: .failure, userActivity: nil)
+        }
+
+        guard let content = intent.content else {
+            return FindNoteIntentResponse(code: .unspecified, userActivity: nil)
+        }
+
+        let matchingNotes: [Note] = notes.compactMap({
+            if $0.content?.contains(content) == true {
+                return $0
+            }
+            return nil
+        })
+
+        guard matchingNotes.isEmpty == false else {
+            // TODO: Create custom respond code to alert user that no notes were found
+            return FindNoteIntentResponse(code: .failure, userActivity: nil)
+        }
+
+        guard matchingNotes.count == 1 else {
+            // TODO: Disambiguate the notes
+            return FindNoteIntentResponse(code: .failure, userActivity: nil)
+        }
+
+        guard let matchingNote = matchingNotes.first else {
+            return FindNoteIntentResponse(code: .failure, userActivity: nil)
+        }
+        let success = FindNoteIntentResponse(code: .success, userActivity: nil)
+        success.note = IntentNote(identifier: matchingNote.simperiumKey, display: matchingNote.title)
+
+        return success
+
+    }
+}
diff --git a/SimplenoteIntents/IntentHandler.swift b/SimplenoteIntents/IntentHandler.swift
index d6d073690..ec49bb233 100644
--- a/SimplenoteIntents/IntentHandler.swift
+++ b/SimplenoteIntents/IntentHandler.swift
@@ -17,8 +17,11 @@ class IntentHandler: INExtension {
             return AppendNoteIntentHandler()
         case is CreateNewNoteIntent:
             return CreateNewNoteIntentHandler()
+        case is FindNoteIntent:
+            return FindNoteIntentHandler()
         default:
             return self
         }
     }
 }
+

From 8a7370d75d0436f850b72cf98e76e8f9d02c92ac Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 9 May 2024 12:27:56 -0600
Subject: [PATCH 152/547] Added failure messages to find note intent handler

---
 .../ShortcutIntents.intentdefinition          | 42 ++++++++++++++++++-
 .../FindNoteIntentHandler.swift               | 19 +++++++--
 2 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/Simplenote/Supporting Files/ShortcutIntents.intentdefinition b/Simplenote/Supporting Files/ShortcutIntents.intentdefinition
index cb8b7bbbd..49b987f90 100644
--- a/Simplenote/Supporting Files/ShortcutIntents.intentdefinition	
+++ b/Simplenote/Supporting Files/ShortcutIntents.intentdefinition	
@@ -437,7 +437,7 @@
 			<key>INIntentIneligibleForSuggestions</key>
 			<true/>
 			<key>INIntentLastParameterTag</key>
-			<integer>4</integer>
+			<integer>7</integer>
 			<key>INIntentManagedParameterCombinations</key>
 			<dict>
 				<key>content</key>
@@ -488,6 +488,26 @@
 							<key>INIntentParameterPromptDialogType</key>
 							<string>Primary</string>
 						</dict>
+						<dict>
+							<key>INIntentParameterPromptDialogCustom</key>
+							<true/>
+							<key>INIntentParameterPromptDialogFormatString</key>
+							<string>There are ${count} options matching ‘${content}’.</string>
+							<key>INIntentParameterPromptDialogFormatStringID</key>
+							<string>NAzeXM</string>
+							<key>INIntentParameterPromptDialogType</key>
+							<string>DisambiguationIntroduction</string>
+						</dict>
+						<dict>
+							<key>INIntentParameterPromptDialogCustom</key>
+							<true/>
+							<key>INIntentParameterPromptDialogFormatString</key>
+							<string>Just to confirm, you wanted ‘${content}’?</string>
+							<key>INIntentParameterPromptDialogFormatStringID</key>
+							<string>wgf6Li</string>
+							<key>INIntentParameterPromptDialogType</key>
+							<string>Confirmation</string>
+						</dict>
 					</array>
 					<key>INIntentParameterTag</key>
 					<integer>4</integer>
@@ -506,12 +526,16 @@
 						<true/>
 					</dict>
 					<dict>
+						<key>INIntentResponseCodeFormatString</key>
+						<string>${failureReason}</string>
+						<key>INIntentResponseCodeFormatStringID</key>
+						<string>ThMQV4</string>
 						<key>INIntentResponseCodeName</key>
 						<string>failure</string>
 					</dict>
 				</array>
 				<key>INIntentResponseLastParameterTag</key>
-				<integer>4</integer>
+				<integer>5</integer>
 				<key>INIntentResponseOutput</key>
 				<string>note</string>
 				<key>INIntentResponseParameters</key>
@@ -534,6 +558,20 @@
 						<key>INIntentResponseParameterType</key>
 						<string>Object</string>
 					</dict>
+					<dict>
+						<key>INIntentResponseParameterDisplayName</key>
+						<string>Failure Reason</string>
+						<key>INIntentResponseParameterDisplayNameID</key>
+						<string>Gde29V</string>
+						<key>INIntentResponseParameterDisplayPriority</key>
+						<integer>2</integer>
+						<key>INIntentResponseParameterName</key>
+						<string>failureReason</string>
+						<key>INIntentResponseParameterTag</key>
+						<integer>5</integer>
+						<key>INIntentResponseParameterType</key>
+						<string>String</string>
+					</dict>
 				</array>
 			</dict>
 			<key>INIntentTitle</key>
diff --git a/SimplenoteIntents/Intent Handlers/FindNoteIntentHandler.swift b/SimplenoteIntents/Intent Handlers/FindNoteIntentHandler.swift
index d762d1f6f..e4e81160f 100644
--- a/SimplenoteIntents/Intent Handlers/FindNoteIntentHandler.swift	
+++ b/SimplenoteIntents/Intent Handlers/FindNoteIntentHandler.swift	
@@ -8,12 +8,26 @@
 
 import Intents
 
+enum FindNoteError: String {
+    case couldNotFetchNotes
+    case noMatchingNotesFound
+
+    var localizedDescription: String {
+        switch self {
+        case .couldNotFetchNotes:
+            NSLocalizedString("Could not fetch notes", comment: "Error warning user that their notes could not be fetched")
+        case .noMatchingNotesFound:
+            NSLocalizedString("Could not find notes matching the search terms", comment: "Error warning user that a matching note could not be found")
+        }
+    }
+}
+
 class FindNoteIntentHandler: NSObject, FindNoteIntentHandling {
     let coreDataWrapper = ExtensionCoreDataWrapper()
 
     func handle(intent: FindNoteIntent) async -> FindNoteIntentResponse {
         guard let notes = coreDataWrapper.resultsController()?.notes() else {
-            return FindNoteIntentResponse(code: .failure, userActivity: nil)
+            return FindNoteIntentResponse.failure(failureReason: FindNoteError.couldNotFetchNotes.localizedDescription)
         }
 
         guard let content = intent.content else {
@@ -28,8 +42,7 @@ class FindNoteIntentHandler: NSObject, FindNoteIntentHandling {
         })
 
         guard matchingNotes.isEmpty == false else {
-            // TODO: Create custom respond code to alert user that no notes were found
-            return FindNoteIntentResponse(code: .failure, userActivity: nil)
+            return FindNoteIntentResponse.failure(failureReason: FindNoteError.noMatchingNotesFound.localizedDescription)
         }
 
         guard matchingNotes.count == 1 else {

From b096745fa7487f2695cefeca5e773556f94773ed Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 9 May 2024 13:22:02 -0600
Subject: [PATCH 153/547] Refactored find note to disambiguate if multiple
 values are true

---
 .../ShortcutIntents.intentdefinition          | 57 +++++++++++++++++--
 .../FindNoteIntentHandler.swift               | 48 +++++-----------
 SimplenoteIntents/IntentHandler.swift         |  1 -
 .../IntentNote+Helpers.swift                  | 25 ++++++++
 4 files changed, 92 insertions(+), 39 deletions(-)

diff --git a/Simplenote/Supporting Files/ShortcutIntents.intentdefinition b/Simplenote/Supporting Files/ShortcutIntents.intentdefinition
index 49b987f90..7d3097a98 100644
--- a/Simplenote/Supporting Files/ShortcutIntents.intentdefinition	
+++ b/Simplenote/Supporting Files/ShortcutIntents.intentdefinition	
@@ -437,10 +437,10 @@
 			<key>INIntentIneligibleForSuggestions</key>
 			<true/>
 			<key>INIntentLastParameterTag</key>
-			<integer>7</integer>
+			<integer>13</integer>
 			<key>INIntentManagedParameterCombinations</key>
 			<dict>
-				<key>content</key>
+				<key>content,note</key>
 				<dict>
 					<key>INIntentParameterCombinationSupportsBackgroundExecution</key>
 					<true/>
@@ -485,6 +485,10 @@
 						<dict>
 							<key>INIntentParameterPromptDialogCustom</key>
 							<true/>
+							<key>INIntentParameterPromptDialogFormatString</key>
+							<string>Which One?</string>
+							<key>INIntentParameterPromptDialogFormatStringID</key>
+							<string>yuIu0n</string>
 							<key>INIntentParameterPromptDialogType</key>
 							<string>Primary</string>
 						</dict>
@@ -514,6 +518,51 @@
 					<key>INIntentParameterType</key>
 					<string>String</string>
 				</dict>
+				<dict>
+					<key>INIntentParameterConfigurable</key>
+					<true/>
+					<key>INIntentParameterDisplayName</key>
+					<string>Note</string>
+					<key>INIntentParameterDisplayNameID</key>
+					<string>pFkRQX</string>
+					<key>INIntentParameterDisplayPriority</key>
+					<integer>2</integer>
+					<key>INIntentParameterName</key>
+					<string>note</string>
+					<key>INIntentParameterObjectType</key>
+					<string>IntentNote</string>
+					<key>INIntentParameterObjectTypeNamespace</key>
+					<string>BxdWY5</string>
+					<key>INIntentParameterPromptDialogs</key>
+					<array>
+						<dict>
+							<key>INIntentParameterPromptDialogCustom</key>
+							<true/>
+							<key>INIntentParameterPromptDialogFormatString</key>
+							<string>Which Note?</string>
+							<key>INIntentParameterPromptDialogFormatStringID</key>
+							<string>OOdDHV</string>
+							<key>INIntentParameterPromptDialogType</key>
+							<string>Configuration</string>
+						</dict>
+						<dict>
+							<key>INIntentParameterPromptDialogCustom</key>
+							<true/>
+							<key>INIntentParameterPromptDialogFormatString</key>
+							<string>Which One?</string>
+							<key>INIntentParameterPromptDialogFormatStringID</key>
+							<string>sOjweW</string>
+							<key>INIntentParameterPromptDialogType</key>
+							<string>Primary</string>
+						</dict>
+					</array>
+					<key>INIntentParameterSupportsResolution</key>
+					<true/>
+					<key>INIntentParameterTag</key>
+					<integer>13</integer>
+					<key>INIntentParameterType</key>
+					<string>Object</string>
+				</dict>
 			</array>
 			<key>INIntentResponse</key>
 			<dict>
@@ -535,7 +584,7 @@
 					</dict>
 				</array>
 				<key>INIntentResponseLastParameterTag</key>
-				<integer>5</integer>
+				<integer>10</integer>
 				<key>INIntentResponseOutput</key>
 				<string>note</string>
 				<key>INIntentResponseParameters</key>
@@ -554,7 +603,7 @@
 						<key>INIntentResponseParameterObjectTypeNamespace</key>
 						<string>BxdWY5</string>
 						<key>INIntentResponseParameterTag</key>
-						<integer>4</integer>
+						<integer>10</integer>
 						<key>INIntentResponseParameterType</key>
 						<string>Object</string>
 					</dict>
diff --git a/SimplenoteIntents/Intent Handlers/FindNoteIntentHandler.swift b/SimplenoteIntents/Intent Handlers/FindNoteIntentHandler.swift
index e4e81160f..a73c24e76 100644
--- a/SimplenoteIntents/Intent Handlers/FindNoteIntentHandler.swift	
+++ b/SimplenoteIntents/Intent Handlers/FindNoteIntentHandler.swift	
@@ -8,55 +8,35 @@
 
 import Intents
 
-enum FindNoteError: String {
-    case couldNotFetchNotes
-    case noMatchingNotesFound
-
-    var localizedDescription: String {
-        switch self {
-        case .couldNotFetchNotes:
-            NSLocalizedString("Could not fetch notes", comment: "Error warning user that their notes could not be fetched")
-        case .noMatchingNotesFound:
-            NSLocalizedString("Could not find notes matching the search terms", comment: "Error warning user that a matching note could not be found")
-        }
-    }
-}
-
 class FindNoteIntentHandler: NSObject, FindNoteIntentHandling {
     let coreDataWrapper = ExtensionCoreDataWrapper()
 
-    func handle(intent: FindNoteIntent) async -> FindNoteIntentResponse {
-        guard let notes = coreDataWrapper.resultsController()?.notes() else {
-            return FindNoteIntentResponse.failure(failureReason: FindNoteError.couldNotFetchNotes.localizedDescription)
+    func resolveNote(for intent: FindNoteIntent) async -> IntentNoteResolutionResult {
+        // If the user has already selected a note return that note with success
+        if let selectedNote = intent.note {
+            return IntentNoteResolutionResult.success(with: selectedNote)
         }
 
         guard let content = intent.content else {
-            return FindNoteIntentResponse(code: .unspecified, userActivity: nil)
+            return IntentNoteResolutionResult.needsValue()
         }
 
-        let matchingNotes: [Note] = notes.compactMap({
-            if $0.content?.contains(content) == true {
-                return $0
-            }
-            return nil
-        })
+        return IntentNoteResolutionResult.resolveIntentNote(for: content, in: coreDataWrapper)
+    }
 
-        guard matchingNotes.isEmpty == false else {
-            return FindNoteIntentResponse.failure(failureReason: FindNoteError.noMatchingNotesFound.localizedDescription)
-        }
+    func provideNoteOptionsCollection(for intent: FindNoteIntent) async throws -> INObjectCollection<IntentNote> {
+        let intentNotes = try IntentNote.allNotes(in: coreDataWrapper)
+        return INObjectCollection(items: intentNotes)
+    }
 
-        guard matchingNotes.count == 1 else {
-            // TODO: Disambiguate the notes
+    func handle(intent: FindNoteIntent) async -> FindNoteIntentResponse {
+        guard let intentNote = intent.note else {
             return FindNoteIntentResponse(code: .failure, userActivity: nil)
         }
 
-        guard let matchingNote = matchingNotes.first else {
-            return FindNoteIntentResponse(code: .failure, userActivity: nil)
-        }
         let success = FindNoteIntentResponse(code: .success, userActivity: nil)
-        success.note = IntentNote(identifier: matchingNote.simperiumKey, display: matchingNote.title)
+        success.note = intentNote
 
         return success
-
     }
 }
diff --git a/SimplenoteIntents/IntentHandler.swift b/SimplenoteIntents/IntentHandler.swift
index ec49bb233..637fee2a5 100644
--- a/SimplenoteIntents/IntentHandler.swift
+++ b/SimplenoteIntents/IntentHandler.swift
@@ -24,4 +24,3 @@ class IntentHandler: INExtension {
         }
     }
 }
-
diff --git a/SimplenoteIntents/ResolutionResults/IntentNote+Helpers.swift b/SimplenoteIntents/ResolutionResults/IntentNote+Helpers.swift
index 6d2824ebe..3dc4ce1ae 100644
--- a/SimplenoteIntents/ResolutionResults/IntentNote+Helpers.swift
+++ b/SimplenoteIntents/ResolutionResults/IntentNote+Helpers.swift
@@ -21,6 +21,31 @@ extension IntentNoteResolutionResult {
 
         return IntentNoteResolutionResult.success(with: intentNote)
     }
+
+    static func resolveIntentNote(for content: String, in coreDataWrapper: ExtensionCoreDataWrapper) -> IntentNoteResolutionResult {
+        guard let notes = coreDataWrapper.resultsController()?.notes() else {
+            // TODO: Better error
+            return IntentNoteResolutionResult.unsupported()
+        }
+        let filteredNotes = notes.filter({ $0.content?.contains(content) == true })
+        let intentNotes = filteredNotes.map({ IntentNote(identifier: $0.simperiumKey, display: $0.title) })
+
+        guard intentNotes.isEmpty == false else {
+            // TODO: Better error
+            return IntentNoteResolutionResult.unsupported()
+        }
+
+        guard intentNotes.count == 1 else {
+            return IntentNoteResolutionResult.disambiguation(with: intentNotes)
+        }
+
+        //This shouldn't happen but we to unwrap the existing note we need to return something
+        guard let matchingNote = intentNotes.first else {
+            return IntentNoteResolutionResult.unsupported()
+        }
+
+        return IntentNoteResolutionResult.success(with: matchingNote)
+    }
 }
 
 extension IntentNote {

From 39784dbed8f8c51f8e527b5e4f876b13a4047403 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 9 May 2024 13:42:36 -0600
Subject: [PATCH 154/547] dropped error description for find note intent

---
 .../ShortcutIntents.intentdefinition          | 34 -------------------
 1 file changed, 34 deletions(-)

diff --git a/Simplenote/Supporting Files/ShortcutIntents.intentdefinition b/Simplenote/Supporting Files/ShortcutIntents.intentdefinition
index 7d3097a98..02409700e 100644
--- a/Simplenote/Supporting Files/ShortcutIntents.intentdefinition	
+++ b/Simplenote/Supporting Files/ShortcutIntents.intentdefinition	
@@ -492,26 +492,6 @@
 							<key>INIntentParameterPromptDialogType</key>
 							<string>Primary</string>
 						</dict>
-						<dict>
-							<key>INIntentParameterPromptDialogCustom</key>
-							<true/>
-							<key>INIntentParameterPromptDialogFormatString</key>
-							<string>There are ${count} options matching ‘${content}’.</string>
-							<key>INIntentParameterPromptDialogFormatStringID</key>
-							<string>NAzeXM</string>
-							<key>INIntentParameterPromptDialogType</key>
-							<string>DisambiguationIntroduction</string>
-						</dict>
-						<dict>
-							<key>INIntentParameterPromptDialogCustom</key>
-							<true/>
-							<key>INIntentParameterPromptDialogFormatString</key>
-							<string>Just to confirm, you wanted ‘${content}’?</string>
-							<key>INIntentParameterPromptDialogFormatStringID</key>
-							<string>wgf6Li</string>
-							<key>INIntentParameterPromptDialogType</key>
-							<string>Confirmation</string>
-						</dict>
 					</array>
 					<key>INIntentParameterTag</key>
 					<integer>4</integer>
@@ -607,20 +587,6 @@
 						<key>INIntentResponseParameterType</key>
 						<string>Object</string>
 					</dict>
-					<dict>
-						<key>INIntentResponseParameterDisplayName</key>
-						<string>Failure Reason</string>
-						<key>INIntentResponseParameterDisplayNameID</key>
-						<string>Gde29V</string>
-						<key>INIntentResponseParameterDisplayPriority</key>
-						<integer>2</integer>
-						<key>INIntentResponseParameterName</key>
-						<string>failureReason</string>
-						<key>INIntentResponseParameterTag</key>
-						<integer>5</integer>
-						<key>INIntentResponseParameterType</key>
-						<string>String</string>
-					</dict>
 				</array>
 			</dict>
 			<key>INIntentTitle</key>

From 2d060126bb8f326e0809c6add0d224f36e0194a5 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 9 May 2024 13:43:06 -0600
Subject: [PATCH 155/547] dropped failure reason response in find note intent

---
 Simplenote/Supporting Files/ShortcutIntents.intentdefinition | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Simplenote/Supporting Files/ShortcutIntents.intentdefinition b/Simplenote/Supporting Files/ShortcutIntents.intentdefinition
index 02409700e..cc8067b13 100644
--- a/Simplenote/Supporting Files/ShortcutIntents.intentdefinition	
+++ b/Simplenote/Supporting Files/ShortcutIntents.intentdefinition	
@@ -555,10 +555,6 @@
 						<true/>
 					</dict>
 					<dict>
-						<key>INIntentResponseCodeFormatString</key>
-						<string>${failureReason}</string>
-						<key>INIntentResponseCodeFormatStringID</key>
-						<string>ThMQV4</string>
 						<key>INIntentResponseCodeName</key>
 						<string>failure</string>
 					</dict>

From 836b73012a6ac1b6dbad3152915491118cfc201c Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 9 May 2024 13:52:24 -0600
Subject: [PATCH 156/547] Updated release notes PR1584 Extended support for iOS
 Shortcuts

---
 RELEASE-NOTES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 2d445ee7c..991a8d7ed 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,6 +1,6 @@
 4.52
 -----
-
+- Extended support for iOS Shortcuts
 
 4.51
 -----

From 8fea6d6c52052dac578010c91c96d2785cb369e6 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 9 May 2024 13:57:21 -0600
Subject: [PATCH 157/547] Updated open note intent to accept a note input
 parameter

---
 Simplenote/Supporting Files/ShortcutIntents.intentdefinition | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Simplenote/Supporting Files/ShortcutIntents.intentdefinition b/Simplenote/Supporting Files/ShortcutIntents.intentdefinition
index cc8067b13..694427c5a 100644
--- a/Simplenote/Supporting Files/ShortcutIntents.intentdefinition	
+++ b/Simplenote/Supporting Files/ShortcutIntents.intentdefinition	
@@ -87,6 +87,8 @@
 			<string>sqM3pN</string>
 			<key>INIntentIneligibleForSuggestions</key>
 			<true/>
+			<key>INIntentInput</key>
+			<string>note</string>
 			<key>INIntentLastParameterTag</key>
 			<integer>2</integer>
 			<key>INIntentManagedParameterCombinations</key>

From 647d41f1d761069bc9e593e24ce1d12a2c5b846f Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 9 May 2024 15:57:25 -0600
Subject: [PATCH 158/547] Added copy note content intent handler

---
 Simplenote.xcodeproj/project.pbxproj          |   4 +
 .../ShortcutIntents.intentdefinition          | 139 ++++++++++++++++++
 .../Supporting Files/Simplenote-Info.plist    |   1 +
 .../CopyNoteContentIntentHandler.swift        |   9 ++
 SimplenoteIntents/Supporting Files/Info.plist |   1 +
 5 files changed, 154 insertions(+)
 create mode 100644 SimplenoteIntents/Intent Handlers/CopyNoteContentIntentHandler.swift

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index 5b869b878..5e0f5977f 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -511,6 +511,7 @@
 		BA8FC2A5267AC7470082962E /* SharedStorageMigrator.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA8FC2A4267AC7470082962E /* SharedStorageMigrator.swift */; };
 		BA9B19F926A8EF3200692366 /* SpinnerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9B19F826A8EF3200692366 /* SpinnerViewController.swift */; };
 		BA9B59022685549F00DAD1ED /* StorageSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9B59012685549F00DAD1ED /* StorageSettings.swift */; };
+		BA9C7EC92BED7AB1007A8460 /* CopyNoteContentIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9C7EC82BED7AB1007A8460 /* CopyNoteContentIntentHandler.swift */; };
 		BAA4856925D5E40900F3BDB9 /* SearchQuery+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAA4856825D5E40900F3BDB9 /* SearchQuery+Simplenote.swift */; };
 		BAA59E79269F9FE30068BD3D /* Date+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAA59E78269F9FE30068BD3D /* Date+Simplenote.swift */; };
 		BAA63C3325EEDA83001589D7 /* NoteLinkTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAA63C3225EEDA83001589D7 /* NoteLinkTests.swift */; };
@@ -1196,6 +1197,7 @@
 		BA8FC2A4267AC7470082962E /* SharedStorageMigrator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharedStorageMigrator.swift; sourceTree = "<group>"; };
 		BA9B19F826A8EF3200692366 /* SpinnerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpinnerViewController.swift; sourceTree = "<group>"; };
 		BA9B59012685549F00DAD1ED /* StorageSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StorageSettings.swift; sourceTree = "<group>"; };
+		BA9C7EC82BED7AB1007A8460 /* CopyNoteContentIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CopyNoteContentIntentHandler.swift; sourceTree = "<group>"; };
 		BAA4856825D5E40900F3BDB9 /* SearchQuery+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SearchQuery+Simplenote.swift"; sourceTree = "<group>"; };
 		BAA59E78269F9FE30068BD3D /* Date+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Date+Simplenote.swift"; sourceTree = "<group>"; };
 		BAA63C3225EEDA83001589D7 /* NoteLinkTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteLinkTests.swift; sourceTree = "<group>"; };
@@ -2350,6 +2352,7 @@
 				BA35808F2BE95BE100CE1590 /* AppendNoteIntentHandler.swift */,
 				BAB898D22BEC404200E238B8 /* CreateNewNoteIntentHandler.swift */,
 				BAD0F1EC2BED49C200E73E45 /* FindNoteIntentHandler.swift */,
+				BA9C7EC82BED7AB1007A8460 /* CopyNoteContentIntentHandler.swift */,
 			);
 			path = "Intent Handlers";
 			sourceTree = "<group>";
@@ -3793,6 +3796,7 @@
 				BA289B722BE45A39000E6794 /* IntentsConstants.swift in Sources */,
 				BA34B0572BEC216B00580E15 /* IntentNote+Helpers.swift in Sources */,
 				BAB5762726703C8200B0C56F /* IntentHandler.swift in Sources */,
+				BA9C7EC92BED7AB1007A8460 /* CopyNoteContentIntentHandler.swift in Sources */,
 				BA289B652BE43963000E6794 /* OpenNewNoteIntentHandler.swift in Sources */,
 				BA289B592BE436EB000E6794 /* ShortcutIntents.intentdefinition in Sources */,
 				BA0AF10D2BE996600050EEBD /* KeychainManager.swift in Sources */,
diff --git a/Simplenote/Supporting Files/ShortcutIntents.intentdefinition b/Simplenote/Supporting Files/ShortcutIntents.intentdefinition
index 694427c5a..64d84c459 100644
--- a/Simplenote/Supporting Files/ShortcutIntents.intentdefinition	
+++ b/Simplenote/Supporting Files/ShortcutIntents.intentdefinition	
@@ -596,6 +596,145 @@
 			<key>INIntentVerb</key>
 			<string>Search</string>
 		</dict>
+		<dict>
+			<key>INIntentCategory</key>
+			<string>generic</string>
+			<key>INIntentClassName</key>
+			<string>CopyNoteContentIntent</string>
+			<key>INIntentClassPrefix</key>
+			<string>SP</string>
+			<key>INIntentConfigurable</key>
+			<true/>
+			<key>INIntentDescriptionID</key>
+			<string>e09Rd3</string>
+			<key>INIntentIneligibleForSuggestions</key>
+			<true/>
+			<key>INIntentInput</key>
+			<string>note</string>
+			<key>INIntentLastParameterTag</key>
+			<integer>2</integer>
+			<key>INIntentManagedParameterCombinations</key>
+			<dict>
+				<key>note</key>
+				<dict>
+					<key>INIntentParameterCombinationSupportsBackgroundExecution</key>
+					<true/>
+					<key>INIntentParameterCombinationTitle</key>
+					<string>Copy content from ${note}</string>
+					<key>INIntentParameterCombinationTitleID</key>
+					<string>lXNZsS</string>
+					<key>INIntentParameterCombinationUpdatesLinked</key>
+					<true/>
+				</dict>
+			</dict>
+			<key>INIntentName</key>
+			<string>CopyNoteContent</string>
+			<key>INIntentParameters</key>
+			<array>
+				<dict>
+					<key>INIntentParameterConfigurable</key>
+					<true/>
+					<key>INIntentParameterDisplayName</key>
+					<string>Note</string>
+					<key>INIntentParameterDisplayNameID</key>
+					<string>cH6X2m</string>
+					<key>INIntentParameterDisplayPriority</key>
+					<integer>1</integer>
+					<key>INIntentParameterName</key>
+					<string>note</string>
+					<key>INIntentParameterObjectType</key>
+					<string>IntentNote</string>
+					<key>INIntentParameterObjectTypeNamespace</key>
+					<string>BxdWY5</string>
+					<key>INIntentParameterPromptDialogs</key>
+					<array>
+						<dict>
+							<key>INIntentParameterPromptDialogCustom</key>
+							<true/>
+							<key>INIntentParameterPromptDialogType</key>
+							<string>Configuration</string>
+						</dict>
+						<dict>
+							<key>INIntentParameterPromptDialogCustom</key>
+							<true/>
+							<key>INIntentParameterPromptDialogType</key>
+							<string>Primary</string>
+						</dict>
+						<dict>
+							<key>INIntentParameterPromptDialogCustom</key>
+							<true/>
+							<key>INIntentParameterPromptDialogFormatString</key>
+							<string>There are ${count} options matching ‘${note}’.</string>
+							<key>INIntentParameterPromptDialogFormatStringID</key>
+							<string>VBtgac</string>
+							<key>INIntentParameterPromptDialogType</key>
+							<string>DisambiguationIntroduction</string>
+						</dict>
+						<dict>
+							<key>INIntentParameterPromptDialogCustom</key>
+							<true/>
+							<key>INIntentParameterPromptDialogFormatString</key>
+							<string>Just to confirm, you wanted ‘${note}’?</string>
+							<key>INIntentParameterPromptDialogFormatStringID</key>
+							<string>MdiZid</string>
+							<key>INIntentParameterPromptDialogType</key>
+							<string>Confirmation</string>
+						</dict>
+					</array>
+					<key>INIntentParameterSupportsDynamicEnumeration</key>
+					<true/>
+					<key>INIntentParameterTag</key>
+					<integer>2</integer>
+					<key>INIntentParameterType</key>
+					<string>Object</string>
+				</dict>
+			</array>
+			<key>INIntentResponse</key>
+			<dict>
+				<key>INIntentResponseCodes</key>
+				<array>
+					<dict>
+						<key>INIntentResponseCodeName</key>
+						<string>success</string>
+						<key>INIntentResponseCodeSuccess</key>
+						<true/>
+					</dict>
+					<dict>
+						<key>INIntentResponseCodeName</key>
+						<string>failure</string>
+					</dict>
+				</array>
+				<key>INIntentResponseLastParameterTag</key>
+				<integer>1</integer>
+				<key>INIntentResponseOutput</key>
+				<string>noteContent</string>
+				<key>INIntentResponseParameters</key>
+				<array>
+					<dict>
+						<key>INIntentResponseParameterDisplayName</key>
+						<string>Note Content</string>
+						<key>INIntentResponseParameterDisplayNameID</key>
+						<string>raYk2S</string>
+						<key>INIntentResponseParameterDisplayPriority</key>
+						<integer>1</integer>
+						<key>INIntentResponseParameterName</key>
+						<string>noteContent</string>
+						<key>INIntentResponseParameterTag</key>
+						<integer>1</integer>
+						<key>INIntentResponseParameterType</key>
+						<string>String</string>
+					</dict>
+				</array>
+			</dict>
+			<key>INIntentTitle</key>
+			<string>Copy Note Content</string>
+			<key>INIntentTitleID</key>
+			<string>s11KbQ</string>
+			<key>INIntentType</key>
+			<string>Custom</string>
+			<key>INIntentVerb</key>
+			<string>Do</string>
+		</dict>
 	</array>
 	<key>INTypes</key>
 	<array>
diff --git a/Simplenote/Supporting Files/Simplenote-Info.plist b/Simplenote/Supporting Files/Simplenote-Info.plist
index 2fe3542f2..034199915 100644
--- a/Simplenote/Supporting Files/Simplenote-Info.plist	
+++ b/Simplenote/Supporting Files/Simplenote-Info.plist	
@@ -81,6 +81,7 @@
 		<string>NoteWidgetIntent</string>
 		<string>OpenNewNoteIntent</string>
 		<string>OpenNoteIntent</string>
+		<string>CopyNoteContentIntent</string>
 		<string>com.codality.NotationalFlow.launch</string>
 		<string>com.codality.NotationalFlow.newNote</string>
 		<string>com.codality.NotationalFlow.openNote</string>
diff --git a/SimplenoteIntents/Intent Handlers/CopyNoteContentIntentHandler.swift b/SimplenoteIntents/Intent Handlers/CopyNoteContentIntentHandler.swift
new file mode 100644
index 000000000..269422fb5
--- /dev/null
+++ b/SimplenoteIntents/Intent Handlers/CopyNoteContentIntentHandler.swift	
@@ -0,0 +1,9 @@
+//
+//  CopyNoteContentIntentHandler.swift
+//  SimplenoteIntents
+//
+//  Created by Charlie Scheer on 5/9/24.
+//  Copyright © 2024 Automattic. All rights reserved.
+//
+
+import Foundation
diff --git a/SimplenoteIntents/Supporting Files/Info.plist b/SimplenoteIntents/Supporting Files/Info.plist
index 946c2d7fc..8f50fd5ef 100644
--- a/SimplenoteIntents/Supporting Files/Info.plist	
+++ b/SimplenoteIntents/Supporting Files/Info.plist	
@@ -37,6 +37,7 @@
 				<string>NoteWidgetIntent</string>
 				<string>OpenNewNoteIntent</string>
 				<string>OpenNoteIntent</string>
+				<string>CopyNoteContentIntent</string>
 			</array>
 		</dict>
 		<key>NSExtensionPointIdentifier</key>

From 58c13b46c10cfd2282a56b8b4716dbc922e0849f Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 9 May 2024 15:57:40 -0600
Subject: [PATCH 159/547] Created intent handler to copy content from a note

---
 .../CopyNoteContentIntentHandler.swift        | 26 ++++++++++++++++++-
 SimplenoteIntents/IntentHandler.swift         |  2 ++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/SimplenoteIntents/Intent Handlers/CopyNoteContentIntentHandler.swift b/SimplenoteIntents/Intent Handlers/CopyNoteContentIntentHandler.swift
index 269422fb5..7b526493d 100644
--- a/SimplenoteIntents/Intent Handlers/CopyNoteContentIntentHandler.swift	
+++ b/SimplenoteIntents/Intent Handlers/CopyNoteContentIntentHandler.swift	
@@ -6,4 +6,28 @@
 //  Copyright © 2024 Automattic. All rights reserved.
 //
 
-import Foundation
+import Intents
+
+class CopyNoteContentIntentHandler: NSObject, CopyNoteContentIntentHandling {
+    let coreDataWrapper = ExtensionCoreDataWrapper()
+
+    func provideNoteOptionsCollection(for intent: CopyNoteContentIntent) async throws -> INObjectCollection<IntentNote> {
+        let intentNotes = try IntentNote.allNotes(in: coreDataWrapper)
+        return INObjectCollection(items: intentNotes)
+    }
+
+    func handle(intent: CopyNoteContentIntent) async -> CopyNoteContentIntentResponse {
+        guard let note = intent.note else {
+            return CopyNoteContentIntentResponse(code: .unspecified, userActivity: nil)
+        }
+
+        guard let identifier = note.identifier,
+              let content = coreDataWrapper.resultsController()?.note(forSimperiumKey: identifier)?.content else {
+            return CopyNoteContentIntentResponse(code: .failure, userActivity: nil)
+        }
+
+        let response = CopyNoteContentIntentResponse(code: .success, userActivity: nil)
+        response.noteContent = content
+        return response
+    }
+}
diff --git a/SimplenoteIntents/IntentHandler.swift b/SimplenoteIntents/IntentHandler.swift
index 637fee2a5..9541d55e9 100644
--- a/SimplenoteIntents/IntentHandler.swift
+++ b/SimplenoteIntents/IntentHandler.swift
@@ -19,6 +19,8 @@ class IntentHandler: INExtension {
             return CreateNewNoteIntentHandler()
         case is FindNoteIntent:
             return FindNoteIntentHandler()
+        case is CopyNoteContentIntent:
+            return CopyNoteContentIntentHandler()
         default:
             return self
         }

From b0904b5ea919a2874755dbc505e672a74de6276c Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 9 May 2024 16:02:11 -0600
Subject: [PATCH 160/547] Added find note with tag intent

---
 .../ShortcutIntents.intentdefinition          | 250 ++++++++++++++++++
 .../Supporting Files/Simplenote-Info.plist    |   3 +-
 SimplenoteIntents/Supporting Files/Info.plist |   3 +-
 3 files changed, 254 insertions(+), 2 deletions(-)

diff --git a/Simplenote/Supporting Files/ShortcutIntents.intentdefinition b/Simplenote/Supporting Files/ShortcutIntents.intentdefinition
index 64d84c459..c2ac7df11 100644
--- a/Simplenote/Supporting Files/ShortcutIntents.intentdefinition	
+++ b/Simplenote/Supporting Files/ShortcutIntents.intentdefinition	
@@ -735,6 +735,191 @@
 			<key>INIntentVerb</key>
 			<string>Do</string>
 		</dict>
+		<dict>
+			<key>INIntentCategory</key>
+			<string>search</string>
+			<key>INIntentClassName</key>
+			<string>FindNoteWithTagIntent</string>
+			<key>INIntentClassPrefix</key>
+			<string>SP</string>
+			<key>INIntentConfigurable</key>
+			<true/>
+			<key>INIntentDescriptionID</key>
+			<string>R4WdO6</string>
+			<key>INIntentIneligibleForSuggestions</key>
+			<true/>
+			<key>INIntentLastParameterTag</key>
+			<integer>3</integer>
+			<key>INIntentManagedParameterCombinations</key>
+			<dict>
+				<key>tag,note</key>
+				<dict>
+					<key>INIntentParameterCombinationSupportsBackgroundExecution</key>
+					<true/>
+					<key>INIntentParameterCombinationTitle</key>
+					<string>Find a note with ${tag}</string>
+					<key>INIntentParameterCombinationTitleID</key>
+					<string>YxSeRd</string>
+					<key>INIntentParameterCombinationUpdatesLinked</key>
+					<true/>
+				</dict>
+			</dict>
+			<key>INIntentName</key>
+			<string>FindNoteWithTag</string>
+			<key>INIntentParameters</key>
+			<array>
+				<dict>
+					<key>INIntentParameterConfigurable</key>
+					<true/>
+					<key>INIntentParameterDisplayName</key>
+					<string>Tag</string>
+					<key>INIntentParameterDisplayNameID</key>
+					<string>s9MSi2</string>
+					<key>INIntentParameterDisplayPriority</key>
+					<integer>1</integer>
+					<key>INIntentParameterName</key>
+					<string>tag</string>
+					<key>INIntentParameterObjectType</key>
+					<string>Tag</string>
+					<key>INIntentParameterObjectTypeNamespace</key>
+					<string>BxdWY5</string>
+					<key>INIntentParameterPromptDialogs</key>
+					<array>
+						<dict>
+							<key>INIntentParameterPromptDialogCustom</key>
+							<true/>
+							<key>INIntentParameterPromptDialogType</key>
+							<string>Configuration</string>
+						</dict>
+						<dict>
+							<key>INIntentParameterPromptDialogCustom</key>
+							<true/>
+							<key>INIntentParameterPromptDialogType</key>
+							<string>Primary</string>
+						</dict>
+						<dict>
+							<key>INIntentParameterPromptDialogCustom</key>
+							<true/>
+							<key>INIntentParameterPromptDialogFormatString</key>
+							<string>There are ${count} options matching ‘${tag}’.</string>
+							<key>INIntentParameterPromptDialogFormatStringID</key>
+							<string>U4ce2H</string>
+							<key>INIntentParameterPromptDialogType</key>
+							<string>DisambiguationIntroduction</string>
+						</dict>
+						<dict>
+							<key>INIntentParameterPromptDialogCustom</key>
+							<true/>
+							<key>INIntentParameterPromptDialogFormatString</key>
+							<string>Just to confirm, you wanted ‘${tag}’?</string>
+							<key>INIntentParameterPromptDialogFormatStringID</key>
+							<string>qYKqOP</string>
+							<key>INIntentParameterPromptDialogType</key>
+							<string>Confirmation</string>
+						</dict>
+					</array>
+					<key>INIntentParameterSupportsDynamicEnumeration</key>
+					<true/>
+					<key>INIntentParameterTag</key>
+					<integer>3</integer>
+					<key>INIntentParameterType</key>
+					<string>Object</string>
+				</dict>
+				<dict>
+					<key>INIntentParameterConfigurable</key>
+					<true/>
+					<key>INIntentParameterDisplayName</key>
+					<string>Note</string>
+					<key>INIntentParameterDisplayNameID</key>
+					<string>wLeRnn</string>
+					<key>INIntentParameterDisplayPriority</key>
+					<integer>2</integer>
+					<key>INIntentParameterMetadata</key>
+					<dict>
+						<key>INIntentParameterMetadataCapitalization</key>
+						<string>Sentences</string>
+						<key>INIntentParameterMetadataDefaultValueID</key>
+						<string>Y8F8kT</string>
+					</dict>
+					<key>INIntentParameterName</key>
+					<string>note</string>
+					<key>INIntentParameterPromptDialogs</key>
+					<array>
+						<dict>
+							<key>INIntentParameterPromptDialogCustom</key>
+							<true/>
+							<key>INIntentParameterPromptDialogType</key>
+							<string>Configuration</string>
+						</dict>
+						<dict>
+							<key>INIntentParameterPromptDialogCustom</key>
+							<true/>
+							<key>INIntentParameterPromptDialogFormatString</key>
+							<string>Which One?</string>
+							<key>INIntentParameterPromptDialogFormatStringID</key>
+							<string>uDDlMr</string>
+							<key>INIntentParameterPromptDialogType</key>
+							<string>Primary</string>
+						</dict>
+					</array>
+					<key>INIntentParameterSupportsResolution</key>
+					<true/>
+					<key>INIntentParameterTag</key>
+					<integer>2</integer>
+					<key>INIntentParameterType</key>
+					<string>String</string>
+				</dict>
+			</array>
+			<key>INIntentResponse</key>
+			<dict>
+				<key>INIntentResponseCodes</key>
+				<array>
+					<dict>
+						<key>INIntentResponseCodeName</key>
+						<string>success</string>
+						<key>INIntentResponseCodeSuccess</key>
+						<true/>
+					</dict>
+					<dict>
+						<key>INIntentResponseCodeName</key>
+						<string>failure</string>
+					</dict>
+				</array>
+				<key>INIntentResponseLastParameterTag</key>
+				<integer>2</integer>
+				<key>INIntentResponseOutput</key>
+				<string>note</string>
+				<key>INIntentResponseParameters</key>
+				<array>
+					<dict>
+						<key>INIntentResponseParameterDisplayName</key>
+						<string>Note</string>
+						<key>INIntentResponseParameterDisplayNameID</key>
+						<string>CUkV8q</string>
+						<key>INIntentResponseParameterDisplayPriority</key>
+						<integer>1</integer>
+						<key>INIntentResponseParameterName</key>
+						<string>note</string>
+						<key>INIntentResponseParameterObjectType</key>
+						<string>IntentNote</string>
+						<key>INIntentResponseParameterObjectTypeNamespace</key>
+						<string>BxdWY5</string>
+						<key>INIntentResponseParameterTag</key>
+						<integer>2</integer>
+						<key>INIntentResponseParameterType</key>
+						<string>Object</string>
+					</dict>
+				</array>
+			</dict>
+			<key>INIntentTitle</key>
+			<string>Find Note With Tag</string>
+			<key>INIntentTitleID</key>
+			<string>nF2vZQ</string>
+			<key>INIntentType</key>
+			<string>Custom</string>
+			<key>INIntentVerb</key>
+			<string>Search</string>
+		</dict>
 	</array>
 	<key>INTypes</key>
 	<array>
@@ -805,6 +990,71 @@
 				</dict>
 			</array>
 		</dict>
+		<dict>
+			<key>INTypeClassPrefix</key>
+			<string>SP</string>
+			<key>INTypeDisplayName</key>
+			<string>Tag</string>
+			<key>INTypeDisplayNameID</key>
+			<string>IIfrvb</string>
+			<key>INTypeLastPropertyTag</key>
+			<integer>99</integer>
+			<key>INTypeName</key>
+			<string>Tag</string>
+			<key>INTypeProperties</key>
+			<array>
+				<dict>
+					<key>INTypePropertyDefault</key>
+					<true/>
+					<key>INTypePropertyDisplayPriority</key>
+					<integer>1</integer>
+					<key>INTypePropertyName</key>
+					<string>identifier</string>
+					<key>INTypePropertyTag</key>
+					<integer>1</integer>
+					<key>INTypePropertyType</key>
+					<string>String</string>
+				</dict>
+				<dict>
+					<key>INTypePropertyDefault</key>
+					<true/>
+					<key>INTypePropertyDisplayPriority</key>
+					<integer>2</integer>
+					<key>INTypePropertyName</key>
+					<string>displayString</string>
+					<key>INTypePropertyTag</key>
+					<integer>2</integer>
+					<key>INTypePropertyType</key>
+					<string>String</string>
+				</dict>
+				<dict>
+					<key>INTypePropertyDefault</key>
+					<true/>
+					<key>INTypePropertyDisplayPriority</key>
+					<integer>3</integer>
+					<key>INTypePropertyName</key>
+					<string>pronunciationHint</string>
+					<key>INTypePropertyTag</key>
+					<integer>3</integer>
+					<key>INTypePropertyType</key>
+					<string>String</string>
+				</dict>
+				<dict>
+					<key>INTypePropertyDefault</key>
+					<true/>
+					<key>INTypePropertyDisplayPriority</key>
+					<integer>4</integer>
+					<key>INTypePropertyName</key>
+					<string>alternativeSpeakableMatches</string>
+					<key>INTypePropertySupportsMultipleValues</key>
+					<true/>
+					<key>INTypePropertyTag</key>
+					<integer>4</integer>
+					<key>INTypePropertyType</key>
+					<string>SpeakableString</string>
+				</dict>
+			</array>
+		</dict>
 	</array>
 </dict>
 </plist>
diff --git a/Simplenote/Supporting Files/Simplenote-Info.plist b/Simplenote/Supporting Files/Simplenote-Info.plist
index 034199915..3f1354c73 100644
--- a/Simplenote/Supporting Files/Simplenote-Info.plist	
+++ b/Simplenote/Supporting Files/Simplenote-Info.plist	
@@ -75,13 +75,14 @@
 	<key>NSUserActivityTypes</key>
 	<array>
 		<string>AppendNoteIntent</string>
+		<string>CopyNoteContentIntent</string>
 		<string>CreateNewNoteIntent</string>
 		<string>FindNoteIntent</string>
+		<string>FindNoteWithTagIntent</string>
 		<string>ListWidgetIntent</string>
 		<string>NoteWidgetIntent</string>
 		<string>OpenNewNoteIntent</string>
 		<string>OpenNoteIntent</string>
-		<string>CopyNoteContentIntent</string>
 		<string>com.codality.NotationalFlow.launch</string>
 		<string>com.codality.NotationalFlow.newNote</string>
 		<string>com.codality.NotationalFlow.openNote</string>
diff --git a/SimplenoteIntents/Supporting Files/Info.plist b/SimplenoteIntents/Supporting Files/Info.plist
index 8f50fd5ef..4d033e2a1 100644
--- a/SimplenoteIntents/Supporting Files/Info.plist	
+++ b/SimplenoteIntents/Supporting Files/Info.plist	
@@ -31,13 +31,14 @@
 			<key>IntentsSupported</key>
 			<array>
 				<string>AppendNoteIntent</string>
+				<string>CopyNoteContentIntent</string>
 				<string>CreateNewNoteIntent</string>
 				<string>FindNoteIntent</string>
+				<string>FindNoteWithTagIntent</string>
 				<string>ListWidgetIntent</string>
 				<string>NoteWidgetIntent</string>
 				<string>OpenNewNoteIntent</string>
 				<string>OpenNoteIntent</string>
-				<string>CopyNoteContentIntent</string>
 			</array>
 		</dict>
 		<key>NSExtensionPointIdentifier</key>

From 0fdca0309264ee532a365d4b318e87a000faa400 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 9 May 2024 16:14:33 -0600
Subject: [PATCH 161/547] Added structure to fetch tags for find note with tag
 intent

---
 Simplenote.xcodeproj/project.pbxproj          |  8 ++++++
 .../ShortcutIntents.intentdefinition          | 25 +++++++++---------
 .../FindNoteWithTagIntentHandler.swift        | 26 +++++++++++++++++++
 SimplenoteIntents/IntentHandler.swift         |  2 ++
 SimplenoteIntents/IntentsError.swift          |  5 ++++
 .../ResolutionResults/IntentTag+Helpers.swift | 19 ++++++++++++++
 6 files changed, 72 insertions(+), 13 deletions(-)
 create mode 100644 SimplenoteIntents/Intent Handlers/FindNoteWithTagIntentHandler.swift
 create mode 100644 SimplenoteIntents/ResolutionResults/IntentTag+Helpers.swift

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index 5e0f5977f..f2727bbe1 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -512,6 +512,8 @@
 		BA9B19F926A8EF3200692366 /* SpinnerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9B19F826A8EF3200692366 /* SpinnerViewController.swift */; };
 		BA9B59022685549F00DAD1ED /* StorageSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9B59012685549F00DAD1ED /* StorageSettings.swift */; };
 		BA9C7EC92BED7AB1007A8460 /* CopyNoteContentIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9C7EC82BED7AB1007A8460 /* CopyNoteContentIntentHandler.swift */; };
+		BA9C7ECB2BED7F7B007A8460 /* FindNoteWithTagIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9C7ECA2BED7F7B007A8460 /* FindNoteWithTagIntentHandler.swift */; };
+		BA9C7ECD2BED813B007A8460 /* IntentTag+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9C7ECC2BED813B007A8460 /* IntentTag+Helpers.swift */; };
 		BAA4856925D5E40900F3BDB9 /* SearchQuery+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAA4856825D5E40900F3BDB9 /* SearchQuery+Simplenote.swift */; };
 		BAA59E79269F9FE30068BD3D /* Date+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAA59E78269F9FE30068BD3D /* Date+Simplenote.swift */; };
 		BAA63C3325EEDA83001589D7 /* NoteLinkTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAA63C3225EEDA83001589D7 /* NoteLinkTests.swift */; };
@@ -1198,6 +1200,8 @@
 		BA9B19F826A8EF3200692366 /* SpinnerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpinnerViewController.swift; sourceTree = "<group>"; };
 		BA9B59012685549F00DAD1ED /* StorageSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StorageSettings.swift; sourceTree = "<group>"; };
 		BA9C7EC82BED7AB1007A8460 /* CopyNoteContentIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CopyNoteContentIntentHandler.swift; sourceTree = "<group>"; };
+		BA9C7ECA2BED7F7B007A8460 /* FindNoteWithTagIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FindNoteWithTagIntentHandler.swift; sourceTree = "<group>"; };
+		BA9C7ECC2BED813B007A8460 /* IntentTag+Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "IntentTag+Helpers.swift"; sourceTree = "<group>"; };
 		BAA4856825D5E40900F3BDB9 /* SearchQuery+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SearchQuery+Simplenote.swift"; sourceTree = "<group>"; };
 		BAA59E78269F9FE30068BD3D /* Date+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Date+Simplenote.swift"; sourceTree = "<group>"; };
 		BAA63C3225EEDA83001589D7 /* NoteLinkTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteLinkTests.swift; sourceTree = "<group>"; };
@@ -2353,6 +2357,7 @@
 				BAB898D22BEC404200E238B8 /* CreateNewNoteIntentHandler.swift */,
 				BAD0F1EC2BED49C200E73E45 /* FindNoteIntentHandler.swift */,
 				BA9C7EC82BED7AB1007A8460 /* CopyNoteContentIntentHandler.swift */,
+				BA9C7ECA2BED7F7B007A8460 /* FindNoteWithTagIntentHandler.swift */,
 			);
 			path = "Intent Handlers";
 			sourceTree = "<group>";
@@ -2361,6 +2366,7 @@
 			isa = PBXGroup;
 			children = (
 				BA34B0562BEC216B00580E15 /* IntentNote+Helpers.swift */,
+				BA9C7ECC2BED813B007A8460 /* IntentTag+Helpers.swift */,
 			);
 			path = ResolutionResults;
 			sourceTree = "<group>";
@@ -3804,6 +3810,7 @@
 				BAB898D32BEC404200E238B8 /* CreateNewNoteIntentHandler.swift in Sources */,
 				BA12B07026B0D0150026F31D /* SPManagedObject+Widget.swift in Sources */,
 				BAF4A9AA26DB138600C51C1D /* NoteContentHelper.swift in Sources */,
+				BA9C7ECB2BED7F7B007A8460 /* FindNoteWithTagIntentHandler.swift in Sources */,
 				BA6D7B8B2BE588F0006AE368 /* IntentsError.swift in Sources */,
 				BA289B782BE45BFB000E6794 /* ActivityType.swift in Sources */,
 				BA3580902BE95BE100CE1590 /* AppendNoteIntentHandler.swift in Sources */,
@@ -3816,6 +3823,7 @@
 				BAB6C04426BA49F3007495C4 /* ContentSlice.swift in Sources */,
 				BA86624926B3B05100466746 /* SimplenoteConstants.swift in Sources */,
 				BAB5765C26703D0600B0C56F /* NoteWidgetIntent.intentdefinition in Sources */,
+				BA9C7ECD2BED813B007A8460 /* IntentTag+Helpers.swift in Sources */,
 				BAB6C04526BA4A04007495C4 /* String+Simplenote.swift in Sources */,
 				BA32A91926B746A200727247 /* WidgetError.swift in Sources */,
 				BAF4A9BD26DB13B400C51C1D /* Note+Widget.swift in Sources */,
diff --git a/Simplenote/Supporting Files/ShortcutIntents.intentdefinition b/Simplenote/Supporting Files/ShortcutIntents.intentdefinition
index c2ac7df11..fcb648266 100644
--- a/Simplenote/Supporting Files/ShortcutIntents.intentdefinition	
+++ b/Simplenote/Supporting Files/ShortcutIntents.intentdefinition	
@@ -749,7 +749,7 @@
 			<key>INIntentIneligibleForSuggestions</key>
 			<true/>
 			<key>INIntentLastParameterTag</key>
-			<integer>3</integer>
+			<integer>4</integer>
 			<key>INIntentManagedParameterCombinations</key>
 			<dict>
 				<key>tag,note</key>
@@ -780,7 +780,7 @@
 					<key>INIntentParameterName</key>
 					<string>tag</string>
 					<key>INIntentParameterObjectType</key>
-					<string>Tag</string>
+					<string>IntentTag</string>
 					<key>INIntentParameterObjectTypeNamespace</key>
 					<string>BxdWY5</string>
 					<key>INIntentParameterPromptDialogs</key>
@@ -834,15 +834,12 @@
 					<string>wLeRnn</string>
 					<key>INIntentParameterDisplayPriority</key>
 					<integer>2</integer>
-					<key>INIntentParameterMetadata</key>
-					<dict>
-						<key>INIntentParameterMetadataCapitalization</key>
-						<string>Sentences</string>
-						<key>INIntentParameterMetadataDefaultValueID</key>
-						<string>Y8F8kT</string>
-					</dict>
 					<key>INIntentParameterName</key>
 					<string>note</string>
+					<key>INIntentParameterObjectType</key>
+					<string>IntentNote</string>
+					<key>INIntentParameterObjectTypeNamespace</key>
+					<string>BxdWY5</string>
 					<key>INIntentParameterPromptDialogs</key>
 					<array>
 						<dict>
@@ -865,9 +862,9 @@
 					<key>INIntentParameterSupportsResolution</key>
 					<true/>
 					<key>INIntentParameterTag</key>
-					<integer>2</integer>
+					<integer>4</integer>
 					<key>INIntentParameterType</key>
-					<string>String</string>
+					<string>Object</string>
 				</dict>
 			</array>
 			<key>INIntentResponse</key>
@@ -991,16 +988,18 @@
 			</array>
 		</dict>
 		<dict>
+			<key>INTypeClassName</key>
+			<string>IntentTag</string>
 			<key>INTypeClassPrefix</key>
 			<string>SP</string>
 			<key>INTypeDisplayName</key>
-			<string>Tag</string>
+			<string>Intent Tag</string>
 			<key>INTypeDisplayNameID</key>
 			<string>IIfrvb</string>
 			<key>INTypeLastPropertyTag</key>
 			<integer>99</integer>
 			<key>INTypeName</key>
-			<string>Tag</string>
+			<string>IntentTag</string>
 			<key>INTypeProperties</key>
 			<array>
 				<dict>
diff --git a/SimplenoteIntents/Intent Handlers/FindNoteWithTagIntentHandler.swift b/SimplenoteIntents/Intent Handlers/FindNoteWithTagIntentHandler.swift
new file mode 100644
index 000000000..05afd96ba
--- /dev/null
+++ b/SimplenoteIntents/Intent Handlers/FindNoteWithTagIntentHandler.swift	
@@ -0,0 +1,26 @@
+//
+//  FindNoteWithTagIntentHandler.swift
+//  SimplenoteIntents
+//
+//  Created by Charlie Scheer on 5/9/24.
+//  Copyright © 2024 Automattic. All rights reserved.
+//
+
+import Intents
+
+class FindNoteWithTagIntentHandler: NSObject, FindNoteWithTagIntentHandling {
+    let coreDataWrapper = ExtensionCoreDataWrapper()
+
+    func resolveNote(for intent: FindNoteWithTagIntent) async -> IntentNoteResolutionResult {
+        IntentNoteResolutionResult.success(with: IntentNote(identifier: "", display: ""))
+    }
+
+    func provideTagOptionsCollection(for intent: FindNoteWithTagIntent) async throws -> INObjectCollection<IntentTag> {
+        let tags = try IntentTag.allTags(in: coreDataWrapper)
+        return INObjectCollection(items: tags)
+    }
+
+    func handle(intent: FindNoteWithTagIntent) async -> FindNoteWithTagIntentResponse {
+        FindNoteWithTagIntentResponse(code: .success, userActivity: nil)
+    }
+}
diff --git a/SimplenoteIntents/IntentHandler.swift b/SimplenoteIntents/IntentHandler.swift
index 9541d55e9..253026efc 100644
--- a/SimplenoteIntents/IntentHandler.swift
+++ b/SimplenoteIntents/IntentHandler.swift
@@ -21,6 +21,8 @@ class IntentHandler: INExtension {
             return FindNoteIntentHandler()
         case is CopyNoteContentIntent:
             return CopyNoteContentIntentHandler()
+        case is FindNoteWithTagIntent:
+            return FindNoteWithTagIntentHandler()
         default:
             return self
         }
diff --git a/SimplenoteIntents/IntentsError.swift b/SimplenoteIntents/IntentsError.swift
index b3c149d2b..821b7edbc 100644
--- a/SimplenoteIntents/IntentsError.swift
+++ b/SimplenoteIntents/IntentsError.swift
@@ -10,11 +10,14 @@ import Foundation
 
 enum IntentsError: Error {
     case couldNotFetchNotes
+    case couldNotFetchTags
 
     var title: String {
         switch self {
         case .couldNotFetchNotes:
             return NSLocalizedString("Could not fetch Notes", comment: "Note fetch error title")
+        case .couldNotFetchTags:
+            return NSLocalizedString("Could not fetch Tags", comment: "Tag fetch error title")
         }
     }
 
@@ -22,6 +25,8 @@ enum IntentsError: Error {
         switch self {
         case .couldNotFetchNotes:
             return NSLocalizedString("Attempt to fetch notes failed.  Please try again later.", comment: "Data Fetch error message")
+        case .couldNotFetchTags:
+            return NSLocalizedString("Attempt to fetch tags failed.  Please try again later.", comment: "Data Fetch error message")
         }
     }
 }
diff --git a/SimplenoteIntents/ResolutionResults/IntentTag+Helpers.swift b/SimplenoteIntents/ResolutionResults/IntentTag+Helpers.swift
new file mode 100644
index 000000000..a11a1226e
--- /dev/null
+++ b/SimplenoteIntents/ResolutionResults/IntentTag+Helpers.swift
@@ -0,0 +1,19 @@
+//
+//  IntentTag+Helpers.swift
+//  SimplenoteIntents
+//
+//  Created by Charlie Scheer on 5/9/24.
+//  Copyright © 2024 Automattic. All rights reserved.
+//
+
+import Intents
+
+extension IntentTag {
+    static func allTags(in coreDataWrapper: ExtensionCoreDataWrapper) throws -> [IntentTag] {
+        guard let tags = coreDataWrapper.resultsController()?.tags() else {
+            throw IntentsError.couldNotFetchTags
+        }
+
+        return tags.map({ IntentTag(identifier: $0.simperiumKey, display: $0.name ?? String()) })
+    }
+}

From 0d1589bbc65777a498170becc1d0e168310ca81b Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 9 May 2024 16:42:24 -0600
Subject: [PATCH 162/547] Added resolve methods for fetching notes from tag

---
 .../FindNoteWithTagIntentHandler.swift        | 18 ++++++++--
 .../IntentNote+Helpers.swift                  | 34 +++++++++++++------
 2 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/SimplenoteIntents/Intent Handlers/FindNoteWithTagIntentHandler.swift b/SimplenoteIntents/Intent Handlers/FindNoteWithTagIntentHandler.swift
index 05afd96ba..78eaf8aca 100644
--- a/SimplenoteIntents/Intent Handlers/FindNoteWithTagIntentHandler.swift	
+++ b/SimplenoteIntents/Intent Handlers/FindNoteWithTagIntentHandler.swift	
@@ -12,7 +12,15 @@ class FindNoteWithTagIntentHandler: NSObject, FindNoteWithTagIntentHandling {
     let coreDataWrapper = ExtensionCoreDataWrapper()
 
     func resolveNote(for intent: FindNoteWithTagIntent) async -> IntentNoteResolutionResult {
-        IntentNoteResolutionResult.success(with: IntentNote(identifier: "", display: ""))
+        if let selectedNote = intent.note {
+            return IntentNoteResolutionResult.success(with: selectedNote)
+        }
+
+        guard let selectedTag = intent.tag else {
+            return IntentNoteResolutionResult.needsValue()
+        }
+
+        return IntentNoteResolutionResult.resolveIntentNote(forTag: selectedTag, in: coreDataWrapper)
     }
 
     func provideTagOptionsCollection(for intent: FindNoteWithTagIntent) async throws -> INObjectCollection<IntentTag> {
@@ -21,6 +29,12 @@ class FindNoteWithTagIntentHandler: NSObject, FindNoteWithTagIntentHandling {
     }
 
     func handle(intent: FindNoteWithTagIntent) async -> FindNoteWithTagIntentResponse {
-        FindNoteWithTagIntentResponse(code: .success, userActivity: nil)
+        guard let note = intent.note else {
+            return FindNoteWithTagIntentResponse(code: .failure, userActivity: nil)
+        }
+
+        let response = FindNoteWithTagIntentResponse(code: .success, userActivity: nil)
+        response.note = note
+        return response
     }
 }
diff --git a/SimplenoteIntents/ResolutionResults/IntentNote+Helpers.swift b/SimplenoteIntents/ResolutionResults/IntentNote+Helpers.swift
index 3dc4ce1ae..ddbca72df 100644
--- a/SimplenoteIntents/ResolutionResults/IntentNote+Helpers.swift
+++ b/SimplenoteIntents/ResolutionResults/IntentNote+Helpers.swift
@@ -24,27 +24,35 @@ extension IntentNoteResolutionResult {
 
     static func resolveIntentNote(for content: String, in coreDataWrapper: ExtensionCoreDataWrapper) -> IntentNoteResolutionResult {
         guard let notes = coreDataWrapper.resultsController()?.notes() else {
-            // TODO: Better error
             return IntentNoteResolutionResult.unsupported()
         }
         let filteredNotes = notes.filter({ $0.content?.contains(content) == true })
-        let intentNotes = filteredNotes.map({ IntentNote(identifier: $0.simperiumKey, display: $0.title) })
+        let intentNotes = IntentNote.makeIntentNotes(from: filteredNotes)
 
-        guard intentNotes.isEmpty == false else {
-            // TODO: Better error
+        return resolve(intentNotes)
+    }
+
+    static func resolveIntentNote(forTag tag: IntentTag, in coreDataWrapper: ExtensionCoreDataWrapper) -> IntentNoteResolutionResult {
+        guard let notesForTag = coreDataWrapper.resultsController()?.notes(filteredBy: .tag(tag.displayString)) else {
             return IntentNoteResolutionResult.unsupported()
         }
 
-        guard intentNotes.count == 1 else {
-            return IntentNoteResolutionResult.disambiguation(with: intentNotes)
-        }
+        let intentNotes = IntentNote.makeIntentNotes(from: notesForTag)
+
+        return resolve(intentNotes)
+    }
 
-        //This shouldn't happen but we to unwrap the existing note we need to return something
-        guard let matchingNote = intentNotes.first else {
+    private static func resolve(_ intentNotes: [IntentNote]) -> IntentNoteResolutionResult {
+        guard intentNotes.isEmpty == false else {
             return IntentNoteResolutionResult.unsupported()
         }
 
-        return IntentNoteResolutionResult.success(with: matchingNote)
+        if intentNotes.count == 1,
+           let intentNote = intentNotes.first {
+            return IntentNoteResolutionResult.success(with: intentNote)
+        }
+
+        return IntentNoteResolutionResult.disambiguation(with: intentNotes)
     }
 }
 
@@ -54,6 +62,10 @@ extension IntentNote {
             throw IntentsError.couldNotFetchNotes
         }
 
-        return notes.map({ IntentNote(identifier: $0.simperiumKey, display: $0.title) })
+        return makeIntentNotes(from: notes)
+    }
+
+    static func makeIntentNotes(from notes: [Note]) -> [IntentNote] {
+        notes.map({ IntentNote(identifier: $0.simperiumKey, display: $0.title) })
     }
 }

From 51877490af4df4eeeee1822f254345d820efa8ad Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Fri, 10 May 2024 12:18:42 -0600
Subject: [PATCH 163/547] Added localize support for siri kit intents

---
 Simplenote.xcodeproj/project.pbxproj          | 60 +++++++++++--
 .../ShortcutIntents.intentdefinition          |  0
 .../ar.lproj/ShortcutIntents.strings          | 86 +++++++++++++++++++
 .../cy.lproj/ShortcutIntents.strings          | 86 +++++++++++++++++++
 .../de.lproj/ShortcutIntents.strings          | 86 +++++++++++++++++++
 .../el.lproj/ShortcutIntents.strings          | 86 +++++++++++++++++++
 .../en.lproj/ShortcutIntents.strings          | 86 +++++++++++++++++++
 .../es.lproj/ShortcutIntents.strings          | 86 +++++++++++++++++++
 .../fa.lproj/ShortcutIntents.strings          | 86 +++++++++++++++++++
 .../fr.lproj/ShortcutIntents.strings          | 86 +++++++++++++++++++
 .../he.lproj/ShortcutIntents.strings          | 86 +++++++++++++++++++
 .../id.lproj/ShortcutIntents.strings          | 86 +++++++++++++++++++
 .../it.lproj/ShortcutIntents.strings          | 86 +++++++++++++++++++
 .../ja.lproj/ShortcutIntents.strings          | 86 +++++++++++++++++++
 .../ko.lproj/ShortcutIntents.strings          | 86 +++++++++++++++++++
 .../nl.lproj/ShortcutIntents.strings          | 86 +++++++++++++++++++
 .../pt-BR.lproj/ShortcutIntents.strings       | 86 +++++++++++++++++++
 .../ru.lproj/ShortcutIntents.strings          | 86 +++++++++++++++++++
 .../sv.lproj/ShortcutIntents.strings          | 86 +++++++++++++++++++
 .../tr.lproj/ShortcutIntents.strings          | 86 +++++++++++++++++++
 .../zh-Hans-CN.lproj/ShortcutIntents.strings  | 86 +++++++++++++++++++
 .../zh-Hant-TW.lproj/ShortcutIntents.strings  | 86 +++++++++++++++++++
 22 files changed, 1774 insertions(+), 6 deletions(-)
 rename Simplenote/Supporting Files/{ => Base.lproj}/ShortcutIntents.intentdefinition (100%)
 create mode 100644 Simplenote/Supporting Files/ar.lproj/ShortcutIntents.strings
 create mode 100644 Simplenote/Supporting Files/cy.lproj/ShortcutIntents.strings
 create mode 100644 Simplenote/Supporting Files/de.lproj/ShortcutIntents.strings
 create mode 100644 Simplenote/Supporting Files/el.lproj/ShortcutIntents.strings
 create mode 100644 Simplenote/Supporting Files/en.lproj/ShortcutIntents.strings
 create mode 100644 Simplenote/Supporting Files/es.lproj/ShortcutIntents.strings
 create mode 100644 Simplenote/Supporting Files/fa.lproj/ShortcutIntents.strings
 create mode 100644 Simplenote/Supporting Files/fr.lproj/ShortcutIntents.strings
 create mode 100644 Simplenote/Supporting Files/he.lproj/ShortcutIntents.strings
 create mode 100644 Simplenote/Supporting Files/id.lproj/ShortcutIntents.strings
 create mode 100644 Simplenote/Supporting Files/it.lproj/ShortcutIntents.strings
 create mode 100644 Simplenote/Supporting Files/ja.lproj/ShortcutIntents.strings
 create mode 100644 Simplenote/Supporting Files/ko.lproj/ShortcutIntents.strings
 create mode 100644 Simplenote/Supporting Files/nl.lproj/ShortcutIntents.strings
 create mode 100644 Simplenote/Supporting Files/pt-BR.lproj/ShortcutIntents.strings
 create mode 100644 Simplenote/Supporting Files/ru.lproj/ShortcutIntents.strings
 create mode 100644 Simplenote/Supporting Files/sv.lproj/ShortcutIntents.strings
 create mode 100644 Simplenote/Supporting Files/tr.lproj/ShortcutIntents.strings
 create mode 100644 Simplenote/Supporting Files/zh-Hans-CN.lproj/ShortcutIntents.strings
 create mode 100644 Simplenote/Supporting Files/zh-Hant-TW.lproj/ShortcutIntents.strings

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index f2727bbe1..4bba92619 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -438,8 +438,6 @@
 		BA12B07026B0D0150026F31D /* SPManagedObject+Widget.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA12B06C26B0D0150026F31D /* SPManagedObject+Widget.swift */; };
 		BA18532826488DBC00D9A347 /* SignupRemoteTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA18532726488DBC00D9A347 /* SignupRemoteTests.swift */; };
 		BA2015BB2B57384F005E59AA /* AutomatticTracks in Frameworks */ = {isa = PBXBuildFile; productRef = BA2015BA2B57384F005E59AA /* AutomatticTracks */; };
-		BA289B582BE436EB000E6794 /* ShortcutIntents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = BA289B572BE436EB000E6794 /* ShortcutIntents.intentdefinition */; };
-		BA289B592BE436EB000E6794 /* ShortcutIntents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = BA289B572BE436EB000E6794 /* ShortcutIntents.intentdefinition */; };
 		BA289B5C2BE4371A000E6794 /* ListWidgetIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA289B5A2BE4371A000E6794 /* ListWidgetIntentHandler.swift */; };
 		BA289B5F2BE43728000E6794 /* NoteWidgetIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA289B5D2BE43728000E6794 /* NoteWidgetIntentHandler.swift */; };
 		BA289B602BE43816000E6794 /* NoteWidgetIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA289B5D2BE43728000E6794 /* NoteWidgetIntentHandler.swift */; };
@@ -514,6 +512,8 @@
 		BA9C7EC92BED7AB1007A8460 /* CopyNoteContentIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9C7EC82BED7AB1007A8460 /* CopyNoteContentIntentHandler.swift */; };
 		BA9C7ECB2BED7F7B007A8460 /* FindNoteWithTagIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9C7ECA2BED7F7B007A8460 /* FindNoteWithTagIntentHandler.swift */; };
 		BA9C7ECD2BED813B007A8460 /* IntentTag+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9C7ECC2BED813B007A8460 /* IntentTag+Helpers.swift */; };
+		BA9C7ED02BEE9BA7007A8460 /* ShortcutIntents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = BA9C7ECF2BEE9BA7007A8460 /* ShortcutIntents.intentdefinition */; };
+		BA9C7ED12BEE9BA7007A8460 /* ShortcutIntents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = BA9C7ECF2BEE9BA7007A8460 /* ShortcutIntents.intentdefinition */; };
 		BAA4856925D5E40900F3BDB9 /* SearchQuery+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAA4856825D5E40900F3BDB9 /* SearchQuery+Simplenote.swift */; };
 		BAA59E79269F9FE30068BD3D /* Date+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAA59E78269F9FE30068BD3D /* Date+Simplenote.swift */; };
 		BAA63C3325EEDA83001589D7 /* NoteLinkTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAA63C3225EEDA83001589D7 /* NoteLinkTests.swift */; };
@@ -1148,7 +1148,6 @@
 		BA12B06C26B0D0150026F31D /* SPManagedObject+Widget.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "SPManagedObject+Widget.swift"; sourceTree = "<group>"; };
 		BA16C6A82BC4968400C9079F /* Simplenote 7.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Simplenote 7.xcdatamodel"; sourceTree = "<group>"; };
 		BA18532726488DBC00D9A347 /* SignupRemoteTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignupRemoteTests.swift; sourceTree = "<group>"; };
-		BA289B572BE436EB000E6794 /* ShortcutIntents.intentdefinition */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; path = ShortcutIntents.intentdefinition; sourceTree = "<group>"; };
 		BA289B5A2BE4371A000E6794 /* ListWidgetIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListWidgetIntentHandler.swift; sourceTree = "<group>"; };
 		BA289B5D2BE43728000E6794 /* NoteWidgetIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteWidgetIntentHandler.swift; sourceTree = "<group>"; };
 		BA289B632BE43963000E6794 /* OpenNewNoteIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenNewNoteIntentHandler.swift; sourceTree = "<group>"; };
@@ -1202,6 +1201,27 @@
 		BA9C7EC82BED7AB1007A8460 /* CopyNoteContentIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CopyNoteContentIntentHandler.swift; sourceTree = "<group>"; };
 		BA9C7ECA2BED7F7B007A8460 /* FindNoteWithTagIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FindNoteWithTagIntentHandler.swift; sourceTree = "<group>"; };
 		BA9C7ECC2BED813B007A8460 /* IntentTag+Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "IntentTag+Helpers.swift"; sourceTree = "<group>"; };
+		BA9C7ECE2BEE9BA7007A8460 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; name = Base; path = Base.lproj/ShortcutIntents.intentdefinition; sourceTree = "<group>"; };
+		BA9C7ED32BEE9BF3007A8460 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/ShortcutIntents.strings; sourceTree = "<group>"; };
+		BA9C7ED52BEE9BF8007A8460 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/ShortcutIntents.strings; sourceTree = "<group>"; };
+		BA9C7ED72BEE9BFC007A8460 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/ShortcutIntents.strings; sourceTree = "<group>"; };
+		BA9C7ED92BEE9BFE007A8460 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/ShortcutIntents.strings; sourceTree = "<group>"; };
+		BA9C7EDB2BEE9C00007A8460 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/ShortcutIntents.strings; sourceTree = "<group>"; };
+		BA9C7EDD2BEE9C04007A8460 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/ShortcutIntents.strings; sourceTree = "<group>"; };
+		BA9C7EDF2BEE9C07007A8460 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/ShortcutIntents.strings; sourceTree = "<group>"; };
+		BA9C7EE12BEE9C0C007A8460 /* id */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = id; path = id.lproj/ShortcutIntents.strings; sourceTree = "<group>"; };
+		BA9C7EE32BEE9C0F007A8460 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/ShortcutIntents.strings; sourceTree = "<group>"; };
+		BA9C7EE52BEE9C11007A8460 /* cy */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cy; path = cy.lproj/ShortcutIntents.strings; sourceTree = "<group>"; };
+		BA9C7EE72BEE9C13007A8460 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/ShortcutIntents.strings; sourceTree = "<group>"; };
+		BA9C7EE92BEE9C19007A8460 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/ShortcutIntents.strings"; sourceTree = "<group>"; };
+		BA9C7EEB2BEE9C22007A8460 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/ShortcutIntents.strings; sourceTree = "<group>"; };
+		BA9C7EED2BEE9C24007A8460 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/ShortcutIntents.strings; sourceTree = "<group>"; };
+		BA9C7EEF2BEE9C38007A8460 /* fa */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fa; path = fa.lproj/ShortcutIntents.strings; sourceTree = "<group>"; };
+		BA9C7EF12BEE9C3A007A8460 /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/ShortcutIntents.strings; sourceTree = "<group>"; };
+		BA9C7EF32BEE9C3C007A8460 /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/ShortcutIntents.strings; sourceTree = "<group>"; };
+		BA9C7EF52BEE9C3D007A8460 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/ShortcutIntents.strings; sourceTree = "<group>"; };
+		BA9C7EF72BEE9C3E007A8460 /* zh-Hant-TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant-TW"; path = "zh-Hant-TW.lproj/ShortcutIntents.strings"; sourceTree = "<group>"; };
+		BA9C7EF92BEE9C3F007A8460 /* zh-Hans-CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans-CN"; path = "zh-Hans-CN.lproj/ShortcutIntents.strings"; sourceTree = "<group>"; };
 		BAA4856825D5E40900F3BDB9 /* SearchQuery+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SearchQuery+Simplenote.swift"; sourceTree = "<group>"; };
 		BAA59E78269F9FE30068BD3D /* Date+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Date+Simplenote.swift"; sourceTree = "<group>"; };
 		BAA63C3225EEDA83001589D7 /* NoteLinkTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteLinkTests.swift; sourceTree = "<group>"; };
@@ -2684,7 +2704,7 @@
 				B5250A6B22B922F900AE7797 /* Simplenote-Internal.entitlements */,
 				E29ADD4717848E8500E55842 /* main.m */,
 				E29ADD4917848E8500E55842 /* Simplenote-Prefix.pch */,
-				BA289B572BE436EB000E6794 /* ShortcutIntents.intentdefinition */,
+				BA9C7ECF2BEE9BA7007A8460 /* ShortcutIntents.intentdefinition */,
 			);
 			path = "Supporting Files";
 			sourceTree = "<group>";
@@ -3439,7 +3459,7 @@
 				B52BB74E22CFD1660042C162 /* SimplenoteActivityItemSource.swift in Sources */,
 				B537730F252E14C600BC78C5 /* OptionsViewController.swift in Sources */,
 				B56A696722F9D55F00B90398 /* UIView+Animations.swift in Sources */,
-				BA289B582BE436EB000E6794 /* ShortcutIntents.intentdefinition in Sources */,
+				BA9C7ED02BEE9BA7007A8460 /* ShortcutIntents.intentdefinition in Sources */,
 				BA3856CD2681715700F388CC /* CoreDataManager.swift in Sources */,
 				A60DF30825A44F0F00FDADF3 /* PinLockRemoveController.swift in Sources */,
 				A694ABAB25D1549D00CC3A2D /* FileStorage.swift in Sources */,
@@ -3804,7 +3824,7 @@
 				BAB5762726703C8200B0C56F /* IntentHandler.swift in Sources */,
 				BA9C7EC92BED7AB1007A8460 /* CopyNoteContentIntentHandler.swift in Sources */,
 				BA289B652BE43963000E6794 /* OpenNewNoteIntentHandler.swift in Sources */,
-				BA289B592BE436EB000E6794 /* ShortcutIntents.intentdefinition in Sources */,
+				BA9C7ED12BEE9BA7007A8460 /* ShortcutIntents.intentdefinition in Sources */,
 				BA0AF10D2BE996600050EEBD /* KeychainManager.swift in Sources */,
 				BA86625D26B3B14900466746 /* SortMode.swift in Sources */,
 				BAB898D32BEC404200E238B8 /* CreateNewNoteIntentHandler.swift in Sources */,
@@ -4001,6 +4021,34 @@
 			name = MainInterface.storyboard;
 			sourceTree = "<group>";
 		};
+		BA9C7ECF2BEE9BA7007A8460 /* ShortcutIntents.intentdefinition */ = {
+			isa = PBXVariantGroup;
+			children = (
+				BA9C7ECE2BEE9BA7007A8460 /* Base */,
+				BA9C7ED32BEE9BF3007A8460 /* en */,
+				BA9C7ED52BEE9BF8007A8460 /* sv */,
+				BA9C7ED72BEE9BFC007A8460 /* ja */,
+				BA9C7ED92BEE9BFE007A8460 /* it */,
+				BA9C7EDB2BEE9C00007A8460 /* ko */,
+				BA9C7EDD2BEE9C04007A8460 /* fr */,
+				BA9C7EDF2BEE9C07007A8460 /* es */,
+				BA9C7EE12BEE9C0C007A8460 /* id */,
+				BA9C7EE32BEE9C0F007A8460 /* ru */,
+				BA9C7EE52BEE9C11007A8460 /* cy */,
+				BA9C7EE72BEE9C13007A8460 /* de */,
+				BA9C7EE92BEE9C19007A8460 /* pt-BR */,
+				BA9C7EEB2BEE9C22007A8460 /* tr */,
+				BA9C7EED2BEE9C24007A8460 /* ar */,
+				BA9C7EEF2BEE9C38007A8460 /* fa */,
+				BA9C7EF12BEE9C3A007A8460 /* he */,
+				BA9C7EF32BEE9C3C007A8460 /* el */,
+				BA9C7EF52BEE9C3D007A8460 /* nl */,
+				BA9C7EF72BEE9C3E007A8460 /* zh-Hant-TW */,
+				BA9C7EF92BEE9C3F007A8460 /* zh-Hans-CN */,
+			);
+			name = ShortcutIntents.intentdefinition;
+			sourceTree = "<group>";
+		};
 		E280453E180DAE0200670073 /* Localizable.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
diff --git a/Simplenote/Supporting Files/ShortcutIntents.intentdefinition b/Simplenote/Supporting Files/Base.lproj/ShortcutIntents.intentdefinition
similarity index 100%
rename from Simplenote/Supporting Files/ShortcutIntents.intentdefinition
rename to Simplenote/Supporting Files/Base.lproj/ShortcutIntents.intentdefinition
diff --git a/Simplenote/Supporting Files/ar.lproj/ShortcutIntents.strings b/Simplenote/Supporting Files/ar.lproj/ShortcutIntents.strings
new file mode 100644
index 000000000..099146dce
--- /dev/null
+++ b/Simplenote/Supporting Files/ar.lproj/ShortcutIntents.strings	
@@ -0,0 +1,86 @@
+"4OEbmY" = "note";
+
+"Ag8ugh" = "Create New Note With Content";
+
+"CNjhWs" = "Create new note with ${content}";
+
+"CUkV8q" = "Note";
+
+"EeqvcH" = "Append content to an existing note in Simplenote";
+
+"I19gXv" = "Note";
+
+"IIfrvb" = "Intent Tag";
+
+"IQnYW1" = "Open Note";
+
+"MdiZid" = "Just to confirm, you wanted ‘${note}’?";
+
+"Mz9mrb" = "Note";
+
+"OOdDHV" = "Which Note?";
+
+"OZjn1w" = "Open a new note in Simplenote";
+
+"PaQ5Kk" = "Note";
+
+"U4ce2H" = "There are ${count} options matching ‘${tag}’.";
+
+"U9Yl4n" = "Content";
+
+"V4ssp4" = "Search the content of your notes to find a note to use in shortcuts";
+
+"VBtgac" = "There are ${count} options matching ‘${note}’.";
+
+"VDjU7n" = "Find a note with ${content}";
+
+"VGM0yX" = "Content";
+
+"WsSu5K" = "Open New Note";
+
+"YxSeRd" = "Find a note with ${tag}";
+
+"bjR9IG" = "Open ${note} in Simplenote";
+
+"cH6X2m" = "Note";
+
+"cqm5AM" = "Content";
+
+"d6MjpX" = "Append To Note";
+
+"fgSbr5" = "Open Simplenote and create a new note";
+
+"hDNku0" = "${note}";
+
+"lSBG7V" = "Append ${content}to ${note}";
+
+"lXNZsS" = "Copy content from ${note}";
+
+"m6yrkX" = "What would you like to append to ${note}";
+
+"nF2vZQ" = "Find Note With Tag";
+
+"oawbyy" = "Find Note With Content";
+
+"pFkRQX" = "Note";
+
+"qYKqOP" = "Just to confirm, you wanted ‘${tag}’?";
+
+"raYk2S" = "Note Content";
+
+"s11KbQ" = "Copy Note Content";
+
+"s9MSi2" = "Tag";
+
+"sOjweW" = "Which One?";
+
+"sXkMgW" = "Creates a note with supplied content and save it in Simplenote";
+
+"sqM3pN" = "Open Note in Simplenote";
+
+"uDDlMr" = "Which One?";
+
+"wLeRnn" = "Note";
+
+"yuIu0n" = "Which One?";
+
diff --git a/Simplenote/Supporting Files/cy.lproj/ShortcutIntents.strings b/Simplenote/Supporting Files/cy.lproj/ShortcutIntents.strings
new file mode 100644
index 000000000..099146dce
--- /dev/null
+++ b/Simplenote/Supporting Files/cy.lproj/ShortcutIntents.strings	
@@ -0,0 +1,86 @@
+"4OEbmY" = "note";
+
+"Ag8ugh" = "Create New Note With Content";
+
+"CNjhWs" = "Create new note with ${content}";
+
+"CUkV8q" = "Note";
+
+"EeqvcH" = "Append content to an existing note in Simplenote";
+
+"I19gXv" = "Note";
+
+"IIfrvb" = "Intent Tag";
+
+"IQnYW1" = "Open Note";
+
+"MdiZid" = "Just to confirm, you wanted ‘${note}’?";
+
+"Mz9mrb" = "Note";
+
+"OOdDHV" = "Which Note?";
+
+"OZjn1w" = "Open a new note in Simplenote";
+
+"PaQ5Kk" = "Note";
+
+"U4ce2H" = "There are ${count} options matching ‘${tag}’.";
+
+"U9Yl4n" = "Content";
+
+"V4ssp4" = "Search the content of your notes to find a note to use in shortcuts";
+
+"VBtgac" = "There are ${count} options matching ‘${note}’.";
+
+"VDjU7n" = "Find a note with ${content}";
+
+"VGM0yX" = "Content";
+
+"WsSu5K" = "Open New Note";
+
+"YxSeRd" = "Find a note with ${tag}";
+
+"bjR9IG" = "Open ${note} in Simplenote";
+
+"cH6X2m" = "Note";
+
+"cqm5AM" = "Content";
+
+"d6MjpX" = "Append To Note";
+
+"fgSbr5" = "Open Simplenote and create a new note";
+
+"hDNku0" = "${note}";
+
+"lSBG7V" = "Append ${content}to ${note}";
+
+"lXNZsS" = "Copy content from ${note}";
+
+"m6yrkX" = "What would you like to append to ${note}";
+
+"nF2vZQ" = "Find Note With Tag";
+
+"oawbyy" = "Find Note With Content";
+
+"pFkRQX" = "Note";
+
+"qYKqOP" = "Just to confirm, you wanted ‘${tag}’?";
+
+"raYk2S" = "Note Content";
+
+"s11KbQ" = "Copy Note Content";
+
+"s9MSi2" = "Tag";
+
+"sOjweW" = "Which One?";
+
+"sXkMgW" = "Creates a note with supplied content and save it in Simplenote";
+
+"sqM3pN" = "Open Note in Simplenote";
+
+"uDDlMr" = "Which One?";
+
+"wLeRnn" = "Note";
+
+"yuIu0n" = "Which One?";
+
diff --git a/Simplenote/Supporting Files/de.lproj/ShortcutIntents.strings b/Simplenote/Supporting Files/de.lproj/ShortcutIntents.strings
new file mode 100644
index 000000000..099146dce
--- /dev/null
+++ b/Simplenote/Supporting Files/de.lproj/ShortcutIntents.strings	
@@ -0,0 +1,86 @@
+"4OEbmY" = "note";
+
+"Ag8ugh" = "Create New Note With Content";
+
+"CNjhWs" = "Create new note with ${content}";
+
+"CUkV8q" = "Note";
+
+"EeqvcH" = "Append content to an existing note in Simplenote";
+
+"I19gXv" = "Note";
+
+"IIfrvb" = "Intent Tag";
+
+"IQnYW1" = "Open Note";
+
+"MdiZid" = "Just to confirm, you wanted ‘${note}’?";
+
+"Mz9mrb" = "Note";
+
+"OOdDHV" = "Which Note?";
+
+"OZjn1w" = "Open a new note in Simplenote";
+
+"PaQ5Kk" = "Note";
+
+"U4ce2H" = "There are ${count} options matching ‘${tag}’.";
+
+"U9Yl4n" = "Content";
+
+"V4ssp4" = "Search the content of your notes to find a note to use in shortcuts";
+
+"VBtgac" = "There are ${count} options matching ‘${note}’.";
+
+"VDjU7n" = "Find a note with ${content}";
+
+"VGM0yX" = "Content";
+
+"WsSu5K" = "Open New Note";
+
+"YxSeRd" = "Find a note with ${tag}";
+
+"bjR9IG" = "Open ${note} in Simplenote";
+
+"cH6X2m" = "Note";
+
+"cqm5AM" = "Content";
+
+"d6MjpX" = "Append To Note";
+
+"fgSbr5" = "Open Simplenote and create a new note";
+
+"hDNku0" = "${note}";
+
+"lSBG7V" = "Append ${content}to ${note}";
+
+"lXNZsS" = "Copy content from ${note}";
+
+"m6yrkX" = "What would you like to append to ${note}";
+
+"nF2vZQ" = "Find Note With Tag";
+
+"oawbyy" = "Find Note With Content";
+
+"pFkRQX" = "Note";
+
+"qYKqOP" = "Just to confirm, you wanted ‘${tag}’?";
+
+"raYk2S" = "Note Content";
+
+"s11KbQ" = "Copy Note Content";
+
+"s9MSi2" = "Tag";
+
+"sOjweW" = "Which One?";
+
+"sXkMgW" = "Creates a note with supplied content and save it in Simplenote";
+
+"sqM3pN" = "Open Note in Simplenote";
+
+"uDDlMr" = "Which One?";
+
+"wLeRnn" = "Note";
+
+"yuIu0n" = "Which One?";
+
diff --git a/Simplenote/Supporting Files/el.lproj/ShortcutIntents.strings b/Simplenote/Supporting Files/el.lproj/ShortcutIntents.strings
new file mode 100644
index 000000000..099146dce
--- /dev/null
+++ b/Simplenote/Supporting Files/el.lproj/ShortcutIntents.strings	
@@ -0,0 +1,86 @@
+"4OEbmY" = "note";
+
+"Ag8ugh" = "Create New Note With Content";
+
+"CNjhWs" = "Create new note with ${content}";
+
+"CUkV8q" = "Note";
+
+"EeqvcH" = "Append content to an existing note in Simplenote";
+
+"I19gXv" = "Note";
+
+"IIfrvb" = "Intent Tag";
+
+"IQnYW1" = "Open Note";
+
+"MdiZid" = "Just to confirm, you wanted ‘${note}’?";
+
+"Mz9mrb" = "Note";
+
+"OOdDHV" = "Which Note?";
+
+"OZjn1w" = "Open a new note in Simplenote";
+
+"PaQ5Kk" = "Note";
+
+"U4ce2H" = "There are ${count} options matching ‘${tag}’.";
+
+"U9Yl4n" = "Content";
+
+"V4ssp4" = "Search the content of your notes to find a note to use in shortcuts";
+
+"VBtgac" = "There are ${count} options matching ‘${note}’.";
+
+"VDjU7n" = "Find a note with ${content}";
+
+"VGM0yX" = "Content";
+
+"WsSu5K" = "Open New Note";
+
+"YxSeRd" = "Find a note with ${tag}";
+
+"bjR9IG" = "Open ${note} in Simplenote";
+
+"cH6X2m" = "Note";
+
+"cqm5AM" = "Content";
+
+"d6MjpX" = "Append To Note";
+
+"fgSbr5" = "Open Simplenote and create a new note";
+
+"hDNku0" = "${note}";
+
+"lSBG7V" = "Append ${content}to ${note}";
+
+"lXNZsS" = "Copy content from ${note}";
+
+"m6yrkX" = "What would you like to append to ${note}";
+
+"nF2vZQ" = "Find Note With Tag";
+
+"oawbyy" = "Find Note With Content";
+
+"pFkRQX" = "Note";
+
+"qYKqOP" = "Just to confirm, you wanted ‘${tag}’?";
+
+"raYk2S" = "Note Content";
+
+"s11KbQ" = "Copy Note Content";
+
+"s9MSi2" = "Tag";
+
+"sOjweW" = "Which One?";
+
+"sXkMgW" = "Creates a note with supplied content and save it in Simplenote";
+
+"sqM3pN" = "Open Note in Simplenote";
+
+"uDDlMr" = "Which One?";
+
+"wLeRnn" = "Note";
+
+"yuIu0n" = "Which One?";
+
diff --git a/Simplenote/Supporting Files/en.lproj/ShortcutIntents.strings b/Simplenote/Supporting Files/en.lproj/ShortcutIntents.strings
new file mode 100644
index 000000000..099146dce
--- /dev/null
+++ b/Simplenote/Supporting Files/en.lproj/ShortcutIntents.strings	
@@ -0,0 +1,86 @@
+"4OEbmY" = "note";
+
+"Ag8ugh" = "Create New Note With Content";
+
+"CNjhWs" = "Create new note with ${content}";
+
+"CUkV8q" = "Note";
+
+"EeqvcH" = "Append content to an existing note in Simplenote";
+
+"I19gXv" = "Note";
+
+"IIfrvb" = "Intent Tag";
+
+"IQnYW1" = "Open Note";
+
+"MdiZid" = "Just to confirm, you wanted ‘${note}’?";
+
+"Mz9mrb" = "Note";
+
+"OOdDHV" = "Which Note?";
+
+"OZjn1w" = "Open a new note in Simplenote";
+
+"PaQ5Kk" = "Note";
+
+"U4ce2H" = "There are ${count} options matching ‘${tag}’.";
+
+"U9Yl4n" = "Content";
+
+"V4ssp4" = "Search the content of your notes to find a note to use in shortcuts";
+
+"VBtgac" = "There are ${count} options matching ‘${note}’.";
+
+"VDjU7n" = "Find a note with ${content}";
+
+"VGM0yX" = "Content";
+
+"WsSu5K" = "Open New Note";
+
+"YxSeRd" = "Find a note with ${tag}";
+
+"bjR9IG" = "Open ${note} in Simplenote";
+
+"cH6X2m" = "Note";
+
+"cqm5AM" = "Content";
+
+"d6MjpX" = "Append To Note";
+
+"fgSbr5" = "Open Simplenote and create a new note";
+
+"hDNku0" = "${note}";
+
+"lSBG7V" = "Append ${content}to ${note}";
+
+"lXNZsS" = "Copy content from ${note}";
+
+"m6yrkX" = "What would you like to append to ${note}";
+
+"nF2vZQ" = "Find Note With Tag";
+
+"oawbyy" = "Find Note With Content";
+
+"pFkRQX" = "Note";
+
+"qYKqOP" = "Just to confirm, you wanted ‘${tag}’?";
+
+"raYk2S" = "Note Content";
+
+"s11KbQ" = "Copy Note Content";
+
+"s9MSi2" = "Tag";
+
+"sOjweW" = "Which One?";
+
+"sXkMgW" = "Creates a note with supplied content and save it in Simplenote";
+
+"sqM3pN" = "Open Note in Simplenote";
+
+"uDDlMr" = "Which One?";
+
+"wLeRnn" = "Note";
+
+"yuIu0n" = "Which One?";
+
diff --git a/Simplenote/Supporting Files/es.lproj/ShortcutIntents.strings b/Simplenote/Supporting Files/es.lproj/ShortcutIntents.strings
new file mode 100644
index 000000000..099146dce
--- /dev/null
+++ b/Simplenote/Supporting Files/es.lproj/ShortcutIntents.strings	
@@ -0,0 +1,86 @@
+"4OEbmY" = "note";
+
+"Ag8ugh" = "Create New Note With Content";
+
+"CNjhWs" = "Create new note with ${content}";
+
+"CUkV8q" = "Note";
+
+"EeqvcH" = "Append content to an existing note in Simplenote";
+
+"I19gXv" = "Note";
+
+"IIfrvb" = "Intent Tag";
+
+"IQnYW1" = "Open Note";
+
+"MdiZid" = "Just to confirm, you wanted ‘${note}’?";
+
+"Mz9mrb" = "Note";
+
+"OOdDHV" = "Which Note?";
+
+"OZjn1w" = "Open a new note in Simplenote";
+
+"PaQ5Kk" = "Note";
+
+"U4ce2H" = "There are ${count} options matching ‘${tag}’.";
+
+"U9Yl4n" = "Content";
+
+"V4ssp4" = "Search the content of your notes to find a note to use in shortcuts";
+
+"VBtgac" = "There are ${count} options matching ‘${note}’.";
+
+"VDjU7n" = "Find a note with ${content}";
+
+"VGM0yX" = "Content";
+
+"WsSu5K" = "Open New Note";
+
+"YxSeRd" = "Find a note with ${tag}";
+
+"bjR9IG" = "Open ${note} in Simplenote";
+
+"cH6X2m" = "Note";
+
+"cqm5AM" = "Content";
+
+"d6MjpX" = "Append To Note";
+
+"fgSbr5" = "Open Simplenote and create a new note";
+
+"hDNku0" = "${note}";
+
+"lSBG7V" = "Append ${content}to ${note}";
+
+"lXNZsS" = "Copy content from ${note}";
+
+"m6yrkX" = "What would you like to append to ${note}";
+
+"nF2vZQ" = "Find Note With Tag";
+
+"oawbyy" = "Find Note With Content";
+
+"pFkRQX" = "Note";
+
+"qYKqOP" = "Just to confirm, you wanted ‘${tag}’?";
+
+"raYk2S" = "Note Content";
+
+"s11KbQ" = "Copy Note Content";
+
+"s9MSi2" = "Tag";
+
+"sOjweW" = "Which One?";
+
+"sXkMgW" = "Creates a note with supplied content and save it in Simplenote";
+
+"sqM3pN" = "Open Note in Simplenote";
+
+"uDDlMr" = "Which One?";
+
+"wLeRnn" = "Note";
+
+"yuIu0n" = "Which One?";
+
diff --git a/Simplenote/Supporting Files/fa.lproj/ShortcutIntents.strings b/Simplenote/Supporting Files/fa.lproj/ShortcutIntents.strings
new file mode 100644
index 000000000..099146dce
--- /dev/null
+++ b/Simplenote/Supporting Files/fa.lproj/ShortcutIntents.strings	
@@ -0,0 +1,86 @@
+"4OEbmY" = "note";
+
+"Ag8ugh" = "Create New Note With Content";
+
+"CNjhWs" = "Create new note with ${content}";
+
+"CUkV8q" = "Note";
+
+"EeqvcH" = "Append content to an existing note in Simplenote";
+
+"I19gXv" = "Note";
+
+"IIfrvb" = "Intent Tag";
+
+"IQnYW1" = "Open Note";
+
+"MdiZid" = "Just to confirm, you wanted ‘${note}’?";
+
+"Mz9mrb" = "Note";
+
+"OOdDHV" = "Which Note?";
+
+"OZjn1w" = "Open a new note in Simplenote";
+
+"PaQ5Kk" = "Note";
+
+"U4ce2H" = "There are ${count} options matching ‘${tag}’.";
+
+"U9Yl4n" = "Content";
+
+"V4ssp4" = "Search the content of your notes to find a note to use in shortcuts";
+
+"VBtgac" = "There are ${count} options matching ‘${note}’.";
+
+"VDjU7n" = "Find a note with ${content}";
+
+"VGM0yX" = "Content";
+
+"WsSu5K" = "Open New Note";
+
+"YxSeRd" = "Find a note with ${tag}";
+
+"bjR9IG" = "Open ${note} in Simplenote";
+
+"cH6X2m" = "Note";
+
+"cqm5AM" = "Content";
+
+"d6MjpX" = "Append To Note";
+
+"fgSbr5" = "Open Simplenote and create a new note";
+
+"hDNku0" = "${note}";
+
+"lSBG7V" = "Append ${content}to ${note}";
+
+"lXNZsS" = "Copy content from ${note}";
+
+"m6yrkX" = "What would you like to append to ${note}";
+
+"nF2vZQ" = "Find Note With Tag";
+
+"oawbyy" = "Find Note With Content";
+
+"pFkRQX" = "Note";
+
+"qYKqOP" = "Just to confirm, you wanted ‘${tag}’?";
+
+"raYk2S" = "Note Content";
+
+"s11KbQ" = "Copy Note Content";
+
+"s9MSi2" = "Tag";
+
+"sOjweW" = "Which One?";
+
+"sXkMgW" = "Creates a note with supplied content and save it in Simplenote";
+
+"sqM3pN" = "Open Note in Simplenote";
+
+"uDDlMr" = "Which One?";
+
+"wLeRnn" = "Note";
+
+"yuIu0n" = "Which One?";
+
diff --git a/Simplenote/Supporting Files/fr.lproj/ShortcutIntents.strings b/Simplenote/Supporting Files/fr.lproj/ShortcutIntents.strings
new file mode 100644
index 000000000..099146dce
--- /dev/null
+++ b/Simplenote/Supporting Files/fr.lproj/ShortcutIntents.strings	
@@ -0,0 +1,86 @@
+"4OEbmY" = "note";
+
+"Ag8ugh" = "Create New Note With Content";
+
+"CNjhWs" = "Create new note with ${content}";
+
+"CUkV8q" = "Note";
+
+"EeqvcH" = "Append content to an existing note in Simplenote";
+
+"I19gXv" = "Note";
+
+"IIfrvb" = "Intent Tag";
+
+"IQnYW1" = "Open Note";
+
+"MdiZid" = "Just to confirm, you wanted ‘${note}’?";
+
+"Mz9mrb" = "Note";
+
+"OOdDHV" = "Which Note?";
+
+"OZjn1w" = "Open a new note in Simplenote";
+
+"PaQ5Kk" = "Note";
+
+"U4ce2H" = "There are ${count} options matching ‘${tag}’.";
+
+"U9Yl4n" = "Content";
+
+"V4ssp4" = "Search the content of your notes to find a note to use in shortcuts";
+
+"VBtgac" = "There are ${count} options matching ‘${note}’.";
+
+"VDjU7n" = "Find a note with ${content}";
+
+"VGM0yX" = "Content";
+
+"WsSu5K" = "Open New Note";
+
+"YxSeRd" = "Find a note with ${tag}";
+
+"bjR9IG" = "Open ${note} in Simplenote";
+
+"cH6X2m" = "Note";
+
+"cqm5AM" = "Content";
+
+"d6MjpX" = "Append To Note";
+
+"fgSbr5" = "Open Simplenote and create a new note";
+
+"hDNku0" = "${note}";
+
+"lSBG7V" = "Append ${content}to ${note}";
+
+"lXNZsS" = "Copy content from ${note}";
+
+"m6yrkX" = "What would you like to append to ${note}";
+
+"nF2vZQ" = "Find Note With Tag";
+
+"oawbyy" = "Find Note With Content";
+
+"pFkRQX" = "Note";
+
+"qYKqOP" = "Just to confirm, you wanted ‘${tag}’?";
+
+"raYk2S" = "Note Content";
+
+"s11KbQ" = "Copy Note Content";
+
+"s9MSi2" = "Tag";
+
+"sOjweW" = "Which One?";
+
+"sXkMgW" = "Creates a note with supplied content and save it in Simplenote";
+
+"sqM3pN" = "Open Note in Simplenote";
+
+"uDDlMr" = "Which One?";
+
+"wLeRnn" = "Note";
+
+"yuIu0n" = "Which One?";
+
diff --git a/Simplenote/Supporting Files/he.lproj/ShortcutIntents.strings b/Simplenote/Supporting Files/he.lproj/ShortcutIntents.strings
new file mode 100644
index 000000000..099146dce
--- /dev/null
+++ b/Simplenote/Supporting Files/he.lproj/ShortcutIntents.strings	
@@ -0,0 +1,86 @@
+"4OEbmY" = "note";
+
+"Ag8ugh" = "Create New Note With Content";
+
+"CNjhWs" = "Create new note with ${content}";
+
+"CUkV8q" = "Note";
+
+"EeqvcH" = "Append content to an existing note in Simplenote";
+
+"I19gXv" = "Note";
+
+"IIfrvb" = "Intent Tag";
+
+"IQnYW1" = "Open Note";
+
+"MdiZid" = "Just to confirm, you wanted ‘${note}’?";
+
+"Mz9mrb" = "Note";
+
+"OOdDHV" = "Which Note?";
+
+"OZjn1w" = "Open a new note in Simplenote";
+
+"PaQ5Kk" = "Note";
+
+"U4ce2H" = "There are ${count} options matching ‘${tag}’.";
+
+"U9Yl4n" = "Content";
+
+"V4ssp4" = "Search the content of your notes to find a note to use in shortcuts";
+
+"VBtgac" = "There are ${count} options matching ‘${note}’.";
+
+"VDjU7n" = "Find a note with ${content}";
+
+"VGM0yX" = "Content";
+
+"WsSu5K" = "Open New Note";
+
+"YxSeRd" = "Find a note with ${tag}";
+
+"bjR9IG" = "Open ${note} in Simplenote";
+
+"cH6X2m" = "Note";
+
+"cqm5AM" = "Content";
+
+"d6MjpX" = "Append To Note";
+
+"fgSbr5" = "Open Simplenote and create a new note";
+
+"hDNku0" = "${note}";
+
+"lSBG7V" = "Append ${content}to ${note}";
+
+"lXNZsS" = "Copy content from ${note}";
+
+"m6yrkX" = "What would you like to append to ${note}";
+
+"nF2vZQ" = "Find Note With Tag";
+
+"oawbyy" = "Find Note With Content";
+
+"pFkRQX" = "Note";
+
+"qYKqOP" = "Just to confirm, you wanted ‘${tag}’?";
+
+"raYk2S" = "Note Content";
+
+"s11KbQ" = "Copy Note Content";
+
+"s9MSi2" = "Tag";
+
+"sOjweW" = "Which One?";
+
+"sXkMgW" = "Creates a note with supplied content and save it in Simplenote";
+
+"sqM3pN" = "Open Note in Simplenote";
+
+"uDDlMr" = "Which One?";
+
+"wLeRnn" = "Note";
+
+"yuIu0n" = "Which One?";
+
diff --git a/Simplenote/Supporting Files/id.lproj/ShortcutIntents.strings b/Simplenote/Supporting Files/id.lproj/ShortcutIntents.strings
new file mode 100644
index 000000000..099146dce
--- /dev/null
+++ b/Simplenote/Supporting Files/id.lproj/ShortcutIntents.strings	
@@ -0,0 +1,86 @@
+"4OEbmY" = "note";
+
+"Ag8ugh" = "Create New Note With Content";
+
+"CNjhWs" = "Create new note with ${content}";
+
+"CUkV8q" = "Note";
+
+"EeqvcH" = "Append content to an existing note in Simplenote";
+
+"I19gXv" = "Note";
+
+"IIfrvb" = "Intent Tag";
+
+"IQnYW1" = "Open Note";
+
+"MdiZid" = "Just to confirm, you wanted ‘${note}’?";
+
+"Mz9mrb" = "Note";
+
+"OOdDHV" = "Which Note?";
+
+"OZjn1w" = "Open a new note in Simplenote";
+
+"PaQ5Kk" = "Note";
+
+"U4ce2H" = "There are ${count} options matching ‘${tag}’.";
+
+"U9Yl4n" = "Content";
+
+"V4ssp4" = "Search the content of your notes to find a note to use in shortcuts";
+
+"VBtgac" = "There are ${count} options matching ‘${note}’.";
+
+"VDjU7n" = "Find a note with ${content}";
+
+"VGM0yX" = "Content";
+
+"WsSu5K" = "Open New Note";
+
+"YxSeRd" = "Find a note with ${tag}";
+
+"bjR9IG" = "Open ${note} in Simplenote";
+
+"cH6X2m" = "Note";
+
+"cqm5AM" = "Content";
+
+"d6MjpX" = "Append To Note";
+
+"fgSbr5" = "Open Simplenote and create a new note";
+
+"hDNku0" = "${note}";
+
+"lSBG7V" = "Append ${content}to ${note}";
+
+"lXNZsS" = "Copy content from ${note}";
+
+"m6yrkX" = "What would you like to append to ${note}";
+
+"nF2vZQ" = "Find Note With Tag";
+
+"oawbyy" = "Find Note With Content";
+
+"pFkRQX" = "Note";
+
+"qYKqOP" = "Just to confirm, you wanted ‘${tag}’?";
+
+"raYk2S" = "Note Content";
+
+"s11KbQ" = "Copy Note Content";
+
+"s9MSi2" = "Tag";
+
+"sOjweW" = "Which One?";
+
+"sXkMgW" = "Creates a note with supplied content and save it in Simplenote";
+
+"sqM3pN" = "Open Note in Simplenote";
+
+"uDDlMr" = "Which One?";
+
+"wLeRnn" = "Note";
+
+"yuIu0n" = "Which One?";
+
diff --git a/Simplenote/Supporting Files/it.lproj/ShortcutIntents.strings b/Simplenote/Supporting Files/it.lproj/ShortcutIntents.strings
new file mode 100644
index 000000000..099146dce
--- /dev/null
+++ b/Simplenote/Supporting Files/it.lproj/ShortcutIntents.strings	
@@ -0,0 +1,86 @@
+"4OEbmY" = "note";
+
+"Ag8ugh" = "Create New Note With Content";
+
+"CNjhWs" = "Create new note with ${content}";
+
+"CUkV8q" = "Note";
+
+"EeqvcH" = "Append content to an existing note in Simplenote";
+
+"I19gXv" = "Note";
+
+"IIfrvb" = "Intent Tag";
+
+"IQnYW1" = "Open Note";
+
+"MdiZid" = "Just to confirm, you wanted ‘${note}’?";
+
+"Mz9mrb" = "Note";
+
+"OOdDHV" = "Which Note?";
+
+"OZjn1w" = "Open a new note in Simplenote";
+
+"PaQ5Kk" = "Note";
+
+"U4ce2H" = "There are ${count} options matching ‘${tag}’.";
+
+"U9Yl4n" = "Content";
+
+"V4ssp4" = "Search the content of your notes to find a note to use in shortcuts";
+
+"VBtgac" = "There are ${count} options matching ‘${note}’.";
+
+"VDjU7n" = "Find a note with ${content}";
+
+"VGM0yX" = "Content";
+
+"WsSu5K" = "Open New Note";
+
+"YxSeRd" = "Find a note with ${tag}";
+
+"bjR9IG" = "Open ${note} in Simplenote";
+
+"cH6X2m" = "Note";
+
+"cqm5AM" = "Content";
+
+"d6MjpX" = "Append To Note";
+
+"fgSbr5" = "Open Simplenote and create a new note";
+
+"hDNku0" = "${note}";
+
+"lSBG7V" = "Append ${content}to ${note}";
+
+"lXNZsS" = "Copy content from ${note}";
+
+"m6yrkX" = "What would you like to append to ${note}";
+
+"nF2vZQ" = "Find Note With Tag";
+
+"oawbyy" = "Find Note With Content";
+
+"pFkRQX" = "Note";
+
+"qYKqOP" = "Just to confirm, you wanted ‘${tag}’?";
+
+"raYk2S" = "Note Content";
+
+"s11KbQ" = "Copy Note Content";
+
+"s9MSi2" = "Tag";
+
+"sOjweW" = "Which One?";
+
+"sXkMgW" = "Creates a note with supplied content and save it in Simplenote";
+
+"sqM3pN" = "Open Note in Simplenote";
+
+"uDDlMr" = "Which One?";
+
+"wLeRnn" = "Note";
+
+"yuIu0n" = "Which One?";
+
diff --git a/Simplenote/Supporting Files/ja.lproj/ShortcutIntents.strings b/Simplenote/Supporting Files/ja.lproj/ShortcutIntents.strings
new file mode 100644
index 000000000..099146dce
--- /dev/null
+++ b/Simplenote/Supporting Files/ja.lproj/ShortcutIntents.strings	
@@ -0,0 +1,86 @@
+"4OEbmY" = "note";
+
+"Ag8ugh" = "Create New Note With Content";
+
+"CNjhWs" = "Create new note with ${content}";
+
+"CUkV8q" = "Note";
+
+"EeqvcH" = "Append content to an existing note in Simplenote";
+
+"I19gXv" = "Note";
+
+"IIfrvb" = "Intent Tag";
+
+"IQnYW1" = "Open Note";
+
+"MdiZid" = "Just to confirm, you wanted ‘${note}’?";
+
+"Mz9mrb" = "Note";
+
+"OOdDHV" = "Which Note?";
+
+"OZjn1w" = "Open a new note in Simplenote";
+
+"PaQ5Kk" = "Note";
+
+"U4ce2H" = "There are ${count} options matching ‘${tag}’.";
+
+"U9Yl4n" = "Content";
+
+"V4ssp4" = "Search the content of your notes to find a note to use in shortcuts";
+
+"VBtgac" = "There are ${count} options matching ‘${note}’.";
+
+"VDjU7n" = "Find a note with ${content}";
+
+"VGM0yX" = "Content";
+
+"WsSu5K" = "Open New Note";
+
+"YxSeRd" = "Find a note with ${tag}";
+
+"bjR9IG" = "Open ${note} in Simplenote";
+
+"cH6X2m" = "Note";
+
+"cqm5AM" = "Content";
+
+"d6MjpX" = "Append To Note";
+
+"fgSbr5" = "Open Simplenote and create a new note";
+
+"hDNku0" = "${note}";
+
+"lSBG7V" = "Append ${content}to ${note}";
+
+"lXNZsS" = "Copy content from ${note}";
+
+"m6yrkX" = "What would you like to append to ${note}";
+
+"nF2vZQ" = "Find Note With Tag";
+
+"oawbyy" = "Find Note With Content";
+
+"pFkRQX" = "Note";
+
+"qYKqOP" = "Just to confirm, you wanted ‘${tag}’?";
+
+"raYk2S" = "Note Content";
+
+"s11KbQ" = "Copy Note Content";
+
+"s9MSi2" = "Tag";
+
+"sOjweW" = "Which One?";
+
+"sXkMgW" = "Creates a note with supplied content and save it in Simplenote";
+
+"sqM3pN" = "Open Note in Simplenote";
+
+"uDDlMr" = "Which One?";
+
+"wLeRnn" = "Note";
+
+"yuIu0n" = "Which One?";
+
diff --git a/Simplenote/Supporting Files/ko.lproj/ShortcutIntents.strings b/Simplenote/Supporting Files/ko.lproj/ShortcutIntents.strings
new file mode 100644
index 000000000..099146dce
--- /dev/null
+++ b/Simplenote/Supporting Files/ko.lproj/ShortcutIntents.strings	
@@ -0,0 +1,86 @@
+"4OEbmY" = "note";
+
+"Ag8ugh" = "Create New Note With Content";
+
+"CNjhWs" = "Create new note with ${content}";
+
+"CUkV8q" = "Note";
+
+"EeqvcH" = "Append content to an existing note in Simplenote";
+
+"I19gXv" = "Note";
+
+"IIfrvb" = "Intent Tag";
+
+"IQnYW1" = "Open Note";
+
+"MdiZid" = "Just to confirm, you wanted ‘${note}’?";
+
+"Mz9mrb" = "Note";
+
+"OOdDHV" = "Which Note?";
+
+"OZjn1w" = "Open a new note in Simplenote";
+
+"PaQ5Kk" = "Note";
+
+"U4ce2H" = "There are ${count} options matching ‘${tag}’.";
+
+"U9Yl4n" = "Content";
+
+"V4ssp4" = "Search the content of your notes to find a note to use in shortcuts";
+
+"VBtgac" = "There are ${count} options matching ‘${note}’.";
+
+"VDjU7n" = "Find a note with ${content}";
+
+"VGM0yX" = "Content";
+
+"WsSu5K" = "Open New Note";
+
+"YxSeRd" = "Find a note with ${tag}";
+
+"bjR9IG" = "Open ${note} in Simplenote";
+
+"cH6X2m" = "Note";
+
+"cqm5AM" = "Content";
+
+"d6MjpX" = "Append To Note";
+
+"fgSbr5" = "Open Simplenote and create a new note";
+
+"hDNku0" = "${note}";
+
+"lSBG7V" = "Append ${content}to ${note}";
+
+"lXNZsS" = "Copy content from ${note}";
+
+"m6yrkX" = "What would you like to append to ${note}";
+
+"nF2vZQ" = "Find Note With Tag";
+
+"oawbyy" = "Find Note With Content";
+
+"pFkRQX" = "Note";
+
+"qYKqOP" = "Just to confirm, you wanted ‘${tag}’?";
+
+"raYk2S" = "Note Content";
+
+"s11KbQ" = "Copy Note Content";
+
+"s9MSi2" = "Tag";
+
+"sOjweW" = "Which One?";
+
+"sXkMgW" = "Creates a note with supplied content and save it in Simplenote";
+
+"sqM3pN" = "Open Note in Simplenote";
+
+"uDDlMr" = "Which One?";
+
+"wLeRnn" = "Note";
+
+"yuIu0n" = "Which One?";
+
diff --git a/Simplenote/Supporting Files/nl.lproj/ShortcutIntents.strings b/Simplenote/Supporting Files/nl.lproj/ShortcutIntents.strings
new file mode 100644
index 000000000..099146dce
--- /dev/null
+++ b/Simplenote/Supporting Files/nl.lproj/ShortcutIntents.strings	
@@ -0,0 +1,86 @@
+"4OEbmY" = "note";
+
+"Ag8ugh" = "Create New Note With Content";
+
+"CNjhWs" = "Create new note with ${content}";
+
+"CUkV8q" = "Note";
+
+"EeqvcH" = "Append content to an existing note in Simplenote";
+
+"I19gXv" = "Note";
+
+"IIfrvb" = "Intent Tag";
+
+"IQnYW1" = "Open Note";
+
+"MdiZid" = "Just to confirm, you wanted ‘${note}’?";
+
+"Mz9mrb" = "Note";
+
+"OOdDHV" = "Which Note?";
+
+"OZjn1w" = "Open a new note in Simplenote";
+
+"PaQ5Kk" = "Note";
+
+"U4ce2H" = "There are ${count} options matching ‘${tag}’.";
+
+"U9Yl4n" = "Content";
+
+"V4ssp4" = "Search the content of your notes to find a note to use in shortcuts";
+
+"VBtgac" = "There are ${count} options matching ‘${note}’.";
+
+"VDjU7n" = "Find a note with ${content}";
+
+"VGM0yX" = "Content";
+
+"WsSu5K" = "Open New Note";
+
+"YxSeRd" = "Find a note with ${tag}";
+
+"bjR9IG" = "Open ${note} in Simplenote";
+
+"cH6X2m" = "Note";
+
+"cqm5AM" = "Content";
+
+"d6MjpX" = "Append To Note";
+
+"fgSbr5" = "Open Simplenote and create a new note";
+
+"hDNku0" = "${note}";
+
+"lSBG7V" = "Append ${content}to ${note}";
+
+"lXNZsS" = "Copy content from ${note}";
+
+"m6yrkX" = "What would you like to append to ${note}";
+
+"nF2vZQ" = "Find Note With Tag";
+
+"oawbyy" = "Find Note With Content";
+
+"pFkRQX" = "Note";
+
+"qYKqOP" = "Just to confirm, you wanted ‘${tag}’?";
+
+"raYk2S" = "Note Content";
+
+"s11KbQ" = "Copy Note Content";
+
+"s9MSi2" = "Tag";
+
+"sOjweW" = "Which One?";
+
+"sXkMgW" = "Creates a note with supplied content and save it in Simplenote";
+
+"sqM3pN" = "Open Note in Simplenote";
+
+"uDDlMr" = "Which One?";
+
+"wLeRnn" = "Note";
+
+"yuIu0n" = "Which One?";
+
diff --git a/Simplenote/Supporting Files/pt-BR.lproj/ShortcutIntents.strings b/Simplenote/Supporting Files/pt-BR.lproj/ShortcutIntents.strings
new file mode 100644
index 000000000..099146dce
--- /dev/null
+++ b/Simplenote/Supporting Files/pt-BR.lproj/ShortcutIntents.strings	
@@ -0,0 +1,86 @@
+"4OEbmY" = "note";
+
+"Ag8ugh" = "Create New Note With Content";
+
+"CNjhWs" = "Create new note with ${content}";
+
+"CUkV8q" = "Note";
+
+"EeqvcH" = "Append content to an existing note in Simplenote";
+
+"I19gXv" = "Note";
+
+"IIfrvb" = "Intent Tag";
+
+"IQnYW1" = "Open Note";
+
+"MdiZid" = "Just to confirm, you wanted ‘${note}’?";
+
+"Mz9mrb" = "Note";
+
+"OOdDHV" = "Which Note?";
+
+"OZjn1w" = "Open a new note in Simplenote";
+
+"PaQ5Kk" = "Note";
+
+"U4ce2H" = "There are ${count} options matching ‘${tag}’.";
+
+"U9Yl4n" = "Content";
+
+"V4ssp4" = "Search the content of your notes to find a note to use in shortcuts";
+
+"VBtgac" = "There are ${count} options matching ‘${note}’.";
+
+"VDjU7n" = "Find a note with ${content}";
+
+"VGM0yX" = "Content";
+
+"WsSu5K" = "Open New Note";
+
+"YxSeRd" = "Find a note with ${tag}";
+
+"bjR9IG" = "Open ${note} in Simplenote";
+
+"cH6X2m" = "Note";
+
+"cqm5AM" = "Content";
+
+"d6MjpX" = "Append To Note";
+
+"fgSbr5" = "Open Simplenote and create a new note";
+
+"hDNku0" = "${note}";
+
+"lSBG7V" = "Append ${content}to ${note}";
+
+"lXNZsS" = "Copy content from ${note}";
+
+"m6yrkX" = "What would you like to append to ${note}";
+
+"nF2vZQ" = "Find Note With Tag";
+
+"oawbyy" = "Find Note With Content";
+
+"pFkRQX" = "Note";
+
+"qYKqOP" = "Just to confirm, you wanted ‘${tag}’?";
+
+"raYk2S" = "Note Content";
+
+"s11KbQ" = "Copy Note Content";
+
+"s9MSi2" = "Tag";
+
+"sOjweW" = "Which One?";
+
+"sXkMgW" = "Creates a note with supplied content and save it in Simplenote";
+
+"sqM3pN" = "Open Note in Simplenote";
+
+"uDDlMr" = "Which One?";
+
+"wLeRnn" = "Note";
+
+"yuIu0n" = "Which One?";
+
diff --git a/Simplenote/Supporting Files/ru.lproj/ShortcutIntents.strings b/Simplenote/Supporting Files/ru.lproj/ShortcutIntents.strings
new file mode 100644
index 000000000..099146dce
--- /dev/null
+++ b/Simplenote/Supporting Files/ru.lproj/ShortcutIntents.strings	
@@ -0,0 +1,86 @@
+"4OEbmY" = "note";
+
+"Ag8ugh" = "Create New Note With Content";
+
+"CNjhWs" = "Create new note with ${content}";
+
+"CUkV8q" = "Note";
+
+"EeqvcH" = "Append content to an existing note in Simplenote";
+
+"I19gXv" = "Note";
+
+"IIfrvb" = "Intent Tag";
+
+"IQnYW1" = "Open Note";
+
+"MdiZid" = "Just to confirm, you wanted ‘${note}’?";
+
+"Mz9mrb" = "Note";
+
+"OOdDHV" = "Which Note?";
+
+"OZjn1w" = "Open a new note in Simplenote";
+
+"PaQ5Kk" = "Note";
+
+"U4ce2H" = "There are ${count} options matching ‘${tag}’.";
+
+"U9Yl4n" = "Content";
+
+"V4ssp4" = "Search the content of your notes to find a note to use in shortcuts";
+
+"VBtgac" = "There are ${count} options matching ‘${note}’.";
+
+"VDjU7n" = "Find a note with ${content}";
+
+"VGM0yX" = "Content";
+
+"WsSu5K" = "Open New Note";
+
+"YxSeRd" = "Find a note with ${tag}";
+
+"bjR9IG" = "Open ${note} in Simplenote";
+
+"cH6X2m" = "Note";
+
+"cqm5AM" = "Content";
+
+"d6MjpX" = "Append To Note";
+
+"fgSbr5" = "Open Simplenote and create a new note";
+
+"hDNku0" = "${note}";
+
+"lSBG7V" = "Append ${content}to ${note}";
+
+"lXNZsS" = "Copy content from ${note}";
+
+"m6yrkX" = "What would you like to append to ${note}";
+
+"nF2vZQ" = "Find Note With Tag";
+
+"oawbyy" = "Find Note With Content";
+
+"pFkRQX" = "Note";
+
+"qYKqOP" = "Just to confirm, you wanted ‘${tag}’?";
+
+"raYk2S" = "Note Content";
+
+"s11KbQ" = "Copy Note Content";
+
+"s9MSi2" = "Tag";
+
+"sOjweW" = "Which One?";
+
+"sXkMgW" = "Creates a note with supplied content and save it in Simplenote";
+
+"sqM3pN" = "Open Note in Simplenote";
+
+"uDDlMr" = "Which One?";
+
+"wLeRnn" = "Note";
+
+"yuIu0n" = "Which One?";
+
diff --git a/Simplenote/Supporting Files/sv.lproj/ShortcutIntents.strings b/Simplenote/Supporting Files/sv.lproj/ShortcutIntents.strings
new file mode 100644
index 000000000..099146dce
--- /dev/null
+++ b/Simplenote/Supporting Files/sv.lproj/ShortcutIntents.strings	
@@ -0,0 +1,86 @@
+"4OEbmY" = "note";
+
+"Ag8ugh" = "Create New Note With Content";
+
+"CNjhWs" = "Create new note with ${content}";
+
+"CUkV8q" = "Note";
+
+"EeqvcH" = "Append content to an existing note in Simplenote";
+
+"I19gXv" = "Note";
+
+"IIfrvb" = "Intent Tag";
+
+"IQnYW1" = "Open Note";
+
+"MdiZid" = "Just to confirm, you wanted ‘${note}’?";
+
+"Mz9mrb" = "Note";
+
+"OOdDHV" = "Which Note?";
+
+"OZjn1w" = "Open a new note in Simplenote";
+
+"PaQ5Kk" = "Note";
+
+"U4ce2H" = "There are ${count} options matching ‘${tag}’.";
+
+"U9Yl4n" = "Content";
+
+"V4ssp4" = "Search the content of your notes to find a note to use in shortcuts";
+
+"VBtgac" = "There are ${count} options matching ‘${note}’.";
+
+"VDjU7n" = "Find a note with ${content}";
+
+"VGM0yX" = "Content";
+
+"WsSu5K" = "Open New Note";
+
+"YxSeRd" = "Find a note with ${tag}";
+
+"bjR9IG" = "Open ${note} in Simplenote";
+
+"cH6X2m" = "Note";
+
+"cqm5AM" = "Content";
+
+"d6MjpX" = "Append To Note";
+
+"fgSbr5" = "Open Simplenote and create a new note";
+
+"hDNku0" = "${note}";
+
+"lSBG7V" = "Append ${content}to ${note}";
+
+"lXNZsS" = "Copy content from ${note}";
+
+"m6yrkX" = "What would you like to append to ${note}";
+
+"nF2vZQ" = "Find Note With Tag";
+
+"oawbyy" = "Find Note With Content";
+
+"pFkRQX" = "Note";
+
+"qYKqOP" = "Just to confirm, you wanted ‘${tag}’?";
+
+"raYk2S" = "Note Content";
+
+"s11KbQ" = "Copy Note Content";
+
+"s9MSi2" = "Tag";
+
+"sOjweW" = "Which One?";
+
+"sXkMgW" = "Creates a note with supplied content and save it in Simplenote";
+
+"sqM3pN" = "Open Note in Simplenote";
+
+"uDDlMr" = "Which One?";
+
+"wLeRnn" = "Note";
+
+"yuIu0n" = "Which One?";
+
diff --git a/Simplenote/Supporting Files/tr.lproj/ShortcutIntents.strings b/Simplenote/Supporting Files/tr.lproj/ShortcutIntents.strings
new file mode 100644
index 000000000..099146dce
--- /dev/null
+++ b/Simplenote/Supporting Files/tr.lproj/ShortcutIntents.strings	
@@ -0,0 +1,86 @@
+"4OEbmY" = "note";
+
+"Ag8ugh" = "Create New Note With Content";
+
+"CNjhWs" = "Create new note with ${content}";
+
+"CUkV8q" = "Note";
+
+"EeqvcH" = "Append content to an existing note in Simplenote";
+
+"I19gXv" = "Note";
+
+"IIfrvb" = "Intent Tag";
+
+"IQnYW1" = "Open Note";
+
+"MdiZid" = "Just to confirm, you wanted ‘${note}’?";
+
+"Mz9mrb" = "Note";
+
+"OOdDHV" = "Which Note?";
+
+"OZjn1w" = "Open a new note in Simplenote";
+
+"PaQ5Kk" = "Note";
+
+"U4ce2H" = "There are ${count} options matching ‘${tag}’.";
+
+"U9Yl4n" = "Content";
+
+"V4ssp4" = "Search the content of your notes to find a note to use in shortcuts";
+
+"VBtgac" = "There are ${count} options matching ‘${note}’.";
+
+"VDjU7n" = "Find a note with ${content}";
+
+"VGM0yX" = "Content";
+
+"WsSu5K" = "Open New Note";
+
+"YxSeRd" = "Find a note with ${tag}";
+
+"bjR9IG" = "Open ${note} in Simplenote";
+
+"cH6X2m" = "Note";
+
+"cqm5AM" = "Content";
+
+"d6MjpX" = "Append To Note";
+
+"fgSbr5" = "Open Simplenote and create a new note";
+
+"hDNku0" = "${note}";
+
+"lSBG7V" = "Append ${content}to ${note}";
+
+"lXNZsS" = "Copy content from ${note}";
+
+"m6yrkX" = "What would you like to append to ${note}";
+
+"nF2vZQ" = "Find Note With Tag";
+
+"oawbyy" = "Find Note With Content";
+
+"pFkRQX" = "Note";
+
+"qYKqOP" = "Just to confirm, you wanted ‘${tag}’?";
+
+"raYk2S" = "Note Content";
+
+"s11KbQ" = "Copy Note Content";
+
+"s9MSi2" = "Tag";
+
+"sOjweW" = "Which One?";
+
+"sXkMgW" = "Creates a note with supplied content and save it in Simplenote";
+
+"sqM3pN" = "Open Note in Simplenote";
+
+"uDDlMr" = "Which One?";
+
+"wLeRnn" = "Note";
+
+"yuIu0n" = "Which One?";
+
diff --git a/Simplenote/Supporting Files/zh-Hans-CN.lproj/ShortcutIntents.strings b/Simplenote/Supporting Files/zh-Hans-CN.lproj/ShortcutIntents.strings
new file mode 100644
index 000000000..099146dce
--- /dev/null
+++ b/Simplenote/Supporting Files/zh-Hans-CN.lproj/ShortcutIntents.strings	
@@ -0,0 +1,86 @@
+"4OEbmY" = "note";
+
+"Ag8ugh" = "Create New Note With Content";
+
+"CNjhWs" = "Create new note with ${content}";
+
+"CUkV8q" = "Note";
+
+"EeqvcH" = "Append content to an existing note in Simplenote";
+
+"I19gXv" = "Note";
+
+"IIfrvb" = "Intent Tag";
+
+"IQnYW1" = "Open Note";
+
+"MdiZid" = "Just to confirm, you wanted ‘${note}’?";
+
+"Mz9mrb" = "Note";
+
+"OOdDHV" = "Which Note?";
+
+"OZjn1w" = "Open a new note in Simplenote";
+
+"PaQ5Kk" = "Note";
+
+"U4ce2H" = "There are ${count} options matching ‘${tag}’.";
+
+"U9Yl4n" = "Content";
+
+"V4ssp4" = "Search the content of your notes to find a note to use in shortcuts";
+
+"VBtgac" = "There are ${count} options matching ‘${note}’.";
+
+"VDjU7n" = "Find a note with ${content}";
+
+"VGM0yX" = "Content";
+
+"WsSu5K" = "Open New Note";
+
+"YxSeRd" = "Find a note with ${tag}";
+
+"bjR9IG" = "Open ${note} in Simplenote";
+
+"cH6X2m" = "Note";
+
+"cqm5AM" = "Content";
+
+"d6MjpX" = "Append To Note";
+
+"fgSbr5" = "Open Simplenote and create a new note";
+
+"hDNku0" = "${note}";
+
+"lSBG7V" = "Append ${content}to ${note}";
+
+"lXNZsS" = "Copy content from ${note}";
+
+"m6yrkX" = "What would you like to append to ${note}";
+
+"nF2vZQ" = "Find Note With Tag";
+
+"oawbyy" = "Find Note With Content";
+
+"pFkRQX" = "Note";
+
+"qYKqOP" = "Just to confirm, you wanted ‘${tag}’?";
+
+"raYk2S" = "Note Content";
+
+"s11KbQ" = "Copy Note Content";
+
+"s9MSi2" = "Tag";
+
+"sOjweW" = "Which One?";
+
+"sXkMgW" = "Creates a note with supplied content and save it in Simplenote";
+
+"sqM3pN" = "Open Note in Simplenote";
+
+"uDDlMr" = "Which One?";
+
+"wLeRnn" = "Note";
+
+"yuIu0n" = "Which One?";
+
diff --git a/Simplenote/Supporting Files/zh-Hant-TW.lproj/ShortcutIntents.strings b/Simplenote/Supporting Files/zh-Hant-TW.lproj/ShortcutIntents.strings
new file mode 100644
index 000000000..099146dce
--- /dev/null
+++ b/Simplenote/Supporting Files/zh-Hant-TW.lproj/ShortcutIntents.strings	
@@ -0,0 +1,86 @@
+"4OEbmY" = "note";
+
+"Ag8ugh" = "Create New Note With Content";
+
+"CNjhWs" = "Create new note with ${content}";
+
+"CUkV8q" = "Note";
+
+"EeqvcH" = "Append content to an existing note in Simplenote";
+
+"I19gXv" = "Note";
+
+"IIfrvb" = "Intent Tag";
+
+"IQnYW1" = "Open Note";
+
+"MdiZid" = "Just to confirm, you wanted ‘${note}’?";
+
+"Mz9mrb" = "Note";
+
+"OOdDHV" = "Which Note?";
+
+"OZjn1w" = "Open a new note in Simplenote";
+
+"PaQ5Kk" = "Note";
+
+"U4ce2H" = "There are ${count} options matching ‘${tag}’.";
+
+"U9Yl4n" = "Content";
+
+"V4ssp4" = "Search the content of your notes to find a note to use in shortcuts";
+
+"VBtgac" = "There are ${count} options matching ‘${note}’.";
+
+"VDjU7n" = "Find a note with ${content}";
+
+"VGM0yX" = "Content";
+
+"WsSu5K" = "Open New Note";
+
+"YxSeRd" = "Find a note with ${tag}";
+
+"bjR9IG" = "Open ${note} in Simplenote";
+
+"cH6X2m" = "Note";
+
+"cqm5AM" = "Content";
+
+"d6MjpX" = "Append To Note";
+
+"fgSbr5" = "Open Simplenote and create a new note";
+
+"hDNku0" = "${note}";
+
+"lSBG7V" = "Append ${content}to ${note}";
+
+"lXNZsS" = "Copy content from ${note}";
+
+"m6yrkX" = "What would you like to append to ${note}";
+
+"nF2vZQ" = "Find Note With Tag";
+
+"oawbyy" = "Find Note With Content";
+
+"pFkRQX" = "Note";
+
+"qYKqOP" = "Just to confirm, you wanted ‘${tag}’?";
+
+"raYk2S" = "Note Content";
+
+"s11KbQ" = "Copy Note Content";
+
+"s9MSi2" = "Tag";
+
+"sOjweW" = "Which One?";
+
+"sXkMgW" = "Creates a note with supplied content and save it in Simplenote";
+
+"sqM3pN" = "Open Note in Simplenote";
+
+"uDDlMr" = "Which One?";
+
+"wLeRnn" = "Note";
+
+"yuIu0n" = "Which One?";
+

From 886e226a20abf305973eb58de81aa0c632a2ed68 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Fri, 10 May 2024 12:42:28 -0600
Subject: [PATCH 164/547] Updated note list view controller top content inset

---
 Simplenote/Classes/SPNoteListViewController+Extensions.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Simplenote/Classes/SPNoteListViewController+Extensions.swift b/Simplenote/Classes/SPNoteListViewController+Extensions.swift
index 8c0677a3c..e956246e5 100644
--- a/Simplenote/Classes/SPNoteListViewController+Extensions.swift
+++ b/Simplenote/Classes/SPNoteListViewController+Extensions.swift
@@ -157,8 +157,8 @@ extension SPNoteListViewController {
     ///
     @objc
     func refreshTableViewTopInsets() {
-        tableView.contentInset.top = searchBarStackView.frame.height
-        tableView.verticalScrollIndicatorInsets.top = searchBarStackView.frame.height
+        tableView.contentInset.top = searchBarStackView.frame.height / 2
+        tableView.verticalScrollIndicatorInsets.top = searchBarStackView.frame.height / 2
     }
 
     /// Scrolls to the First Row whenever the flag `mustScrollToFirstRow` was set to true

From d57d253c0bc16bca9127d45570636876e5e292fc Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Fri, 10 May 2024 15:58:38 -0600
Subject: [PATCH 165/547] Updated SPNoteListVC to allow for viewing notes in
 the trash

---
 Simplenote/Classes/SPNoteListViewController.m | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Simplenote/Classes/SPNoteListViewController.m b/Simplenote/Classes/SPNoteListViewController.m
index 512f0d3f4..9493b4881 100644
--- a/Simplenote/Classes/SPNoteListViewController.m
+++ b/Simplenote/Classes/SPNoteListViewController.m
@@ -523,7 +523,6 @@ - (void)update
     BOOL isTrashOnScreen = self.isDeletedFilterActive;
 
     [self refreshEmptyTrashState];
-    self.tableView.allowsSelection = !isTrashOnScreen;
     
     [self displayPlaceholdersIfNeeded];
     [self refershNavigationButtons];

From 4bd2876d9e58250e1c3116499ad189395863d9f3 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Mon, 13 May 2024 12:31:13 -0600
Subject: [PATCH 166/547] Modified the amount of gap between header and notes
 list

---
 Simplenote/Classes/SPNoteListViewController+Extensions.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Simplenote/Classes/SPNoteListViewController+Extensions.swift b/Simplenote/Classes/SPNoteListViewController+Extensions.swift
index e956246e5..6714ec1a0 100644
--- a/Simplenote/Classes/SPNoteListViewController+Extensions.swift
+++ b/Simplenote/Classes/SPNoteListViewController+Extensions.swift
@@ -157,8 +157,8 @@ extension SPNoteListViewController {
     ///
     @objc
     func refreshTableViewTopInsets() {
-        tableView.contentInset.top = searchBarStackView.frame.height / 2
-        tableView.verticalScrollIndicatorInsets.top = searchBarStackView.frame.height / 2
+        tableView.contentInset.top = searchBarStackView.frame.height / 1.75
+        tableView.verticalScrollIndicatorInsets.top = searchBarStackView.frame.height / 1.75
     }
 
     /// Scrolls to the First Row whenever the flag `mustScrollToFirstRow` was set to true

From 2b73f0def4c3ef8540691bab92564795d68bef3e Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Mon, 13 May 2024 13:25:58 -0600
Subject: [PATCH 167/547] Refactored AppendNote intent to fetch the current
 note content to append

---
 .../AppendNoteIntentHandler.swift             |  6 ++-
 SimplenoteShare/Simperium/Uploader.swift      | 40 ++++++++++++++++++-
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift b/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift
index 07fe62c7e..1de7c86bd 100644
--- a/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift	
+++ b/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift	
@@ -35,7 +35,11 @@ class AppendNoteIntentHandler: NSObject, AppendNoteIntentHandling {
             return AppendNoteIntentResponse(code: .failure, userActivity: nil)
         }
 
-        note.content? += "\n\n\(content)"
+        guard let existingContent = try? await Downloader(simperiumToken: token).getNoteContent(for: identifier) else {
+            return AppendNoteIntentResponse(code: .failure, userActivity: nil)
+        }
+
+        note.content = existingContent + "\n\n\(content)"
         let uploader = Uploader(simperiumToken: token)
         uploader.send(note)
 
diff --git a/SimplenoteShare/Simperium/Uploader.swift b/SimplenoteShare/Simperium/Uploader.swift
index 743e918e6..06b33b697 100644
--- a/SimplenoteShare/Simperium/Uploader.swift
+++ b/SimplenoteShare/Simperium/Uploader.swift
@@ -23,7 +23,7 @@ class Uploader: NSObject {
 
         // Request
         var request = URLRequest(url: targetURL)
-        request.httpMethod = Settings.httpMethod
+        request.httpMethod = Settings.httpMethodPost
         request.httpBody = note.toJsonData()
         request.setValue(token, forHTTPHeaderField: Settings.authHeader)
 
@@ -61,10 +61,46 @@ extension Uploader: URLSessionTaskDelegate {
     }
 }
 
+class Downloader: NSObject {
+
+    /// Simperium's Token
+    ///
+    private let token: String
+
+    /// Designated Initializer
+    ///
+    init(simperiumToken: String) {
+        token = simperiumToken
+    }
+
+    func getNoteContent(for simperiumKey: String) async throws -> String? {
+        let endpoint = String(format: "%@/%@/%@/i/%@", kSimperiumBaseURL, SPCredentials.simperiumAppID, Settings.bucketName, simperiumKey)
+        let targetURL = URL(string: endpoint.lowercased())!
+
+        // Request
+        var request = URLRequest(url: targetURL)
+        request.httpMethod = Settings.httpMethodGet
+        request.setValue(token, forHTTPHeaderField: Settings.authHeader)
+
+        let sc = URLSessionConfiguration.default
+        let session = Foundation.URLSession(configuration: sc, delegate: nil, delegateQueue: .main)
+
+        let downloadedData = try await session.data(for: request)
+
+        return try extractNoteContent(from: downloadedData.0)
+    }
+
+    func extractNoteContent(from data: Data) throws -> String? {
+        let jsonObject = try JSONSerialization.jsonObject(with: data) as? [String: Any]
+        return jsonObject?["content"] as? String
+    }
+}
+
 // MARK: - Settings
 //
 private struct Settings {
     static let authHeader  = "X-Simperium-Token"
     static let bucketName  = "note"
-    static let httpMethod  = "POST"
+    static let httpMethodPost  = "POST"
+    static let httpMethodGet  = "GET"
 }

From b5dfb3c7ba29105b4cf81da97c30fe0eee25f40d Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Mon, 13 May 2024 16:33:29 -0600
Subject: [PATCH 168/547] Moved Downloader to it's own file

---
 Simplenote.xcodeproj/project.pbxproj       |  6 +++
 SimplenoteShare/Simperium/Downloader.swift | 52 ++++++++++++++++++++++
 SimplenoteShare/Simperium/Uploader.swift   | 36 ---------------
 3 files changed, 58 insertions(+), 36 deletions(-)
 create mode 100644 SimplenoteShare/Simperium/Downloader.swift

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index f3b376944..daffbb9da 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -511,6 +511,8 @@
 		BA8FC2A5267AC7470082962E /* SharedStorageMigrator.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA8FC2A4267AC7470082962E /* SharedStorageMigrator.swift */; };
 		BA9B19F926A8EF3200692366 /* SpinnerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9B19F826A8EF3200692366 /* SpinnerViewController.swift */; };
 		BA9B59022685549F00DAD1ED /* StorageSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9B59012685549F00DAD1ED /* StorageSettings.swift */; };
+		BA9C7EFB2BF2CC3E007A8460 /* Downloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9C7EFA2BF2CC3E007A8460 /* Downloader.swift */; };
+		BA9C7EFC2BF2CCAE007A8460 /* Downloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9C7EFA2BF2CC3E007A8460 /* Downloader.swift */; };
 		BAA4856925D5E40900F3BDB9 /* SearchQuery+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAA4856825D5E40900F3BDB9 /* SearchQuery+Simplenote.swift */; };
 		BAA59E79269F9FE30068BD3D /* Date+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAA59E78269F9FE30068BD3D /* Date+Simplenote.swift */; };
 		BAA63C3325EEDA83001589D7 /* NoteLinkTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAA63C3225EEDA83001589D7 /* NoteLinkTests.swift */; };
@@ -1194,6 +1196,7 @@
 		BA8FC2A4267AC7470082962E /* SharedStorageMigrator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharedStorageMigrator.swift; sourceTree = "<group>"; };
 		BA9B19F826A8EF3200692366 /* SpinnerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpinnerViewController.swift; sourceTree = "<group>"; };
 		BA9B59012685549F00DAD1ED /* StorageSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StorageSettings.swift; sourceTree = "<group>"; };
+		BA9C7EFA2BF2CC3E007A8460 /* Downloader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Downloader.swift; sourceTree = "<group>"; };
 		BAA4856825D5E40900F3BDB9 /* SearchQuery+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SearchQuery+Simplenote.swift"; sourceTree = "<group>"; };
 		BAA59E78269F9FE30068BD3D /* Date+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Date+Simplenote.swift"; sourceTree = "<group>"; };
 		BAA63C3225EEDA83001589D7 /* NoteLinkTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteLinkTests.swift; sourceTree = "<group>"; };
@@ -2242,6 +2245,7 @@
 			children = (
 				B5CFFFE822AA9DD700B968CD /* Note.swift */,
 				B5CFFFE622AA9DB100B968CD /* Uploader.swift */,
+				BA9C7EFA2BF2CC3E007A8460 /* Downloader.swift */,
 			);
 			path = Simperium;
 			sourceTree = "<group>";
@@ -3760,6 +3764,7 @@
 				B52893B12360B7E300DF2571 /* UIColor+Studio.swift in Sources */,
 				B5E196BC230F522D00F5658A /* SPCredentials.swift in Sources */,
 				B56A9FFE22AEDCB0003F85CB /* URLExtractor.swift in Sources */,
+				BA9C7EFB2BF2CC3E007A8460 /* Downloader.swift in Sources */,
 				B56315BE236BD9970066C151 /* UIKitConstants.swift in Sources */,
 				74F6638322BADD0300FA147E /* SharePresentationController.swift in Sources */,
 				74388F4822CFFABD001C5EC0 /* NSObject+Helpers.swift in Sources */,
@@ -3777,6 +3782,7 @@
 				BA34B04D2BEAE9FE00580E15 /* SPConstants.m in Sources */,
 				BA289B5F2BE43728000E6794 /* NoteWidgetIntentHandler.swift in Sources */,
 				BAF8D50026AE171400CA9383 /* CoreDataManager.swift in Sources */,
+				BA9C7EFC2BF2CCAE007A8460 /* Downloader.swift in Sources */,
 				BAE63CB026E05313002BF81A /* NSString+Simplenote.swift in Sources */,
 				BAE63CB226E05325002BF81A /* NSPredicate+Email.swift in Sources */,
 				BAF8D51426AE172600CA9383 /* StorageSettings.swift in Sources */,
diff --git a/SimplenoteShare/Simperium/Downloader.swift b/SimplenoteShare/Simperium/Downloader.swift
new file mode 100644
index 000000000..b8a4f645e
--- /dev/null
+++ b/SimplenoteShare/Simperium/Downloader.swift
@@ -0,0 +1,52 @@
+//
+//  Downloader.swift
+//  SimplenoteShare
+//
+//  Created by Charlie Scheer on 5/13/24.
+//  Copyright © 2024 Automattic. All rights reserved.
+//
+
+import Foundation
+
+class Downloader: NSObject {
+
+    /// Simperium's Token
+    ///
+    private let token: String
+
+    /// Designated Initializer
+    ///
+    init(simperiumToken: String) {
+        token = simperiumToken
+    }
+
+    func getNoteContent(for simperiumKey: String) async throws -> String? {
+        let endpoint = String(format: "%@/%@/%@/i/%@", kSimperiumBaseURL, SPCredentials.simperiumAppID, Settings.bucketName, simperiumKey)
+        let targetURL = URL(string: endpoint.lowercased())!
+
+        // Request
+        var request = URLRequest(url: targetURL)
+        request.httpMethod = Settings.httpMethodGet
+        request.setValue(token, forHTTPHeaderField: Settings.authHeader)
+
+        let sc = URLSessionConfiguration.default
+        let session = Foundation.URLSession(configuration: sc, delegate: nil, delegateQueue: .main)
+
+        let downloadedData = try await session.data(for: request)
+
+        return try extractNoteContent(from: downloadedData.0)
+    }
+
+    func extractNoteContent(from data: Data) throws -> String? {
+        let jsonObject = try JSONSerialization.jsonObject(with: data) as? [String: Any]
+        return jsonObject?["content"] as? String
+    }
+}
+
+// MARK: - Settings
+//
+private struct Settings {
+    static let authHeader  = "X-Simperium-Token"
+    static let bucketName  = "note"
+    static let httpMethodGet  = "GET"
+}
diff --git a/SimplenoteShare/Simperium/Uploader.swift b/SimplenoteShare/Simperium/Uploader.swift
index 06b33b697..da6b6e9fe 100644
--- a/SimplenoteShare/Simperium/Uploader.swift
+++ b/SimplenoteShare/Simperium/Uploader.swift
@@ -61,46 +61,10 @@ extension Uploader: URLSessionTaskDelegate {
     }
 }
 
-class Downloader: NSObject {
-
-    /// Simperium's Token
-    ///
-    private let token: String
-
-    /// Designated Initializer
-    ///
-    init(simperiumToken: String) {
-        token = simperiumToken
-    }
-
-    func getNoteContent(for simperiumKey: String) async throws -> String? {
-        let endpoint = String(format: "%@/%@/%@/i/%@", kSimperiumBaseURL, SPCredentials.simperiumAppID, Settings.bucketName, simperiumKey)
-        let targetURL = URL(string: endpoint.lowercased())!
-
-        // Request
-        var request = URLRequest(url: targetURL)
-        request.httpMethod = Settings.httpMethodGet
-        request.setValue(token, forHTTPHeaderField: Settings.authHeader)
-
-        let sc = URLSessionConfiguration.default
-        let session = Foundation.URLSession(configuration: sc, delegate: nil, delegateQueue: .main)
-
-        let downloadedData = try await session.data(for: request)
-
-        return try extractNoteContent(from: downloadedData.0)
-    }
-
-    func extractNoteContent(from data: Data) throws -> String? {
-        let jsonObject = try JSONSerialization.jsonObject(with: data) as? [String: Any]
-        return jsonObject?["content"] as? String
-    }
-}
-
 // MARK: - Settings
 //
 private struct Settings {
     static let authHeader  = "X-Simperium-Token"
     static let bucketName  = "note"
     static let httpMethodPost  = "POST"
-    static let httpMethodGet  = "GET"
 }

From ebc36f0b9fc5913238c4664c78cc6cf4f5c175c0 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Mon, 13 May 2024 16:33:59 -0600
Subject: [PATCH 169/547] Removed double space when appending to a note

---
 SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift b/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift
index 1de7c86bd..2ab3df7b9 100644
--- a/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift	
+++ b/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift	
@@ -39,7 +39,7 @@ class AppendNoteIntentHandler: NSObject, AppendNoteIntentHandling {
             return AppendNoteIntentResponse(code: .failure, userActivity: nil)
         }
 
-        note.content = existingContent + "\n\n\(content)"
+        note.content = existingContent + "\n\(content)"
         let uploader = Uploader(simperiumToken: token)
         uploader.send(note)
 

From a58fca923284e02ef8d98576bbc0105817a4eba0 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Tue, 14 May 2024 10:02:45 -0600
Subject: [PATCH 170/547] Revert "Merge pull request #1573 from Automattic
 drop-collaboration-mk1

This reverts commit 4c699914fd22e9af7d9ac2f8f9559d8ea90d2d28, reversing
changes made to ed04027d0530048330f973235b519f8990433329.
---
 Simplenote.xcodeproj/project.pbxproj          |  4 --
 Simplenote/BannerView.swift                   | 62 +++++++++---------
 Simplenote/BannerView.xib                     |  8 ++-
 .../SPAddCollaboratorsViewController.h        |  2 -
 .../SPAddCollaboratorsViewController.m        | 18 +++---
 .../Classes/SPEntryListViewController.h       |  6 +-
 .../Classes/SPEntryListViewController.m       | 63 ++++++++++---------
 .../SPAddCollaboratorsViewController.swift    | 54 ----------------
 8 files changed, 78 insertions(+), 139 deletions(-)
 delete mode 100644 Simplenote/SPAddCollaboratorsViewController.swift

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index bfc64dd47..c4d3df429 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -544,7 +544,6 @@
 		BABFFF2226CF9094003A4C25 /* WidgetDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = BABFFF2126CF9094003A4C25 /* WidgetDefaults.swift */; };
 		BABFFF2326CF9094003A4C25 /* WidgetDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = BABFFF2126CF9094003A4C25 /* WidgetDefaults.swift */; };
 		BABFFF2426CF9094003A4C25 /* WidgetDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = BABFFF2126CF9094003A4C25 /* WidgetDefaults.swift */; };
-		BAC7264E2BD96E7C0002FA68 /* SPAddCollaboratorsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAC7264D2BD96E7C0002FA68 /* SPAddCollaboratorsViewController.swift */; };
 		BAD0F1ED2BED49C200E73E45 /* FindNoteIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAD0F1EC2BED49C200E73E45 /* FindNoteIntentHandler.swift */; };
 		BAE08626261282D1009D40CD /* Note+Publish.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAE08625261282D1009D40CD /* Note+Publish.swift */; };
 		BAE63CAF26E05312002BF81A /* NSString+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = B59188C124005B8A0069EF96 /* NSString+Simplenote.swift */; };
@@ -1246,7 +1245,6 @@
 		BAB6C04626BA4CAF007495C4 /* WidgetController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetController.swift; sourceTree = "<group>"; };
 		BAB898D22BEC404200E238B8 /* CreateNewNoteIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateNewNoteIntentHandler.swift; sourceTree = "<group>"; };
 		BABFFF2126CF9094003A4C25 /* WidgetDefaults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetDefaults.swift; sourceTree = "<group>"; };
-		BAC7264D2BD96E7C0002FA68 /* SPAddCollaboratorsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPAddCollaboratorsViewController.swift; sourceTree = "<group>"; };
 		BAD0F1EC2BED49C200E73E45 /* FindNoteIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FindNoteIntentHandler.swift; sourceTree = "<group>"; };
 		BAE08625261282D1009D40CD /* Note+Publish.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Note+Publish.swift"; sourceTree = "<group>"; };
 		BAF4A96E26DB085D00C51C1D /* NSURLComponents+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSURLComponents+Simplenote.swift"; sourceTree = "<group>"; };
@@ -2741,7 +2739,6 @@
 				E2F1497F179D8E1A00DC9690 /* Settings */,
 				E25C39CE17A41F3400B2591A /* SPAddCollaboratorsViewController.h */,
 				E25C39CF17A41F3400B2591A /* SPAddCollaboratorsViewController.m */,
-				BAC7264D2BD96E7C0002FA68 /* SPAddCollaboratorsViewController.swift */,
 				E2EAE38117C2C2D400268682 /* SPEntryListViewController.h */,
 				E2EAE38217C2C2D400268682 /* SPEntryListViewController.m */,
 				E215C790180B115C00AD36B5 /* SPNavigationController.h */,
@@ -3501,7 +3498,6 @@
 				B531090823D0B685002B0998 /* SPSimpleTextPrintFormatter.swift in Sources */,
 				B5CDE61F2150834C00C3FED4 /* Simperium+Simplenote.m in Sources */,
 				A60A1A1E25655D840041701E /* ApplicationShortcutItemType.swift in Sources */,
-				BAC7264E2BD96E7C0002FA68 /* SPAddCollaboratorsViewController.swift in Sources */,
 				B51F6DD12460C3EE0074DDD9 /* AuthenticationValidator.swift in Sources */,
 				B575736A232C567000443C2E /* UIImage+Dynamic.swift in Sources */,
 				A60DF31025A4524100FDADF3 /* PinLockBaseController.swift in Sources */,
diff --git a/Simplenote/BannerView.swift b/Simplenote/BannerView.swift
index d5e602cff..ec98db8cc 100644
--- a/Simplenote/BannerView.swift
+++ b/Simplenote/BannerView.swift
@@ -44,22 +44,21 @@ class BannerView: UIView {
     override func awakeFromNib() {
         super.awakeFromNib()
         refreshInterface()
-        setupTapRecognizer()
     }
 
     // MARK: - Actions
 
-    @objc
-    func bannerWasPressed() {
+    @IBAction
+    func bannerWasPresssed() {
         onPress?()
     }
+}
 
-    private func setupTapRecognizer() {
-        let tapRecognizer = UITapGestureRecognizer(target: self, action: #selector(bannerWasPressed))
-        backgroundView.addGestureRecognizer(tapRecognizer)
-    }
+// MARK: - Private API(s)
+//
+private extension BannerView {
 
-    func refreshInterface(with style: BannerView.Style? = nil) {
+    func refreshInterface(with style: Style? = nil) {
         guard let style else {
             return
         }
@@ -71,35 +70,32 @@ class BannerView: UIView {
         backgroundView.backgroundColor = style.backgroundColor
         backgroundView.layer.cornerRadius = Metrics.defaultCornerRadius
     }
+}
 
-    // MARK: - Style
-    //
-    struct Style {
-        let title: String
-        let details: String
-        let textColor: UIColor
-        let backgroundColor: UIColor
-
-        // Leaving these styles in cause we may want them back someday
-        static var sustainer: Style {
-            Style(title: NSLocalizedString("You are a Simplenote Sustainer", comment: "Current Sustainer Title"),
-                  details: NSLocalizedString("Thank you for your continued support", comment: "Current Sustainer Details"),
-                  textColor: .white,
-                  backgroundColor: .simplenoteSustainerViewBackgroundColor)
-        }
-
-        static var notSubscriber: Style {
-            Style(title: NSLocalizedString("Become a Simplenote Sustainer", comment: "Become a Sustainer Title"),
-                  details: NSLocalizedString("Support your favorite notes app to help unlock future features", comment: "Become a Sustainer Details"),
-                  textColor: .white,
-                  backgroundColor: .simplenoteBlue50Color)
-        }
+// MARK: - Style
+//
+private struct Style {
+    let title: String
+    let details: String
+    let textColor: UIColor
+    let backgroundColor: UIColor
+}
 
-        static var collaborationRetirement: Style {
-            Style(title: NSLocalizedString("Collaboration Retirement", comment: "Title announcing collaboration retirement"), details: NSLocalizedString("Collaboration is retiring on July 1st, 2024. For more details, tap here.", comment: "Description for retiring collaboration feature"), textColor: .white, backgroundColor: .simplenoteBlue50Color)
-        }
+private extension Style {
+    // Leaving these styles in cause we may want them back someday
+    static var sustainer: Style {
+        Style(title: NSLocalizedString("You are a Simplenote Sustainer", comment: "Current Sustainer Title"),
+              details: NSLocalizedString("Thank you for your continued support", comment: "Current Sustainer Details"),
+              textColor: .white,
+              backgroundColor: .simplenoteSustainerViewBackgroundColor)
     }
 
+    static var notSubscriber: Style {
+        Style(title: NSLocalizedString("Become a Simplenote Sustainer", comment: "Become a Sustainer Title"),
+              details: NSLocalizedString("Support your favorite notes app to help unlock future features", comment: "Become a Sustainer Details"),
+              textColor: .white,
+              backgroundColor: .simplenoteBlue50Color)
+    }
 }
 
 // MARK: - Metrics
diff --git a/Simplenote/BannerView.xib b/Simplenote/BannerView.xib
index f667c7744..dc1d2af0e 100644
--- a/Simplenote/BannerView.xib
+++ b/Simplenote/BannerView.xib
@@ -10,6 +10,12 @@
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tapGestureRecognizer id="4op-51-Dvd">
+            <connections>
+                <action selector="bannerWasPresssed" destination="H3q-Rz-XVn" id="Nhw-t0-Xiw"/>
+            </connections>
+        </tapGestureRecognizer>
         <view contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" id="H3q-Rz-XVn" userLabel="BannerView" customClass="BannerView" customModule="Simplenote" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="390" height="72"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -84,10 +90,10 @@
                 <outlet property="titleLabel" destination="xLW-HX-XmH" id="G19-ww-50A"/>
                 <outlet property="topConstraint" destination="SUn-BD-pzh" id="e9F-8I-nc7"/>
                 <outlet property="widthConstraint" destination="kYU-Lx-Xbh" id="yEN-6g-UV9"/>
+                <outletCollection property="gestureRecognizers" destination="4op-51-Dvd" appends="YES" id="gpV-aI-zul"/>
             </connections>
             <point key="canvasLocation" x="87.692307692307693" y="-258.05687203791467"/>
         </view>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
     </objects>
     <resources>
         <image name="simplenote-logo" width="64" height="64"/>
diff --git a/Simplenote/Classes/SPAddCollaboratorsViewController.h b/Simplenote/Classes/SPAddCollaboratorsViewController.h
index fe6ad6dce..83c11be63 100644
--- a/Simplenote/Classes/SPAddCollaboratorsViewController.h
+++ b/Simplenote/Classes/SPAddCollaboratorsViewController.h
@@ -5,7 +5,6 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @class SPAddCollaboratorsViewController;
-@class BannerView;
 @protocol SPCollaboratorDelegate <NSObject>
 
 @required
@@ -21,7 +20,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface SPAddCollaboratorsViewController : SPEntryListViewController
 
-@property (nonatomic, strong) BannerView *bannerView;
 @property (nonatomic, nullable, weak) id<SPCollaboratorDelegate> collaboratorDelegate;
 
 - (void)setupWithCollaborators:(NSArray<NSString *> *)collaborators;
diff --git a/Simplenote/Classes/SPAddCollaboratorsViewController.m b/Simplenote/Classes/SPAddCollaboratorsViewController.m
index 18bc871f5..97ec18462 100644
--- a/Simplenote/Classes/SPAddCollaboratorsViewController.m
+++ b/Simplenote/Classes/SPAddCollaboratorsViewController.m
@@ -47,10 +47,8 @@ - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
 
-    [self.primaryTableView reloadData];
+    [primaryTableView reloadData];
     [self.contactsManager requestAuthorizationIfNeededWithCompletion:nil];
-    [self setupBannerView];
-    [self setupViewContraints];
 }
 
 - (void)viewDidAppear:(BOOL)animated
@@ -115,7 +113,7 @@ - (void)setupWithCollaborators:(NSArray *)collaborators
 
     self.dataSource = [[[merged allObjects] sortedArrayUsingSelector:@selector(compareName:)] mutableCopy];
 
-    [self.primaryTableView reloadData];
+    [primaryTableView reloadData];
 }
 
 
@@ -128,7 +126,7 @@ - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
 {
-    if ([tableView isEqual:self.primaryTableView]) {
+    if ([tableView isEqual:primaryTableView]) {
         return self.dataSource.count;
     }
 
@@ -137,7 +135,7 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
 
 - (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section
 {
-    if ([tableView isEqual:self.primaryTableView]) {
+    if ([tableView isEqual:primaryTableView]) {
         return self.dataSource.count > 0 ? NSLocalizedString(@"Current Collaborators", nil) : nil;
     }
 
@@ -146,7 +144,7 @@ - (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInte
 
 - (NSString *)tableView:(UITableView *)tableView titleForFooterInSection:(NSInteger)section
 {
-    if ([tableView isEqual:self.primaryTableView]) {
+    if ([tableView isEqual:primaryTableView]) {
         if (self.dataSource.count > 0) {
             return nil;
         } else {
@@ -162,7 +160,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     SPEntryListCell *cell = (SPEntryListCell *)[super tableView:tableView cellForRowAtIndexPath:indexPath];
     PersonTag *personTag;
 
-    if ([tableView isEqual:self.primaryTableView]) {
+    if ([tableView isEqual:primaryTableView]) {
         personTag = self.dataSource[indexPath.row];
     } else {
         personTag = self.autoCompleteDataSource[indexPath.row];
@@ -193,7 +191,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
     UITableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
     cell.selected = NO;
     
-    if ([tableView isEqual:self.primaryTableView]) {
+    if ([tableView isEqual:primaryTableView]) {
 
         PersonTag *person = self.dataSource[indexPath.row];
         person.active = !person.active;
@@ -229,7 +227,7 @@ - (void)addPersonTag:(PersonTag *)person
         [self.dataSource addObject:person];
         
         entryTextField.text = @"";
-        [self.primaryTableView reloadSections:[NSIndexSet indexSetWithIndex:0]
+        [primaryTableView reloadSections:[NSIndexSet indexSetWithIndex:0]
                       withRowAnimation:UITableViewRowAnimationAutomatic];
         
         [self updateAutoCompleteMatchesForString:nil];
diff --git a/Simplenote/Classes/SPEntryListViewController.h b/Simplenote/Classes/SPEntryListViewController.h
index f4cc336a8..f3dcd95ec 100644
--- a/Simplenote/Classes/SPEntryListViewController.h
+++ b/Simplenote/Classes/SPEntryListViewController.h
@@ -9,18 +9,16 @@
 #import <UIKit/UIKit.h>
 #import "SPTextField.h"
 
-static CGFloat const EntryListCellHeight = 44;
-
 @interface SPEntryListViewController : UIViewController <UITableViewDataSource, UITableViewDelegate, UITextFieldDelegate> {
     
+    UITableView *primaryTableView;
+    UIView *entryFieldBackground;
     SPTextField *entryTextField;
     UIButton *entryFieldPlusButton;
     UITableView *autoCompleteTableView;
 
 }
 
-@property (nonatomic, strong) UITableView *primaryTableView;
-@property (nonatomic, strong) UIView *entryFieldBackground;
 @property (nonatomic, strong) NSMutableArray *dataSource;
 @property (nonatomic, strong) NSArray *autoCompleteDataSource;
 @property (nonatomic) BOOL showEntryFieldPlusButton;
diff --git a/Simplenote/Classes/SPEntryListViewController.m b/Simplenote/Classes/SPEntryListViewController.m
index 7ec1a1c86..6f9f2adf7 100644
--- a/Simplenote/Classes/SPEntryListViewController.m
+++ b/Simplenote/Classes/SPEntryListViewController.m
@@ -14,6 +14,7 @@
 static NSString *cellIdentifier = @"primaryCell";
 static NSString *autoCompleteCellIdentifier = @"autoCompleteCell";
 static CGFloat const EntryListTextFieldSidePadding = 15;
+static CGFloat const EntryListCellHeight = 44;
 
 @implementation SPEntryListViewController
 
@@ -31,7 +32,7 @@ - (void)viewDidLoad {
 - (void)viewWillAppear:(BOOL)animated {
     
     [super viewWillAppear:animated];
-    [self.primaryTableView reloadData];
+    [primaryTableView reloadData];
 }
 
 - (void)setupViews {
@@ -39,25 +40,25 @@ - (void)setupViews {
     // setup views
     CGFloat yOrigin = self.view.safeAreaInsets.top;
     
-    self.entryFieldBackground = [[UIView alloc] initWithFrame:CGRectMake(0,
+    entryFieldBackground = [[UIView alloc] initWithFrame:CGRectMake(0,
                                                                     yOrigin,
                                                                     self.view.frame.size.width,
                                                                     EntryListCellHeight)];
-    self.entryFieldBackground.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleBottomMargin;
-    [self.view addSubview:self.entryFieldBackground];
-
+    entryFieldBackground.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleBottomMargin;
+    [self.view addSubview:entryFieldBackground];
+    
     entryTextField = [[SPTextField alloc] initWithFrame:CGRectMake(EntryListTextFieldSidePadding,
                                                                    0,
-                                                                   self.entryFieldBackground.frame.size.width - 2 * EntryListTextFieldSidePadding,
-                                                                   self.entryFieldBackground.frame.size.height)];
+                                                                   entryFieldBackground.frame.size.width - 2 * EntryListTextFieldSidePadding,
+                                                                   entryFieldBackground.frame.size.height)];
     entryTextField.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleBottomMargin;
     entryTextField.keyboardType = UIKeyboardTypeEmailAddress;
 
     entryTextField.keyboardAppearance = SPUserInterface.isDark ? UIKeyboardAppearanceDark : UIKeyboardAppearanceDefault;
     entryTextField.autocapitalizationType = UITextAutocapitalizationTypeNone;
     entryTextField.delegate = self;
-    [self.entryFieldBackground addSubview:entryTextField];
-
+    [entryFieldBackground addSubview:entryTextField];
+    
     entryFieldPlusButton = [UIButton buttonWithType:UIButtonTypeCustom];
     UIImage *pickerImage = [UIImage imageWithName:UIImageNameAdd];
     [entryFieldPlusButton setImage:pickerImage forState:UIControlStateNormal];
@@ -69,17 +70,17 @@ - (void)setupViews {
     entryTextField.rightViewMode = UITextFieldViewModeAlways;
     
     
-    self.primaryTableView = [[UITableView alloc] initWithFrame:CGRectMake(0, yOrigin + entryTextField.frame.size.height,
+    primaryTableView = [[UITableView alloc] initWithFrame:CGRectMake(0, yOrigin + entryTextField.frame.size.height,
                                                                      self.view.frame.size.width, self.view.frame.size.height - (yOrigin + entryTextField.frame.size.height))
                                                     style:UITableViewStyleGrouped];
-    self.primaryTableView.rowHeight = EntryListCellHeight;
-    self.primaryTableView.delegate = self;
-    self.primaryTableView.dataSource = self;
-    self.primaryTableView.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
-    [self.view addSubview:self.primaryTableView];
-
+    primaryTableView.rowHeight = EntryListCellHeight;
+    primaryTableView.delegate = self;
+    primaryTableView.dataSource = self;
+    primaryTableView.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
+    [self.view addSubview:primaryTableView];
     
-    [self.primaryTableView registerClass:[SPEntryListCell class]
+    
+    [primaryTableView registerClass:[SPEntryListCell class]
              forCellReuseIdentifier:cellIdentifier];
     
     [autoCompleteTableView registerClass:[SPEntryListAutoCompleteCell class]
@@ -123,7 +124,7 @@ - (void)applyDefaultStyle {
     self.view.backgroundColor = tableBackgroundColor;
     
     // entry field
-    self.entryFieldBackground.backgroundColor = tableBackgroundColor;
+    entryFieldBackground.backgroundColor = tableBackgroundColor;
     entryTextField.backgroundColor = [UIColor clearColor];
     entryTextField.font = [UIFont preferredFontForTextStyle:UIFontTextStyleBody];
     entryTextField.textColor = [UIColor simplenoteTextColor];
@@ -131,15 +132,15 @@ - (void)applyDefaultStyle {
     
     CALayer *entryFieldBorder = [[CALayer alloc] init];
     entryFieldBorder.frame = CGRectMake(0,
-                                        self.entryFieldBackground.bounds.size.height - 1.0 / [[UIScreen mainScreen] scale],
+                                        entryFieldBackground.bounds.size.height - 1.0 / [[UIScreen mainScreen] scale],
                                         MAX(self.view.frame.size.width, self.view.frame.size.height),
                                         1.0 / [[UIScreen mainScreen] scale]);
     entryFieldBorder.backgroundColor = tableSeparatorColor.CGColor;
-    [self.entryFieldBackground.layer addSublayer:entryFieldBorder];
-
+    [entryFieldBackground.layer addSublayer:entryFieldBorder];
+    
     // tableview
-    self.primaryTableView.backgroundColor = [UIColor clearColor];
-    self.primaryTableView.separatorColor = tableSeparatorColor;
+    primaryTableView.backgroundColor = [UIColor clearColor];
+    primaryTableView.separatorColor = tableSeparatorColor;
     autoCompleteTableView.backgroundColor = backgroundColor;
     autoCompleteTableView.separatorColor = tableSeparatorColor;
 }
@@ -168,7 +169,7 @@ - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
     
-    if ([tableView isEqual:self.primaryTableView])
+    if ([tableView isEqual:primaryTableView])
         return 0; // this is implemented by subclassing
     else if ([tableView isEqual:autoCompleteTableView])
         return _autoCompleteDataSource.count;
@@ -191,8 +192,8 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     
     UITableViewCell *finalCell;
     
-    if ([tableView isEqual:self.primaryTableView]) {
-
+    if ([tableView isEqual:primaryTableView]) {
+        
         
         SPEntryListCell *cell = (SPEntryListCell *)[tableView dequeueReusableCellWithIdentifier:cellIdentifier];
         if (!cell) {
@@ -219,7 +220,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 
 - (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath {
     
-    return [tableView isEqual:self.primaryTableView] ? YES : NO;
+    return [tableView isEqual:primaryTableView] ? YES : NO;
 }
 
 - (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath {
@@ -237,10 +238,10 @@ - (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEd
     if (editingStyle == UITableViewCellEditingStyleDelete) {
 
         [self removeItemFromDataSourceAtIndexPath:indexPath];
-        [self.primaryTableView beginUpdates];
-        [self.primaryTableView deleteRowsAtIndexPaths:@[indexPath]
+        [primaryTableView beginUpdates];
+        [primaryTableView deleteRowsAtIndexPaths:@[indexPath]
                                 withRowAnimation:UITableViewRowAnimationLeft];
-        [self.primaryTableView endUpdates];
+        [primaryTableView endUpdates];
     }
 }
 - (void)removeItemFromDataSourceAtIndexPath:(NSIndexPath *)indexPath {
@@ -294,7 +295,7 @@ - (void)updatedAutoCompleteMatches {
 
 - (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView {
     
-    if ([scrollView isEqual:self.primaryTableView])
+    if ([scrollView isEqual:primaryTableView])
         [entryTextField resignFirstResponder];    
 }
 
diff --git a/Simplenote/SPAddCollaboratorsViewController.swift b/Simplenote/SPAddCollaboratorsViewController.swift
deleted file mode 100644
index 8b370606f..000000000
--- a/Simplenote/SPAddCollaboratorsViewController.swift
+++ /dev/null
@@ -1,54 +0,0 @@
-//
-//  SPAddCollaboratorsViewController.swift
-//  Simplenote
-//
-//  Created by Charlie Scheer on 4/24/24.
-//  Copyright © 2024 Automattic. All rights reserved.
-//
-
-import Foundation
-import UIKit
-
-extension SPAddCollaboratorsViewController {
-    @objc
-    func setupBannerView() {
-        bannerView = BannerView.instantiateFromNib()
-        bannerView.refreshInterface(with: .collaborationRetirement)
-        bannerView.onPress = {
-            guard let url = URL(string: "https://simplenote.com/2024/05/01/collaboration-feature-retirement") else {
-                return
-            }
-
-            UIApplication.shared.open(url)
-        }
-
-        view.addSubview(bannerView)
-    }
-
-    @objc
-    func setupViewContraints() {
-        bannerView.translatesAutoresizingMaskIntoConstraints = false
-        primaryTableView.translatesAutoresizingMaskIntoConstraints = false
-        entryFieldBackground.translatesAutoresizingMaskIntoConstraints = false
-
-        NSLayoutConstraint.activate([
-            bannerView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
-            bannerView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
-            bannerView.topAnchor.constraint(equalTo: view.topAnchor),
-            bannerView.bottomAnchor.constraint(equalTo: entryFieldBackground.topAnchor)
-        ])
-
-        NSLayoutConstraint.activate([
-            entryFieldBackground.leadingAnchor.constraint(equalTo: view.leadingAnchor),
-            entryFieldBackground.trailingAnchor.constraint(equalTo: view.trailingAnchor),
-            entryFieldBackground.heightAnchor.constraint(equalToConstant: EntryListCellHeight)
-        ])
-
-        NSLayoutConstraint.activate([
-            primaryTableView.topAnchor.constraint(equalTo: entryFieldBackground.bottomAnchor),
-            primaryTableView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
-            primaryTableView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
-            primaryTableView.bottomAnchor.constraint(equalTo: view.bottomAnchor)
-        ])
-    }
-}

From 654c005103dcb10c37a179c78c75eff508ab3df0 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Tue, 14 May 2024 17:16:04 -0600
Subject: [PATCH 171/547] Fixed issue where the open new note and open note
 shortcuts failed

---
 Simplenote/Classes/ActivityType.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Simplenote/Classes/ActivityType.swift b/Simplenote/Classes/ActivityType.swift
index e3c066138..b303b2969 100644
--- a/Simplenote/Classes/ActivityType.swift
+++ b/Simplenote/Classes/ActivityType.swift
@@ -11,12 +11,12 @@ enum ActivityType: String {
     /// New Note Activity
     ///
     case newNote = "com.codality.NotationalFlow.newNote"
-    case newNoteShortcut = "SPOpenNewNoteIntent"
+    case newNoteShortcut = "OpenNewNoteIntent"
 
     /// Open a Note!
     ///
     case openNote = "com.codality.NotationalFlow.openNote"
-    case openNoteShortcut = "SPOpenNoteIntent"
+    case openNoteShortcut = "OpenNoteIntent"
 
     /// Open an Item that was indexed by Spotlight
     ///

From 406430041869e004d37f3ba04dba8238f0a6bf19 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Tue, 14 May 2024 17:16:28 -0600
Subject: [PATCH 172/547] Stopped shortcuts from applying a selected tag when
 making note

---
 Simplenote/Classes/ShortcutsHandler.swift |  4 ++--
 Simplenote/SPAppDelegate+Extensions.swift | 24 ++++++++++++++++++-----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/Simplenote/Classes/ShortcutsHandler.swift b/Simplenote/Classes/ShortcutsHandler.swift
index 27b309d21..b347cabe1 100644
--- a/Simplenote/Classes/ShortcutsHandler.swift
+++ b/Simplenote/Classes/ShortcutsHandler.swift
@@ -49,7 +49,7 @@ class ShortcutsHandler: NSObject {
         case .launch:
             break
         case .newNote, .newNoteShortcut:
-            SPAppDelegate.shared().presentNewNoteEditor()
+            SPAppDelegate.shared().presentNewNoteEditor(useSelectedTag: false)
         case .openNote, .openSpotlightItem:
             presentNote(for: userActivity)
         case .openNoteShortcut:
@@ -105,7 +105,7 @@ extension ShortcutsHandler {
         case .search:
             SPAppDelegate.shared().presentSearch()
         case .newNote:
-            SPAppDelegate.shared().presentNewNoteEditor()
+            SPAppDelegate.shared().presentNewNoteEditor(useSelectedTag: false)
         case .note:
             if let simperiumKey = shortcut.userInfo?[shortcutUserInfoNoteIdentifierKey] as? String {
                 SPAppDelegate.shared().presentNoteWithSimperiumKey(simperiumKey)
diff --git a/Simplenote/SPAppDelegate+Extensions.swift b/Simplenote/SPAppDelegate+Extensions.swift
index f9bee8541..ad1a84a44 100644
--- a/Simplenote/SPAppDelegate+Extensions.swift
+++ b/Simplenote/SPAppDelegate+Extensions.swift
@@ -151,13 +151,17 @@ extension SPAppDelegate {
     /// Opens editor with a new note
     ///
     @objc
-    func presentNewNoteEditor(animated: Bool = false) {
-        if isPresentingPasscodeLock && SPPinLockManager.shared.isEnabled {
-            verifyController?.addOnSuccesBlock {
+    func presentNewNoteEditor(useSelectedTag: Bool = true, animated: Bool = false) {
+        performActionAfterUnlock {
+            if useSelectedTag {
                 self.presentNote(nil, animated: animated)
+            } else {
+                // If we use the standard new note option and a tag is selected then the tag is applied
+                // in some cases, like shortcuts, we don't want it do apply the tag cause you can't see
+                // what tag is selected when the shortcut runs
+                let note = SPObjectManager.shared().newDefaultNote()
+                self.presentNote(note, animated: true)
             }
-        } else {
-            presentNote(nil, animated: animated)
         }
     }
 
@@ -204,6 +208,16 @@ extension SPAppDelegate {
     func setupNoticeController() {
         NoticeController.shared.setupNoticeController()
     }
+
+    func performActionAfterUnlock(action: @escaping () -> Void) {
+        if isPresentingPasscodeLock && SPPinLockManager.shared.isEnabled {
+            verifyController?.addOnSuccesBlock {
+                action()
+            }
+        } else {
+            action()
+        }
+    }
 }
 
 // MARK: - UIViewControllerRestoration

From 0c3916377e1f6b0da3988806867c264caa6570c4 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Tue, 14 May 2024 17:20:19 -0600
Subject: [PATCH 173/547] Fixed the new note widget still applying the selected
 tag

---
 Simplenote/SPAppDelegate+Extensions.swift | 5 +++++
 Simplenote/SPAppDelegate.m                | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Simplenote/SPAppDelegate+Extensions.swift b/Simplenote/SPAppDelegate+Extensions.swift
index ad1a84a44..a2babfdfa 100644
--- a/Simplenote/SPAppDelegate+Extensions.swift
+++ b/Simplenote/SPAppDelegate+Extensions.swift
@@ -165,6 +165,11 @@ extension SPAppDelegate {
         }
     }
 
+    @objc
+    func presentNewNoteEditor(animated: Bool = false) {
+        presentNewNoteEditor(useSelectedTag: true, animated: animated)
+    }
+
     var verifyController: PinLockVerifyController? {
         (pinLockWindow?.rootViewController as? PinLockViewController)?.controller as? PinLockVerifyController
     }
diff --git a/Simplenote/SPAppDelegate.m b/Simplenote/SPAppDelegate.m
index d0b1359b6..847d1c47b 100644
--- a/Simplenote/SPAppDelegate.m
+++ b/Simplenote/SPAppDelegate.m
@@ -508,7 +508,7 @@ - (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDiction
     }
 
     if ([[components host] isEqualToString:@"widgetNew"]) {
-        [self presentNewNoteEditorWithAnimated: NO];
+        [self presentNewNoteEditorWithUseSelectedTag:NO animated:NO];
     }
 
     return YES;

From b1c16dc7c21fd5e0557bd2de78ea96661b278332 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Wed, 15 May 2024 10:12:58 -0600
Subject: [PATCH 174/547] Preserve tableView selection when app entering
 background

---
 .../Classes/SPNoteListViewController+Extensions.swift    | 9 +++++++++
 Simplenote/SPAppDelegate.m                               | 8 ++++++++
 2 files changed, 17 insertions(+)

diff --git a/Simplenote/Classes/SPNoteListViewController+Extensions.swift b/Simplenote/Classes/SPNoteListViewController+Extensions.swift
index 6714ec1a0..ac146c240 100644
--- a/Simplenote/Classes/SPNoteListViewController+Extensions.swift
+++ b/Simplenote/Classes/SPNoteListViewController+Extensions.swift
@@ -697,6 +697,15 @@ extension SPNoteListViewController {
             return count > 0 ? Localization.selectedTitle(with: count) : notesListController.filter.title
         }()
     }
+
+    @objc
+    func selectRows(with indexPaths: [IndexPath]) {
+        guard isEditing else {
+            return
+        }
+
+        indexPaths.forEach({ tableView.selectRow(at: $0, animated: false, scrollPosition: .none) })
+    }
 }
 
 // MARK: - Row Actions
diff --git a/Simplenote/SPAppDelegate.m b/Simplenote/SPAppDelegate.m
index d0b1359b6..6619704be 100644
--- a/Simplenote/SPAppDelegate.m
+++ b/Simplenote/SPAppDelegate.m
@@ -41,6 +41,7 @@
 @interface SPAppDelegate ()
 
 @property (weak,   nonatomic) SPModalActivityIndicator      *signOutActivityIndicator;
+@property (nonatomic) NSArray *selectedNotesEnteringBackground;
 
 @end
 
@@ -189,12 +190,19 @@ - (void)applicationDidEnterBackground:(UIApplication *)application
     [self cleanupScrollPositionCache];
     [self syncWidgetDefaults];
     [self resetWidgetTimelines];
+
+    self.selectedNotesEnteringBackground = self.noteListViewController.tableView.indexPathsForSelectedRows;
 }
 
 - (void)applicationWillEnterForeground:(UIApplication *)application
 {
     [self dismissPasscodeLockIfPossible];
     [self authenticateSimperiumIfAccountDeletionRequested];
+
+    if (self.selectedNotesEnteringBackground != nil) {
+        [self.noteListViewController selectRowsWith:self.selectedNotesEnteringBackground];
+        self.selectedNotesEnteringBackground = nil;
+    }
 }
 
 - (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray<id<UIUserActivityRestoring>> * _Nullable))restorationHandler

From 4d0bee54b70bee135b6ad1aa2feaf41a70ea5992 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Wed, 15 May 2024 10:17:32 -0600
Subject: [PATCH 175/547] Updated release notes PR 1594 Fixed notes selection
 lost on background

---
 RELEASE-NOTES.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 991a8d7ed..243c0b600 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,6 +1,7 @@
 4.52
 -----
 - Extended support for iOS Shortcuts
+- Fixed issue where notes selection was lost when app backgrounded
 
 4.51
 -----

From 27ab84b7bb82beb01dd5e8d1586f5838f012dc5f Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Wed, 15 May 2024 16:09:12 -0600
Subject: [PATCH 176/547] Refactored restoring selected notes so note list
 handles restoring

---
 .../Classes/SPNoteListViewController+Extensions.swift    | 7 +++++++
 Simplenote/Classes/SPNoteListViewController.h            | 1 +
 Simplenote/Classes/SPNoteListViewController.m            | 9 +++++++++
 Simplenote/SPAppDelegate.m                               | 9 +--------
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/Simplenote/Classes/SPNoteListViewController+Extensions.swift b/Simplenote/Classes/SPNoteListViewController+Extensions.swift
index ac146c240..c7478e309 100644
--- a/Simplenote/Classes/SPNoteListViewController+Extensions.swift
+++ b/Simplenote/Classes/SPNoteListViewController+Extensions.swift
@@ -699,6 +699,13 @@ extension SPNoteListViewController {
     }
 
     @objc
+    func restoreSelectedRowsAfterBackgrounding() {
+        if selectedNotesEnteringBackground.isEmpty == false {
+            selectRows(with: selectedNotesEnteringBackground)
+            selectedNotesEnteringBackground.removeAll()
+        }
+    }
+
     func selectRows(with indexPaths: [IndexPath]) {
         guard isEditing else {
             return
diff --git a/Simplenote/Classes/SPNoteListViewController.h b/Simplenote/Classes/SPNoteListViewController.h
index ad058d11c..b9fc20b7e 100644
--- a/Simplenote/Classes/SPNoteListViewController.h
+++ b/Simplenote/Classes/SPNoteListViewController.h
@@ -33,6 +33,7 @@
 @property (nonatomic, strong) UIBarButtonItem                               *selectAllButton;
 @property (nonatomic, weak) Note                                            *selectedNote;
 @property (nonatomic) BOOL                                                  navigatingUsingKeyboard;
+@property (nonatomic) NSArray<NSIndexPath *>                                *selectedNotesEnteringBackground;
 
 - (void)update;
 - (void)openNote:(Note *)note animated:(BOOL)animated;
diff --git a/Simplenote/Classes/SPNoteListViewController.m b/Simplenote/Classes/SPNoteListViewController.m
index 9493b4881..5a04ad7ff 100644
--- a/Simplenote/Classes/SPNoteListViewController.m
+++ b/Simplenote/Classes/SPNoteListViewController.m
@@ -63,6 +63,8 @@ - (instancetype)init {
         [self refreshStyle];
         [self update];
         self.mustScrollToFirstRow = YES;
+
+        self.selectedNotesEnteringBackground = [NSArray new];
     }
     
     return self;
@@ -192,6 +194,9 @@ - (void)startListeningToNotifications {
 
     // Themes
     [nc addObserver:self selector:@selector(themeDidChange) name:SPSimplenoteThemeChangedNotification object:nil];
+
+    // App Background
+    [nc addObserver:self selector:@selector(appWillEnterBackground) name:UIApplicationDidEnterBackgroundNotification object:nil];
 }
 
 - (void)condensedPreferenceWasUpdated:(id)sender
@@ -213,6 +218,10 @@ - (void)themeDidChange {
     [self refreshStyle];
 }
 
+- (void)appWillEnterBackground {
+    self.selectedNotesEnteringBackground = self.tableView.indexPathsForSelectedRows;
+}
+
 - (void)refreshStyle {
     // Refresh the containerView's backgroundColor
     self.view.backgroundColor = [UIColor simplenoteBackgroundColor];
diff --git a/Simplenote/SPAppDelegate.m b/Simplenote/SPAppDelegate.m
index 6619704be..2e1d5450a 100644
--- a/Simplenote/SPAppDelegate.m
+++ b/Simplenote/SPAppDelegate.m
@@ -41,7 +41,6 @@
 @interface SPAppDelegate ()
 
 @property (weak,   nonatomic) SPModalActivityIndicator      *signOutActivityIndicator;
-@property (nonatomic) NSArray *selectedNotesEnteringBackground;
 
 @end
 
@@ -190,19 +189,13 @@ - (void)applicationDidEnterBackground:(UIApplication *)application
     [self cleanupScrollPositionCache];
     [self syncWidgetDefaults];
     [self resetWidgetTimelines];
-
-    self.selectedNotesEnteringBackground = self.noteListViewController.tableView.indexPathsForSelectedRows;
 }
 
 - (void)applicationWillEnterForeground:(UIApplication *)application
 {
     [self dismissPasscodeLockIfPossible];
     [self authenticateSimperiumIfAccountDeletionRequested];
-
-    if (self.selectedNotesEnteringBackground != nil) {
-        [self.noteListViewController selectRowsWith:self.selectedNotesEnteringBackground];
-        self.selectedNotesEnteringBackground = nil;
-    }
+    [self.noteListViewController restoreSelectedRowsAfterBackgrounding];
 }
 
 - (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray<id<UIUserActivityRestoring>> * _Nullable))restorationHandler

From de09d0d019a10cceb1648fa1268cafdf93a8936f Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Wed, 15 May 2024 16:16:54 -0600
Subject: [PATCH 177/547] Fixed a couple of warnings

---
 Simplenote/Classes/SPNoteListViewController.m | 2 --
 Simplenote/URL+Simplenote.swift               | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Simplenote/Classes/SPNoteListViewController.m b/Simplenote/Classes/SPNoteListViewController.m
index 5a04ad7ff..9c12f79d7 100644
--- a/Simplenote/Classes/SPNoteListViewController.m
+++ b/Simplenote/Classes/SPNoteListViewController.m
@@ -529,8 +529,6 @@ - (void)update
     [self refreshTitle];
     [self refreshSearchBar];
 
-    BOOL isTrashOnScreen = self.isDeletedFilterActive;
-
     [self refreshEmptyTrashState];
     
     [self displayPlaceholdersIfNeeded];
diff --git a/Simplenote/URL+Simplenote.swift b/Simplenote/URL+Simplenote.swift
index 42895a6fd..b2a976f60 100644
--- a/Simplenote/URL+Simplenote.swift
+++ b/Simplenote/URL+Simplenote.swift
@@ -29,7 +29,7 @@ extension URL {
     }
 
     static func newNoteWidgetURL() -> URL {
-        guard var components = URLComponents.simplenoteURLComponents(with: Constants.newNotePath) else {
+        guard let components = URLComponents.simplenoteURLComponents(with: Constants.newNotePath) else {
             return URL(string: .simplenotePath())!
         }
 

From 14904c8ca6041b0ec591d8d252078f2ceecd7c95 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Wed, 15 May 2024 16:51:22 -0600
Subject: [PATCH 178/547] fixed an issue can activate the faceid switch without
 a passcode

---
 Simplenote/Classes/SPSettingsViewController+Extensions.swift | 1 +
 Simplenote/Classes/SPSettingsViewController.h                | 3 ++-
 Simplenote/Classes/SPSettingsViewController.m                | 5 ++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Simplenote/Classes/SPSettingsViewController+Extensions.swift b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
index abd05fa21..e6cdb916c 100644
--- a/Simplenote/Classes/SPSettingsViewController+Extensions.swift
+++ b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
@@ -87,6 +87,7 @@ extension SPSettingsViewController: PinLockSetupControllerDelegate {
     func pinLockSetupControllerDidComplete(_ controller: PinLockSetupController) {
         SPTracker.trackSettingsPinlockEnabled(true)
         dismissPresentedViewController()
+        SPPinLockManager.shared.shouldUseBiometry = biometrySwitch.isOn
     }
 
     func pinLockSetupControllerDidCancel(_ controller: PinLockSetupController) {
diff --git a/Simplenote/Classes/SPSettingsViewController.h b/Simplenote/Classes/SPSettingsViewController.h
index fcad4f121..5c38a03f0 100644
--- a/Simplenote/Classes/SPSettingsViewController.h
+++ b/Simplenote/Classes/SPSettingsViewController.h
@@ -2,12 +2,13 @@
 #import "SPTableViewController.h"
 
 @interface SPSettingsViewController : SPTableViewController <UIPickerViewDelegate, UIPickerViewDataSource> {
-    
     //Preferences
     NSNumber *sortOrderPref;
     NSNumber *numPreviewLinesPref;
 }
 
+@property (nonatomic, strong) UISwitch      *biometrySwitch;
+
 @end
 
 extern NSString *const SPAlphabeticalTagSortPref;
diff --git a/Simplenote/Classes/SPSettingsViewController.m b/Simplenote/Classes/SPSettingsViewController.m
index df788f9dd..bb6d9706a 100644
--- a/Simplenote/Classes/SPSettingsViewController.m
+++ b/Simplenote/Classes/SPSettingsViewController.m
@@ -14,7 +14,6 @@
 @interface SPSettingsViewController ()
 @property (nonatomic, strong) UISwitch      *condensedNoteListSwitch;
 @property (nonatomic, strong) UISwitch      *alphabeticalTagSortSwitch;
-@property (nonatomic, strong) UISwitch      *biometrySwitch;
 @property (nonatomic, strong) UISwitch      *sustainerIconSwitch;
 @property (nonatomic, strong) UITextField   *pinTimeoutTextField;
 @property (nonatomic, strong) UIPickerView  *pinTimeoutPickerView;
@@ -747,11 +746,11 @@ - (void)tagSortSwitchDidChangeValue:(UISwitch *)sender
 
 - (void)touchIdSwitchDidChangeValue:(UISwitch *)sender
 {
-    SPPinLockManager.shared.shouldUseBiometry = sender.on;
-
     if (![self isPinLockEnabled] && [self.biometrySwitch isOn]) {
         UIAlertController* alert = [self pinLockRequiredAlert];
         [self presentViewController:alert animated:YES completion:nil];
+    } else {
+        SPPinLockManager.shared.shouldUseBiometry = sender.on;
     }
 }
 

From e14ea53a52d9b9a7aab2dd27a5b35053c7b2f88d Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Wed, 15 May 2024 16:54:54 -0600
Subject: [PATCH 179/547] Updated release notes: can activate the faceid switch
 without a passcode

---
 RELEASE-NOTES.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 991a8d7ed..e21298be1 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,6 +1,7 @@
 4.52
 -----
 - Extended support for iOS Shortcuts
+- Fixed an issue can activate the faceid switch without a passcode
 
 4.51
 -----

From 2aef8a50f7e3d799d898eda3661a5441b6c1bfa9 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 16 May 2024 11:28:11 -0600
Subject: [PATCH 180/547] Refactored pinlockdelegate always enable
 shouldUseBiometry on complete

---
 Simplenote/Classes/SPSettingsViewController+Extensions.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Simplenote/Classes/SPSettingsViewController+Extensions.swift b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
index e6cdb916c..a07f8d4e9 100644
--- a/Simplenote/Classes/SPSettingsViewController+Extensions.swift
+++ b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
@@ -87,7 +87,7 @@ extension SPSettingsViewController: PinLockSetupControllerDelegate {
     func pinLockSetupControllerDidComplete(_ controller: PinLockSetupController) {
         SPTracker.trackSettingsPinlockEnabled(true)
         dismissPresentedViewController()
-        SPPinLockManager.shared.shouldUseBiometry = biometrySwitch.isOn
+        SPPinLockManager.shared.shouldUseBiometry = true
     }
 
     func pinLockSetupControllerDidCancel(_ controller: PinLockSetupController) {

From 928062db393b88f228a0ad09573a39b5fe01d3b9 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 16 May 2024 11:29:53 -0600
Subject: [PATCH 181/547] removed exposure of biometry switch.  Wasn't needed

---
 Simplenote/Classes/SPSettingsViewController.h | 2 --
 Simplenote/Classes/SPSettingsViewController.m | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Simplenote/Classes/SPSettingsViewController.h b/Simplenote/Classes/SPSettingsViewController.h
index 5c38a03f0..301f929a0 100644
--- a/Simplenote/Classes/SPSettingsViewController.h
+++ b/Simplenote/Classes/SPSettingsViewController.h
@@ -7,8 +7,6 @@
     NSNumber *numPreviewLinesPref;
 }
 
-@property (nonatomic, strong) UISwitch      *biometrySwitch;
-
 @end
 
 extern NSString *const SPAlphabeticalTagSortPref;
diff --git a/Simplenote/Classes/SPSettingsViewController.m b/Simplenote/Classes/SPSettingsViewController.m
index bb6d9706a..ee90df625 100644
--- a/Simplenote/Classes/SPSettingsViewController.m
+++ b/Simplenote/Classes/SPSettingsViewController.m
@@ -14,6 +14,7 @@
 @interface SPSettingsViewController ()
 @property (nonatomic, strong) UISwitch      *condensedNoteListSwitch;
 @property (nonatomic, strong) UISwitch      *alphabeticalTagSortSwitch;
+@property (nonatomic, strong) UISwitch      *biometrySwitch;
 @property (nonatomic, strong) UISwitch      *sustainerIconSwitch;
 @property (nonatomic, strong) UITextField   *pinTimeoutTextField;
 @property (nonatomic, strong) UIPickerView  *pinTimeoutPickerView;

From ab009a0a2f66c341a23990c2f7f5e86f72fd73d1 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 16 May 2024 11:33:51 -0600
Subject: [PATCH 182/547] Refactored SPNotelist to restore selected notes
 without the app delegate

---
 Simplenote/Classes/SPNoteListViewController.m | 5 +++++
 Simplenote/SPAppDelegate.m                    | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Simplenote/Classes/SPNoteListViewController.m b/Simplenote/Classes/SPNoteListViewController.m
index 9c12f79d7..f2148c518 100644
--- a/Simplenote/Classes/SPNoteListViewController.m
+++ b/Simplenote/Classes/SPNoteListViewController.m
@@ -197,6 +197,7 @@ - (void)startListeningToNotifications {
 
     // App Background
     [nc addObserver:self selector:@selector(appWillEnterBackground) name:UIApplicationDidEnterBackgroundNotification object:nil];
+    [nc addObserver:self selector:@selector(appWillEnterForeground) name:UIApplicationWillEnterForegroundNotification object:nil];
 }
 
 - (void)condensedPreferenceWasUpdated:(id)sender
@@ -222,6 +223,10 @@ - (void)appWillEnterBackground {
     self.selectedNotesEnteringBackground = self.tableView.indexPathsForSelectedRows;
 }
 
+- (void)appWillEnterForeground {
+    [self restoreSelectedRowsAfterBackgrounding];
+}
+
 - (void)refreshStyle {
     // Refresh the containerView's backgroundColor
     self.view.backgroundColor = [UIColor simplenoteBackgroundColor];
diff --git a/Simplenote/SPAppDelegate.m b/Simplenote/SPAppDelegate.m
index 2e1d5450a..d0b1359b6 100644
--- a/Simplenote/SPAppDelegate.m
+++ b/Simplenote/SPAppDelegate.m
@@ -195,7 +195,6 @@ - (void)applicationWillEnterForeground:(UIApplication *)application
 {
     [self dismissPasscodeLockIfPossible];
     [self authenticateSimperiumIfAccountDeletionRequested];
-    [self.noteListViewController restoreSelectedRowsAfterBackgrounding];
 }
 
 - (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray<id<UIUserActivityRestoring>> * _Nullable))restorationHandler

From 91d42bf7a5f5a7c2fd217be7ed468565cb5e16ad Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Thu, 6 Jun 2024 16:57:05 -0300
Subject: [PATCH 183/547] SPNoteListViewController+Extensions: Prevents force
 unwrap a nil property

---
 .../Classes/SPNoteListViewController+Extensions.swift     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Simplenote/Classes/SPNoteListViewController+Extensions.swift b/Simplenote/Classes/SPNoteListViewController+Extensions.swift
index c7478e309..dbd1d8eff 100644
--- a/Simplenote/Classes/SPNoteListViewController+Extensions.swift
+++ b/Simplenote/Classes/SPNoteListViewController+Extensions.swift
@@ -700,10 +700,12 @@ extension SPNoteListViewController {
 
     @objc
     func restoreSelectedRowsAfterBackgrounding() {
-        if selectedNotesEnteringBackground.isEmpty == false {
-            selectRows(with: selectedNotesEnteringBackground)
-            selectedNotesEnteringBackground.removeAll()
+        guard let selectedNotesEnteringBackground, selectedNotesEnteringBackground.isEmpty == false else {
+            return
         }
+
+        selectRows(with: selectedNotesEnteringBackground)
+        self.selectedNotesEnteringBackground = []
     }
 
     func selectRows(with indexPaths: [IndexPath]) {

From 20141f9293b68e0b403d77b88d653027a847ac3c Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Thu, 6 Jun 2024 19:47:57 -0300
Subject: [PATCH 184/547] New Tracks Events

---
 Simplenote/Classes/SPTracker.h | 1 +
 Simplenote/Classes/SPTracker.m | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/Simplenote/Classes/SPTracker.h b/Simplenote/Classes/SPTracker.h
index 23e4f8ef8..a0804bfd5 100644
--- a/Simplenote/Classes/SPTracker.h
+++ b/Simplenote/Classes/SPTracker.h
@@ -81,6 +81,7 @@
 #pragma mark - User
 + (void)trackUserAccountCreated;
 + (void)trackUserSignedIn;
++ (void)trackUserRequestedLoginLink;
 + (void)trackUserSignedOut;
 
 #pragma mark - WP.com Sign In
diff --git a/Simplenote/Classes/SPTracker.m b/Simplenote/Classes/SPTracker.m
index 83e656a21..a4872fb83 100644
--- a/Simplenote/Classes/SPTracker.m
+++ b/Simplenote/Classes/SPTracker.m
@@ -317,6 +317,11 @@ + (void)trackUserSignedIn
     [self trackAutomatticEventWithName:@"user_signed_in" properties:nil];
 }
 
++ (void)trackUserRequestedLoginLink
+{
+    [self trackAutomatticEventWithName:@"user_requested_login_link" properties:nil];
+}
+
 + (void)trackUserSignedOut
 {
     [self trackAutomatticEventWithName:@"user_signed_out" properties:nil];

From 21d9006f8a88ed4a58b0d42887d86efbd8cbb109 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Thu, 6 Jun 2024 19:50:56 -0300
Subject: [PATCH 185/547] Implements LoginRemote

---
 Simplenote.xcodeproj/project.pbxproj   | 10 +++++---
 Simplenote/Classes/SPAuthHandler.swift | 14 +++++++++++
 Simplenote/LoginRemote.swift           | 34 ++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 Simplenote/LoginRemote.swift

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index c4d3df429..2046d04ef 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -308,6 +308,7 @@
 		B55E428C22A1A4550018C0CE /* SPSortOrderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B55E428B22A1A4550018C0CE /* SPSortOrderViewController.swift */; };
 		B56315BE236BD9970066C151 /* UIKitConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AB169B22FB2DF300B4EBA5 /* UIKitConstants.swift */; };
 		B5686178195B9E93005F1245 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E2F149471799F5A500DC9690 /* libsqlite3.dylib */; };
+		B5699B092C1246C40096D6B7 /* LoginRemote.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5699B082C1246C40096D6B7 /* LoginRemote.swift */; };
 		B56A695822F9CD1500B90398 /* SPOnboardingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = B56A695622F9CD1500B90398 /* SPOnboardingViewController.xib */; };
 		B56A695922F9CD1500B90398 /* SPOnboardingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56A695722F9CD1500B90398 /* SPOnboardingViewController.swift */; };
 		B56A695B22F9CD4E00B90398 /* UINavigationBar+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56A695A22F9CD4E00B90398 /* UINavigationBar+Simplenote.swift */; };
@@ -509,13 +510,13 @@
 		BA8FC2A5267AC7470082962E /* SharedStorageMigrator.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA8FC2A4267AC7470082962E /* SharedStorageMigrator.swift */; };
 		BA9B19F926A8EF3200692366 /* SpinnerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9B19F826A8EF3200692366 /* SpinnerViewController.swift */; };
 		BA9B59022685549F00DAD1ED /* StorageSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9B59012685549F00DAD1ED /* StorageSettings.swift */; };
-		BA9C7EFB2BF2CC3E007A8460 /* Downloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9C7EFA2BF2CC3E007A8460 /* Downloader.swift */; };
-		BA9C7EFC2BF2CCAE007A8460 /* Downloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9C7EFA2BF2CC3E007A8460 /* Downloader.swift */; };
 		BA9C7EC92BED7AB1007A8460 /* CopyNoteContentIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9C7EC82BED7AB1007A8460 /* CopyNoteContentIntentHandler.swift */; };
 		BA9C7ECB2BED7F7B007A8460 /* FindNoteWithTagIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9C7ECA2BED7F7B007A8460 /* FindNoteWithTagIntentHandler.swift */; };
 		BA9C7ECD2BED813B007A8460 /* IntentTag+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9C7ECC2BED813B007A8460 /* IntentTag+Helpers.swift */; };
 		BA9C7ED02BEE9BA7007A8460 /* ShortcutIntents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = BA9C7ECF2BEE9BA7007A8460 /* ShortcutIntents.intentdefinition */; };
 		BA9C7ED12BEE9BA7007A8460 /* ShortcutIntents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = BA9C7ECF2BEE9BA7007A8460 /* ShortcutIntents.intentdefinition */; };
+		BA9C7EFB2BF2CC3E007A8460 /* Downloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9C7EFA2BF2CC3E007A8460 /* Downloader.swift */; };
+		BA9C7EFC2BF2CCAE007A8460 /* Downloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9C7EFA2BF2CC3E007A8460 /* Downloader.swift */; };
 		BAA4856925D5E40900F3BDB9 /* SearchQuery+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAA4856825D5E40900F3BDB9 /* SearchQuery+Simplenote.swift */; };
 		BAA59E79269F9FE30068BD3D /* Date+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAA59E78269F9FE30068BD3D /* Date+Simplenote.swift */; };
 		BAA63C3325EEDA83001589D7 /* NoteLinkTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAA63C3225EEDA83001589D7 /* NoteLinkTests.swift */; };
@@ -1013,6 +1014,7 @@
 		B55E428B22A1A4550018C0CE /* SPSortOrderViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SPSortOrderViewController.swift; path = Classes/SPSortOrderViewController.swift; sourceTree = "<group>"; };
 		B5651239243BC063001EFE77 /* fa */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fa; path = fa.lproj/Localizable.strings; sourceTree = "<group>"; };
 		B566A1DD189AA74600DC3F2D /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; };
+		B5699B082C1246C40096D6B7 /* LoginRemote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginRemote.swift; sourceTree = "<group>"; };
 		B56A695622F9CD1500B90398 /* SPOnboardingViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = SPOnboardingViewController.xib; path = Classes/SPOnboardingViewController.xib; sourceTree = "<group>"; };
 		B56A695722F9CD1500B90398 /* SPOnboardingViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SPOnboardingViewController.swift; path = Classes/SPOnboardingViewController.swift; sourceTree = "<group>"; };
 		B56A695A22F9CD4E00B90398 /* UINavigationBar+Simplenote.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "UINavigationBar+Simplenote.swift"; path = "Classes/UINavigationBar+Simplenote.swift"; sourceTree = "<group>"; };
@@ -1199,7 +1201,6 @@
 		BA8FC2A4267AC7470082962E /* SharedStorageMigrator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharedStorageMigrator.swift; sourceTree = "<group>"; };
 		BA9B19F826A8EF3200692366 /* SpinnerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpinnerViewController.swift; sourceTree = "<group>"; };
 		BA9B59012685549F00DAD1ED /* StorageSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StorageSettings.swift; sourceTree = "<group>"; };
-		BA9C7EFA2BF2CC3E007A8460 /* Downloader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Downloader.swift; sourceTree = "<group>"; };
 		BA9C7EC82BED7AB1007A8460 /* CopyNoteContentIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CopyNoteContentIntentHandler.swift; sourceTree = "<group>"; };
 		BA9C7ECA2BED7F7B007A8460 /* FindNoteWithTagIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FindNoteWithTagIntentHandler.swift; sourceTree = "<group>"; };
 		BA9C7ECC2BED813B007A8460 /* IntentTag+Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "IntentTag+Helpers.swift"; sourceTree = "<group>"; };
@@ -1224,6 +1225,7 @@
 		BA9C7EF52BEE9C3D007A8460 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/ShortcutIntents.strings; sourceTree = "<group>"; };
 		BA9C7EF72BEE9C3E007A8460 /* zh-Hant-TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant-TW"; path = "zh-Hant-TW.lproj/ShortcutIntents.strings"; sourceTree = "<group>"; };
 		BA9C7EF92BEE9C3F007A8460 /* zh-Hans-CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans-CN"; path = "zh-Hans-CN.lproj/ShortcutIntents.strings"; sourceTree = "<group>"; };
+		BA9C7EFA2BF2CC3E007A8460 /* Downloader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Downloader.swift; sourceTree = "<group>"; };
 		BAA4856825D5E40900F3BDB9 /* SearchQuery+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SearchQuery+Simplenote.swift"; sourceTree = "<group>"; };
 		BAA59E78269F9FE30068BD3D /* Date+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Date+Simplenote.swift"; sourceTree = "<group>"; };
 		BAA63C3225EEDA83001589D7 /* NoteLinkTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteLinkTests.swift; sourceTree = "<group>"; };
@@ -2413,6 +2415,7 @@
 		BA57692A269D2103008B510E /* Remotes */ = {
 			isa = PBXGroup;
 			children = (
+				B5699B082C1246C40096D6B7 /* LoginRemote.swift */,
 				A6C7647F25E9131C00A39067 /* SignupRemote.swift */,
 				A6CC0B0625B8287F00F12A85 /* AccountRemote.swift */,
 				BA5768E2269A803F008B510E /* Remote.swift */,
@@ -3595,6 +3598,7 @@
 				B52BB75022CFD18F0042C162 /* UIActivity+Simplenote.swift in Sources */,
 				F9E197D42283D05C0092B3E1 /* CrashLogging.swift in Sources */,
 				BA9B59022685549F00DAD1ED /* StorageSettings.swift in Sources */,
+				B5699B092C1246C40096D6B7 /* LoginRemote.swift in Sources */,
 				DE7E545B214E34C8008D9928 /* NSString+Count.swift in Sources */,
 				A6E6CE0025A4B0A9005A92DB /* PinLockVerifyController.swift in Sources */,
 				BA55124E2600210B00D8F882 /* TimerFactory.swift in Sources */,
diff --git a/Simplenote/Classes/SPAuthHandler.swift b/Simplenote/Classes/SPAuthHandler.swift
index bf0a85a4a..a9a875bc5 100644
--- a/Simplenote/Classes/SPAuthHandler.swift
+++ b/Simplenote/Classes/SPAuthHandler.swift
@@ -53,6 +53,20 @@ class SPAuthHandler {
         })
     }
 
+    /// Requests an Authentication Magic Link
+    ///
+    func requestLoginEmail(username: String, onCompletion: @escaping (SPAuthError?) -> Void) {
+        let remote = LoginRemote()
+        remote.requestLoginEmail(with: username) { (result) in
+            switch result {
+            case .success:
+                onCompletion(nil)
+            case .failure(let error):
+                onCompletion(self.authenticationError(for: error))
+            }
+        }
+    }
+
     /// Registers a new user in the Simperium Backend.
     ///
     /// - Note: Errors are mapped into SPAuthError Instances
diff --git a/Simplenote/LoginRemote.swift b/Simplenote/LoginRemote.swift
new file mode 100644
index 000000000..6a3831584
--- /dev/null
+++ b/Simplenote/LoginRemote.swift
@@ -0,0 +1,34 @@
+//
+//  LoginRemote.swift
+//  Simplenote
+//
+//  Created by Jorge Leandro Perez on 6/6/24.
+//  Copyright © 2024 Automattic. All rights reserved.
+//
+
+import Foundation
+
+// MARK: - SignupRemote
+//
+class LoginRemote: Remote {
+
+    func requestLoginEmail(with email: String, completion: @escaping (_ result: Result<Data?, RemoteError>) -> Void) {
+        let urlRequest = request(with: email)
+
+        performDataTask(with: urlRequest, completion: completion)
+    }
+
+    private func request(with email: String) -> URLRequest {
+        let url = URL(string: SimplenoteConstants.loginURL)!
+
+        var request = URLRequest(url: url,
+                                 cachePolicy: .reloadIgnoringLocalAndRemoteCacheData,
+                                 timeoutInterval: RemoteConstants.timeout)
+
+        request.httpMethod = RemoteConstants.Method.POST
+        request.setValue("application/json", forHTTPHeaderField: "Content-Type")
+        request.httpBody = try? JSONEncoder().encode(["username": email.lowercased()])
+
+        return request
+    }
+}

From 8166562d78b1df287dc79e445cf679172c5d7495 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Thu, 6 Jun 2024 19:51:10 -0300
Subject: [PATCH 186/547] SimplenoteConstants: New constant

---
 Simplenote/Classes/SimplenoteConstants.swift | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Simplenote/Classes/SimplenoteConstants.swift b/Simplenote/Classes/SimplenoteConstants.swift
index f273e382e..d49f0a8d5 100644
--- a/Simplenote/Classes/SimplenoteConstants.swift
+++ b/Simplenote/Classes/SimplenoteConstants.swift
@@ -41,6 +41,8 @@ class SimplenoteConstants: NSObject {
     ///
     static let resetPasswordURL     = currentEngineBaseURL.appendingPathComponent("/reset/?redirect=simplenote://launch&email=")
     static let settingsURL          = currentEngineBaseURL.appendingPathComponent("/settings")
+/// TODO: FIXME
+    static let loginURL             = "https://magic-links-dot-simple-note-hrd.appspot.com/account/request-login" ////currentEngineBaseURL.appendingPathComponent("/account/request-login")
     static let signupURL            = currentEngineBaseURL.appendingPathComponent("/account/request-signup")
     static let verificationURL      = currentEngineBaseURL.appendingPathComponent("/account/verify-email/")
     static let accountDeletionURL   = currentEngineBaseURL.appendingPathComponent("/account/request-delete/")

From e1d5c04c216282b73affdd888895d93d160a96ed Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Thu, 6 Jun 2024 19:52:49 -0300
Subject: [PATCH 187/547] Updates release notes

---
 RELEASE-NOTES.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 680d9a9fb..f544d30d6 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -3,6 +3,7 @@
 - Extended support for iOS Shortcuts
 - Fixed issue where notes selection was lost when app backgrounded
 - Fixed an issue can activate the faceid switch without a passcode
+- Magic Link Login Support
 
 4.51
 -----

From 0d0699a150a047ff1b7e4cd487e2cfa3ae60e4a0 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 7 Jun 2024 11:09:46 -0300
Subject: [PATCH 188/547] SwiftLint: Disabling whitespace rules

---
 .swiftlint.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.swiftlint.yml b/.swiftlint.yml
index cf03a5a91..998f8251c 100644
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@@ -42,9 +42,9 @@ only_rules:
   - trailing_semicolon
 
   # Lines should not have trailing whitespace.
-  - trailing_whitespace
+  # - trailing_whitespace
 
-  - vertical_whitespace
+  # - vertical_whitespace
 
   - custom_rules
 

From 246da886ebe523cb62d2ab97945b5c08141ca8db Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 7 Jun 2024 11:20:48 -0300
Subject: [PATCH 189/547] SimplenoteConstants: New URL(s)

---
 Simplenote/Classes/SimplenoteConstants.swift | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Simplenote/Classes/SimplenoteConstants.swift b/Simplenote/Classes/SimplenoteConstants.swift
index d49f0a8d5..0aca91f4b 100644
--- a/Simplenote/Classes/SimplenoteConstants.swift
+++ b/Simplenote/Classes/SimplenoteConstants.swift
@@ -42,7 +42,8 @@ class SimplenoteConstants: NSObject {
     static let resetPasswordURL     = currentEngineBaseURL.appendingPathComponent("/reset/?redirect=simplenote://launch&email=")
     static let settingsURL          = currentEngineBaseURL.appendingPathComponent("/settings")
 /// TODO: FIXME
-    static let loginURL             = "https://magic-links-dot-simple-note-hrd.appspot.com/account/request-login" ////currentEngineBaseURL.appendingPathComponent("/account/request-login")
+    static let loginRequestURL      = "https://magic-links-dot-simple-note-hrd.appspot.com/account/request-login" ////currentEngineBaseURL.appendingPathComponent("/account/request-login")
+    static let loginCompletionURL   = "https://magic-links-dot-simple-note-hrd.appspot.com/account/complete-login" ////currentEngineBaseURL.appendingPathComponent("/account/complete-login")
     static let signupURL            = currentEngineBaseURL.appendingPathComponent("/account/request-signup")
     static let verificationURL      = currentEngineBaseURL.appendingPathComponent("/account/verify-email/")
     static let accountDeletionURL   = currentEngineBaseURL.appendingPathComponent("/account/request-delete/")

From b22ca5f2eaf63d61493bb3ada286918ad47f9ca9 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 7 Jun 2024 11:28:39 -0300
Subject: [PATCH 190/547] MagicLinkAuthenticator: Spliting legacy
 MagicLinkAuthenticator handler

---
 .../Classes/MagicLinkAuthenticator.swift       | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/Simplenote/Classes/MagicLinkAuthenticator.swift b/Simplenote/Classes/MagicLinkAuthenticator.swift
index 38c97012a..c4655b473 100644
--- a/Simplenote/Classes/MagicLinkAuthenticator.swift
+++ b/Simplenote/Classes/MagicLinkAuthenticator.swift
@@ -14,16 +14,30 @@ struct MagicLinkAuthenticator {
             return
         }
 
+        if attemptLoginWithToken(queryItems: queryItems) {
+            return
+        }
+
+
+// MARK: - Private API(s)
+//
+private extension MagicLinkAuthenticator {
+
+    @discardableResult
+    func attemptLoginWithToken(queryItems: [URLQueryItem]) -> Bool {
         guard let email = queryItems.base64DecodedValue(for: Constants.emailField),
               let token = queryItems.value(for: Constants.tokenField),
-              !email.isEmpty, !token.isEmpty else {
-            return
+              !email.isEmpty, !token.isEmpty
+        else {
+            return false
         }
 
         authenticator.authenticate(withUsername: email, token: token)
+        return true
     }
 }
 
+
 // MARK: - [URLQueryItem] Helper
 //
 private extension Array where Element == URLQueryItem {

From 974febbeca49a2fd2aaa0cd81254c9f53ec87261 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 7 Jun 2024 11:49:42 -0300
Subject: [PATCH 191/547] Remote: New Request API(s)

---
 Simplenote/Remote.swift      | 45 ++++++++++++++++++++++++++++++++++++
 Simplenote/RemoteError.swift |  2 ++
 2 files changed, 47 insertions(+)

diff --git a/Simplenote/Remote.swift b/Simplenote/Remote.swift
index 6b9424613..e9c119e5c 100644
--- a/Simplenote/Remote.swift
+++ b/Simplenote/Remote.swift
@@ -30,4 +30,49 @@ class Remote {
 
         dataTask.resume()
     }
+
+    /// Performs a URLSession Data Task
+    ///
+    func performDataTask(with request: URLRequest) async throws -> Data {
+        let (data, response) = try await urlSession.data(for: request)
+        let statusCode = (response as? HTTPURLResponse)?.statusCode ?? .zero
+        
+        // Check for 2xx status code
+        guard statusCode / 100 == 2 else {
+            throw RemoteError.serverError(statusCode: statusCode)
+        }
+        
+        return data
+    }
+    
+    /// Performs a URLSession Data Task, and decodes a given Type
+    ///
+    func performDataTask<T: Decodable>(with request: URLRequest, type: T.Type) async throws -> T {
+        let data = try await performDataTask(with: request)
+
+        do {
+            let decoder = JSONDecoder()
+            decoder.keyDecodingStrategy = .convertFromSnakeCase
+
+            return try decoder.decode(type, from: data)
+
+        } catch {
+            throw RemoteError.responseUnableToDecode
+        }
+    }
+    
+    /// Builds a URLRequest for the specified URL / Method / params
+    ///
+    func requestForURL(_ url: URL, method: String, httpBody: [String: String]?) -> URLRequest {
+        var request = URLRequest(url: url, cachePolicy: .reloadIgnoringLocalAndRemoteCacheData, timeoutInterval: RemoteConstants.timeout)
+
+        request.httpMethod = method
+        request.setValue("application/json", forHTTPHeaderField: "Content-Type")
+        
+        if let httpBody {
+            request.httpBody = try? JSONEncoder().encode(httpBody)
+        }
+
+        return request
+    }
 }
diff --git a/Simplenote/RemoteError.swift b/Simplenote/RemoteError.swift
index 74a96c9eb..0bc594341 100644
--- a/Simplenote/RemoteError.swift
+++ b/Simplenote/RemoteError.swift
@@ -2,6 +2,8 @@ import Foundation
 
 enum RemoteError: Error {
     case network
+    case responseUnableToDecode
+    case serverError(statusCode: Int)
     case requestError(Int, Error?)
 }
 

From 531f5ba3a6ca4f0d291f51dced67e32de3b07dfa Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 7 Jun 2024 11:49:54 -0300
Subject: [PATCH 192/547] LoginRemote: Implements login completion API(s)

---
 Simplenote/LoginRemote.swift | 49 ++++++++++++++++++++++++++----------
 1 file changed, 36 insertions(+), 13 deletions(-)

diff --git a/Simplenote/LoginRemote.swift b/Simplenote/LoginRemote.swift
index 6a3831584..ae9e5b9ac 100644
--- a/Simplenote/LoginRemote.swift
+++ b/Simplenote/LoginRemote.swift
@@ -8,27 +8,50 @@
 
 import Foundation
 
-// MARK: - SignupRemote
+// MARK: - LoginRemote
 //
 class LoginRemote: Remote {
 
-    func requestLoginEmail(with email: String, completion: @escaping (_ result: Result<Data?, RemoteError>) -> Void) {
-        let urlRequest = request(with: email)
+    func requestLoginEmail(email: String, completion: @escaping (_ result: Result<Data?, RemoteError>) -> Void) {
+        let request = requestForLoginRequest(with: email)
 
-        performDataTask(with: urlRequest, completion: completion)
+        performDataTask(with: request, completion: completion)
     }
 
-    private func request(with email: String) -> URLRequest {
-        let url = URL(string: SimplenoteConstants.loginURL)!
+    func requestSyncToken(email: String, authCode: String) async throws -> String {
+        let request = requestForLoginCompletion(email: email, authCode: authCode)
+        let response = try await performDataTask(with: request, type: LoginConfirmationResponse.self)
+        
+        return response.syncToken
+    }
+}
+
+
+// MARK: - LoginConfirmationResponse
+//
+struct LoginConfirmationResponse: Decodable {
+    let syncToken: String
+}
 
-        var request = URLRequest(url: url,
-                                 cachePolicy: .reloadIgnoringLocalAndRemoteCacheData,
-                                 timeoutInterval: RemoteConstants.timeout)
 
-        request.httpMethod = RemoteConstants.Method.POST
-        request.setValue("application/json", forHTTPHeaderField: "Content-Type")
-        request.httpBody = try? JSONEncoder().encode(["username": email.lowercased()])
+// MARK: - Private API(s)
+//
+private extension LoginRemote {
+
+    func requestForLoginRequest(with email: String) -> URLRequest {
+        let url = URL(string: SimplenoteConstants.loginRequestURL)!
+
+        return requestForURL(url, method: RemoteConstants.Method.POST, httpBody: [
+            "username": email.lowercased()
+        ])
+    }
+
+    func requestForLoginCompletion(email: String, authCode: String) -> URLRequest {
+        let url = URL(string: SimplenoteConstants.loginCompletionURL)!
 
-        return request
+        return requestForURL(url, method: RemoteConstants.Method.POST, httpBody: [
+            "username": email.lowercased(),
+            "auth_code": authCode
+        ])
     }
 }

From 80ae1cdbfff0ece11954fa6e6fef7be18180e3fd Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 7 Jun 2024 11:50:12 -0300
Subject: [PATCH 193/547] SPAuthHandler: Adjusts remote invocation

---
 Simplenote/Classes/SPAuthHandler.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Simplenote/Classes/SPAuthHandler.swift b/Simplenote/Classes/SPAuthHandler.swift
index a9a875bc5..1196d0c13 100644
--- a/Simplenote/Classes/SPAuthHandler.swift
+++ b/Simplenote/Classes/SPAuthHandler.swift
@@ -57,7 +57,7 @@ class SPAuthHandler {
     ///
     func requestLoginEmail(username: String, onCompletion: @escaping (SPAuthError?) -> Void) {
         let remote = LoginRemote()
-        remote.requestLoginEmail(with: username) { (result) in
+        remote.requestLoginEmail(email: username) { (result) in
             switch result {
             case .success:
                 onCompletion(nil)

From 2c9b092003f3088304d4b896a4e730e8d375b105 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 7 Jun 2024 11:55:21 -0300
Subject: [PATCH 194/547] New SPAuthError case

---
 Simplenote/Classes/SPAuthError.swift                         | 3 ++-
 Simplenote/Classes/SPAuthHandler.swift                       | 2 ++
 Simplenote/Classes/SPSettingsViewController+Extensions.swift | 2 +-
 Simplenote/Remote.swift                                      | 2 +-
 Simplenote/RemoteError.swift                                 | 1 -
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Simplenote/Classes/SPAuthError.swift b/Simplenote/Classes/SPAuthError.swift
index 21d3e61a3..8f84d634c 100644
--- a/Simplenote/Classes/SPAuthError.swift
+++ b/Simplenote/Classes/SPAuthError.swift
@@ -10,6 +10,7 @@ enum SPAuthError: Error {
     case compromisedPassword
     case unverifiedEmail
     case tooManyAttempts
+    case unableToDecode
     case unknown(statusCode: Int, response: String?, error: Error?)
 }
 
@@ -89,7 +90,7 @@ extension SPAuthError {
             return NSLocalizedString("You must verify your email before being able to login.", comment: "Error for un verified email")
         case .tooManyAttempts:
             return NSLocalizedString("Too many login attempts. Try again later.", comment: "Error message for too many login attempts")
-        case .unknown:
+        default:
             return NSLocalizedString("We're having problems. Please try again soon.", comment: "Generic error")
         }
     }
diff --git a/Simplenote/Classes/SPAuthHandler.swift b/Simplenote/Classes/SPAuthHandler.swift
index 1196d0c13..0c658f82a 100644
--- a/Simplenote/Classes/SPAuthHandler.swift
+++ b/Simplenote/Classes/SPAuthHandler.swift
@@ -90,6 +90,8 @@ class SPAuthHandler {
         switch remoteError {
         case .network:
             return SPAuthError.network
+        case .responseUnableToDecode:
+            return SPAuthError.unableToDecode
         case .requestError(let statusCode, let error):
             return SPAuthError(signupErrorCode: statusCode, response: error?.localizedDescription, error: error)
         }
diff --git a/Simplenote/Classes/SPSettingsViewController+Extensions.swift b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
index a07f8d4e9..5b4392105 100644
--- a/Simplenote/Classes/SPSettingsViewController+Extensions.swift
+++ b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
@@ -191,7 +191,7 @@ extension SPSettingsViewController {
         switch error {
         case .network:
             NoticeController.shared.present(NoticeFactory.networkError())
-        case .requestError:
+        case .responseUnableToDecode, .requestError:
             presentRequestErrorAlert()
         }
     }
diff --git a/Simplenote/Remote.swift b/Simplenote/Remote.swift
index e9c119e5c..8bcf20cb5 100644
--- a/Simplenote/Remote.swift
+++ b/Simplenote/Remote.swift
@@ -39,7 +39,7 @@ class Remote {
         
         // Check for 2xx status code
         guard statusCode / 100 == 2 else {
-            throw RemoteError.serverError(statusCode: statusCode)
+            throw RemoteError.requestError(statusCode, nil)
         }
         
         return data
diff --git a/Simplenote/RemoteError.swift b/Simplenote/RemoteError.swift
index 0bc594341..cf87d6e30 100644
--- a/Simplenote/RemoteError.swift
+++ b/Simplenote/RemoteError.swift
@@ -3,7 +3,6 @@ import Foundation
 enum RemoteError: Error {
     case network
     case responseUnableToDecode
-    case serverError(statusCode: Int)
     case requestError(Int, Error?)
 }
 

From 1c3a1f630792a02699ed68dc94a1299b8c10d3eb Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 7 Jun 2024 12:08:32 -0300
Subject: [PATCH 195/547] SPAuthViewController: Login with Magic Link Support

---
 Simplenote/Classes/SPAuthViewController.swift | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index f6e27223e..f7ad1da98 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -295,7 +295,19 @@ private extension SPAuthViewController {
 
         performSimperiumAuthentication()
     }
+    
+    @IBAction func performLogInWithMagicLink() {
+        guard ensureWarningsAreOnScreenWhenNeeded() else {
+            return
+        }
+
+        requestLoginLink()
+    }
+
+    @IBAction func switchToLoginWithPassword() {
 
+    }
+    
     @IBAction func performSignUp() {
         guard ensureWarningsAreOnScreenWhenNeeded() else {
             return
@@ -369,6 +381,20 @@ private extension SPAuthViewController {
             self.unlockInterface()
         }
     }
+
+    func requestLoginLink() {
+        lockdownInterface()
+
+        controller.requestLoginEmail(username: email) { error in
+            if let error {
+                self.handleError(error: error)
+            } else {
+                SPTracker.trackUserRequestedLoginLink()
+            }
+
+            self.unlockInterface()
+        }
+    }
 }
 
 // MARK: - Password Reset Flow
@@ -646,6 +672,19 @@ extension AuthenticationMode {
                      isPasswordHidden: false)
     }
 
+    /// Login Operation Mode: Authentication is handled via Magic Links!
+    ///
+    static var loginWithMagicLink: AuthenticationMode {
+        return .init(title: AuthenticationStrings.loginTitle,
+                     validationStyle: .legacy,
+                     primaryActionSelector: #selector(SPAuthViewController.performLogInWithMagicLink),
+                     primaryActionText: AuthenticationStrings.loginWithLinkPrimaryAction,
+                     secondaryActionSelector: #selector(SPAuthViewController.switchToLoginWithPassword),
+                     secondaryActionText: AuthenticationStrings.loginWithLinkSecondaryAction,
+                     secondaryActionAttributedText: nil,
+                     isPasswordHidden: true)
+    }
+
     /// Signup Operation Mode: Contains all of the strings + delegate wirings, so that the AuthUI handles user account creation scenarios.
     ///
     static var signup: AuthenticationMode {
@@ -666,6 +705,8 @@ private enum AuthenticationStrings {
     static let loginTitle                   = NSLocalizedString("Log In", comment: "LogIn Interface Title")
     static let loginPrimaryAction           = NSLocalizedString("Log In", comment: "LogIn Action")
     static let loginSecondaryAction         = NSLocalizedString("Forgotten password?", comment: "Password Reset Action")
+    static let loginWithLinkPrimaryAction   = NSLocalizedString("Instantly Log In with Email", comment: "LogIn with Magic Link Action")
+    static let loginWithLinkSecondaryAction = NSLocalizedString("Continue with Password", comment: "Password fallback Action")
     static let signupTitle                  = NSLocalizedString("Sign Up", comment: "SignUp Interface Title")
     static let signupPrimaryAction          = NSLocalizedString("Sign Up", comment: "SignUp Action")
     static let signupSecondaryActionPrefix  = NSLocalizedString("By creating an account you agree to our", comment: "Terms of Service Legend *PREFIX*: printed in dark color")

From 6bfd6bad4d4269d4eda2b348648608dd46e42d4f Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 7 Jun 2024 12:35:06 -0300
Subject: [PATCH 196/547] New UIButton Extension

---
 Simplenote.xcodeproj/project.pbxproj |  4 ++++
 Simplenote/UIButton+Simplenote.swift | 27 +++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 Simplenote/UIButton+Simplenote.swift

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index 2046d04ef..ee7f9e892 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -295,6 +295,7 @@
 		B5476BC123D8E5D0000E7723 /* String+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5476BC023D8E5D0000E7723 /* String+Simplenote.swift */; };
 		B549E249290B3BDB0072C3E8 /* Preferences+IAP.swift in Sources */ = {isa = PBXBuildFile; fileRef = B549E248290B3BDB0072C3E8 /* Preferences+IAP.swift */; };
 		B549E24B290B3DD70072C3E8 /* StoreConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = B549E24A290B3DD70072C3E8 /* StoreConstants.swift */; };
+		B54A11C22C135EA2002AC8AA /* UIButton+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54A11C12C135EA2002AC8AA /* UIButton+Simplenote.swift */; };
 		B54B04D82407169500401FBB /* SPAppDelegate+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54B04D72407169500401FBB /* SPAppDelegate+Extensions.swift */; };
 		B54D9C572909BA2600D0E0EC /* StoreManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54D9C562909BA2600D0E0EC /* StoreManager.swift */; };
 		B54D9C592909CC4400D0E0EC /* StoreProduct.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54D9C582909CC4400D0E0EC /* StoreProduct.swift */; };
@@ -989,6 +990,7 @@
 		B5476BC023D8E5D0000E7723 /* String+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "String+Simplenote.swift"; path = "Classes/String+Simplenote.swift"; sourceTree = "<group>"; };
 		B549E248290B3BDB0072C3E8 /* Preferences+IAP.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Preferences+IAP.swift"; sourceTree = "<group>"; };
 		B549E24A290B3DD70072C3E8 /* StoreConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoreConstants.swift; sourceTree = "<group>"; };
+		B54A11C12C135EA2002AC8AA /* UIButton+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIButton+Simplenote.swift"; sourceTree = "<group>"; };
 		B54B04D72407169500401FBB /* SPAppDelegate+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SPAppDelegate+Extensions.swift"; sourceTree = "<group>"; };
 		B54D9C542909B21700D0E0EC /* Simplenote 6.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Simplenote 6.xcdatamodel"; sourceTree = "<group>"; };
 		B54D9C562909BA2600D0E0EC /* StoreManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoreManager.swift; sourceTree = "<group>"; };
@@ -2018,6 +2020,7 @@
 				B50F479E1D1D77FC00822748 /* UIAlertController+Helpers.swift */,
 				B5757367232BED0700443C2E /* UIBezierPath+Simplenote.swift */,
 				B570D2D82360F16F006E1C85 /* UIBlurEffect+Simplenote.swift */,
+				B54A11C12C135EA2002AC8AA /* UIButton+Simplenote.swift */,
 				B575736B232D454300443C2E /* UIColor+Helpers.swift */,
 				B58BF1FA23D78ADF00515B50 /* UIContextualAction+Simplenote.swift */,
 				B5BA5B072551FB3C002AAD43 /* UIDevice+Simplenote.swift */,
@@ -3463,6 +3466,7 @@
 				B52BB74E22CFD1660042C162 /* SimplenoteActivityItemSource.swift in Sources */,
 				B537730F252E14C600BC78C5 /* OptionsViewController.swift in Sources */,
 				B56A696722F9D55F00B90398 /* UIView+Animations.swift in Sources */,
+				B54A11C22C135EA2002AC8AA /* UIButton+Simplenote.swift in Sources */,
 				BA9C7ED02BEE9BA7007A8460 /* ShortcutIntents.intentdefinition in Sources */,
 				BA3856CD2681715700F388CC /* CoreDataManager.swift in Sources */,
 				A60DF30825A44F0F00FDADF3 /* PinLockRemoveController.swift in Sources */,
diff --git a/Simplenote/UIButton+Simplenote.swift b/Simplenote/UIButton+Simplenote.swift
new file mode 100644
index 000000000..da092c987
--- /dev/null
+++ b/Simplenote/UIButton+Simplenote.swift
@@ -0,0 +1,27 @@
+//
+//  UIButton+Simplenote.swift
+//  Simplenote
+//
+//  Created by Jorge Leandro Perez on 6/7/24.
+//  Copyright © 2024 Automattic. All rights reserved.
+//
+
+import Foundation
+
+
+extension UIButton {
+    
+    func setTitleWithoutAnimation(_ title: String?, for state: UIControl.State) {
+        UIView.performWithoutAnimation {
+            self.setTitle(title, for: state)
+            self.layoutIfNeeded()
+        }
+    }
+    
+    func setAttributedTitleWithoutAnimation(_ title: NSAttributedString?, for state: UIControl.State) {
+        UIView.performWithoutAnimation {
+            self.setAttributedTitle(title, for: state)
+            self.layoutIfNeeded()
+        }
+    }
+}

From 04fed63476fe8a834d6fe5d647689af19fba4a18 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 7 Jun 2024 12:35:22 -0300
Subject: [PATCH 197/547] SPAuthViewController: Mode Switching Support

---
 Simplenote/Classes/SPAuthViewController.swift | 67 +++++++++++++++++--
 1 file changed, 62 insertions(+), 5 deletions(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index f7ad1da98..cbe1b94d1 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -159,7 +159,11 @@ class SPAuthViewController: UIViewController {
 
     /// # Authentication Mode: Signup or Login
     ///
-    let mode: AuthenticationMode
+    private(set) var mode: AuthenticationMode {
+        didSet {
+            refreshInterface(mode: mode)
+        }
+    }
 
     /// Indicates if the Extended Debug Mode is enabled
     ///
@@ -173,7 +177,7 @@ class SPAuthViewController: UIViewController {
 
     /// Designated Initializer
     ///
-    init(controller: SPAuthHandler, mode: AuthenticationMode = .login) {
+    init(controller: SPAuthHandler, mode: AuthenticationMode = .loginWithMagicLink) {
         self.controller = controller
         self.mode = mode
         super.init(nibName: nil, bundle: nil)
@@ -305,7 +309,7 @@ private extension SPAuthViewController {
     }
 
     @IBAction func switchToLoginWithPassword() {
-
+        mode = .loginWithPassword
     }
     
     @IBAction func performSignUp() {
@@ -504,7 +508,7 @@ private extension SPAuthViewController {
         }
 
         // Prefill the LoginViewController
-        let loginViewController = SPAuthViewController(controller: controller, mode: .login)
+        let loginViewController = SPAuthViewController(controller: controller, mode: .loginWithPassword)
 
         loginViewController.loadViewIfNeeded()
         loginViewController.email = email
@@ -531,6 +535,11 @@ private extension SPAuthViewController {
         refreshPasswordInput(inErrorState: true)
     }
 
+    func dismissAllValidationWarnings() {
+        refreshEmailInput(inErrorState: false)
+        refreshPasswordInput(inErrorState: false)
+    }
+    
     func dismissEmailValidationWarning() {
         refreshEmailInput(inErrorState: false)
     }
@@ -642,6 +651,54 @@ extension SPAuthViewController: SPTextInputViewDelegate {
     }
 }
 
+// MARK: - Mode Switching
+//
+extension SPAuthViewController {
+    
+    func refreshInterface(mode: AuthenticationMode, animated: Bool = true) {
+        title = mode.title
+        
+        dismissAllValidationWarnings()
+
+        refreshPasswordInput(isHidden: mode.isPasswordHidden, animated: animated)
+        refreshPrimaryAction(mode: mode)
+        refreshSecondaryAction(mode: mode)
+        
+    }
+    
+    func refreshPasswordInput(isHidden: Bool, animated: Bool) {
+        let work = {
+            self.passwordInputView.isHidden = isHidden
+        }
+        
+        guard animated else {
+            work()
+            return
+        }
+
+        UIView.animate(withDuration: UIKitConstants.animationDelayShort, animations: work)
+    }
+    
+    func refreshPrimaryAction(mode: AuthenticationMode) {
+        primaryActionButton.setTitleWithoutAnimation(mode.primaryActionText, for: .normal)
+        primaryActionButton.addTarget(self, action: mode.primaryActionSelector, for: .touchUpInside)
+    }
+    
+    func refreshSecondaryAction(mode: AuthenticationMode) {
+        if let title = mode.secondaryActionText {
+            secondaryActionButton.setTitleWithoutAnimation(title, for: .normal)
+        }
+        
+        if let attributedTitle = mode.secondaryActionAttributedText {
+            secondaryActionButton.setAttributedTitleWithoutAnimation(attributedTitle, for: .normal)
+        }
+
+        secondaryActionButton.setTitleColor(.simplenoteBlue60Color, for: .normal)
+        secondaryActionButton.addTarget(self, action: mode.secondaryActionSelector, for: .touchUpInside)
+    }
+}
+
+
 // MARK: - AuthenticationMode: Signup / Login
 //
 struct AuthenticationMode {
@@ -661,7 +718,7 @@ extension AuthenticationMode {
 
     /// Login Operation Mode: Contains all of the strings + delegate wirings, so that the AuthUI handles authentication scenarios.
     ///
-    static var login: AuthenticationMode {
+    static var loginWithPassword: AuthenticationMode {
         return .init(title: AuthenticationStrings.loginTitle,
                      validationStyle: .legacy,
                      primaryActionSelector: #selector(SPAuthViewController.performLogIn),

From 6666d9ec22efde11384f8afa53ae07059f51f45b Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 7 Jun 2024 12:35:34 -0300
Subject: [PATCH 198/547] SPOnboardingViewController: Magic Link Auth by
 default

---
 Simplenote/Classes/SPOnboardingViewController.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Simplenote/Classes/SPOnboardingViewController.swift b/Simplenote/Classes/SPOnboardingViewController.swift
index c80e9a0f5..008476bc2 100644
--- a/Simplenote/Classes/SPOnboardingViewController.swift
+++ b/Simplenote/Classes/SPOnboardingViewController.swift
@@ -154,7 +154,7 @@ private extension SPOnboardingViewController {
         sheetController.setTitleForButton1(title: OnboardingStrings.loginWithWpcomText)
 
         sheetController.onClickButton0 = { [weak self] in
-            self?.presentAuthenticationInterface(mode: .login)
+            self?.presentAuthenticationInterface(mode: .loginWithMagicLink)
         }
 
         sheetController.onClickButton1 = { [weak self] in

From b14ef779083da6a9b02d387b7b72c6b768072294 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 7 Jun 2024 12:36:13 -0300
Subject: [PATCH 199/547] MagicLinkAuthenticator: AuthCode link support

---
 .../Classes/MagicLinkAuthenticator.swift      | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/Simplenote/Classes/MagicLinkAuthenticator.swift b/Simplenote/Classes/MagicLinkAuthenticator.swift
index c4655b473..0f44767a6 100644
--- a/Simplenote/Classes/MagicLinkAuthenticator.swift
+++ b/Simplenote/Classes/MagicLinkAuthenticator.swift
@@ -18,6 +18,9 @@ struct MagicLinkAuthenticator {
             return
         }
 
+        attemptLoginWithAuthCode(queryItems: queryItems)
+    }
+}
 
 // MARK: - Private API(s)
 //
@@ -35,6 +38,35 @@ private extension MagicLinkAuthenticator {
         authenticator.authenticate(withUsername: email, token: token)
         return true
     }
+
+    @discardableResult
+    func attemptLoginWithAuthCode(queryItems: [URLQueryItem]) -> Bool {
+        guard let email = queryItems.base64DecodedValue(for: Constants.emailField),
+              let authCode = queryItems.value(for: Constants.authCodeField),
+              !email.isEmpty, !authCode.isEmpty
+        else {
+            return false
+        }
+
+        NSLog("[MagicLinkAuthenticator] Requesting SyncToken for \(email) and \(authCode)")
+        
+        Task {
+            do {
+                let remote = LoginRemote()
+                let syncToken = try await remote.requestSyncToken(email: email, authCode: authCode)
+                
+                Task { @MainActor in
+                    NSLog("[MagicLinkAuthenticator] Should auth with token \(syncToken)")
+                    authenticator.authenticate(withUsername: email, token: syncToken)
+                }
+
+            } catch {
+                NSLog("[MagicLinkAuthenticator] Magic Link TokenExchange Error: \(error)")
+            }
+        }
+
+        return true
+    }
 }
 
 
@@ -61,4 +93,5 @@ private struct Constants {
     static let host = "login"
     static let emailField = "email"
     static let tokenField = "token"
+    static let authCodeField = "auth_code"
 }

From 12417c11b5b3fc2502342f92c265ae4f54deb2cc Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 7 Jun 2024 13:06:01 -0300
Subject: [PATCH 200/547] Implements MagicLinkConfirmationView

---
 Simplenote.xcodeproj/project.pbxproj          |  4 +
 Simplenote/Classes/SPAuthViewController.swift | 45 ++++++-----
 Simplenote/MagicLinkConfirmationView.swift    | 76 +++++++++++++++++++
 3 files changed, 107 insertions(+), 18 deletions(-)
 create mode 100644 Simplenote/MagicLinkConfirmationView.swift

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index ee7f9e892..49cee357c 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -296,6 +296,7 @@
 		B549E249290B3BDB0072C3E8 /* Preferences+IAP.swift in Sources */ = {isa = PBXBuildFile; fileRef = B549E248290B3BDB0072C3E8 /* Preferences+IAP.swift */; };
 		B549E24B290B3DD70072C3E8 /* StoreConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = B549E24A290B3DD70072C3E8 /* StoreConstants.swift */; };
 		B54A11C22C135EA2002AC8AA /* UIButton+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54A11C12C135EA2002AC8AA /* UIButton+Simplenote.swift */; };
+		B54A11C42C136225002AC8AA /* MagicLinkConfirmationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54A11C32C136225002AC8AA /* MagicLinkConfirmationView.swift */; };
 		B54B04D82407169500401FBB /* SPAppDelegate+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54B04D72407169500401FBB /* SPAppDelegate+Extensions.swift */; };
 		B54D9C572909BA2600D0E0EC /* StoreManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54D9C562909BA2600D0E0EC /* StoreManager.swift */; };
 		B54D9C592909CC4400D0E0EC /* StoreProduct.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54D9C582909CC4400D0E0EC /* StoreProduct.swift */; };
@@ -991,6 +992,7 @@
 		B549E248290B3BDB0072C3E8 /* Preferences+IAP.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Preferences+IAP.swift"; sourceTree = "<group>"; };
 		B549E24A290B3DD70072C3E8 /* StoreConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoreConstants.swift; sourceTree = "<group>"; };
 		B54A11C12C135EA2002AC8AA /* UIButton+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIButton+Simplenote.swift"; sourceTree = "<group>"; };
+		B54A11C32C136225002AC8AA /* MagicLinkConfirmationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MagicLinkConfirmationView.swift; sourceTree = "<group>"; };
 		B54B04D72407169500401FBB /* SPAppDelegate+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SPAppDelegate+Extensions.swift"; sourceTree = "<group>"; };
 		B54D9C542909B21700D0E0EC /* Simplenote 6.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Simplenote 6.xcdatamodel"; sourceTree = "<group>"; };
 		B54D9C562909BA2600D0E0EC /* StoreManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoreManager.swift; sourceTree = "<group>"; };
@@ -2077,6 +2079,7 @@
 				A6CDD9C725F0163D00E0BC4D /* MagicLinkAuthenticator.swift */,
 				A628BEB425ECD97900121B64 /* SignupVerificationViewController.swift */,
 				A628BEB525ECD97900121B64 /* SignupVerificationViewController.xib */,
+				B54A11C32C136225002AC8AA /* MagicLinkConfirmationView.swift */,
 			);
 			name = Onboarding;
 			sourceTree = "<group>";
@@ -3700,6 +3703,7 @@
 				B5CBEF4222D3B419009DBE67 /* Bundle+Simplenote.swift in Sources */,
 				B575736C232D454300443C2E /* UIColor+Helpers.swift in Sources */,
 				37E55A6721BF2B1800F14241 /* SPTextAttachment.swift in Sources */,
+				B54A11C42C136225002AC8AA /* MagicLinkConfirmationView.swift in Sources */,
 				BA8FC2A5267AC7470082962E /* SharedStorageMigrator.swift in Sources */,
 				A69F850F253EC2B2005140F2 /* SPCardConfigurable.swift in Sources */,
 				B5BE05541AB75C3B002417BF /* Settings.m in Sources */,
diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index cbe1b94d1..ee282cdc2 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -1,6 +1,7 @@
 import Foundation
 import UIKit
 import SafariServices
+import SwiftUI
 
 // MARK: - SPAuthViewController
 //
@@ -305,11 +306,19 @@ private extension SPAuthViewController {
             return
         }
 
-        requestLoginLink()
-    }
+        lockdownInterface()
 
-    @IBAction func switchToLoginWithPassword() {
-        mode = .loginWithPassword
+        let email = self.email
+        controller.requestLoginEmail(username: email) { error in
+            if let error {
+                self.handleError(error: error)
+            } else {
+                self.presentMagicLinkConfirmationView(email: email)
+                SPTracker.trackUserRequestedLoginLink()
+            }
+
+            self.unlockInterface()
+        }
     }
     
     @IBAction func performSignUp() {
@@ -333,6 +342,10 @@ private extension SPAuthViewController {
             self.unlockInterface()
         }
     }
+    
+    @IBAction func switchToLoginWithPassword() {
+        mode = .loginWithPassword
+    }
 
     @IBAction func presentPasswordReset() {
         controller.presentPasswordReset(from: self, username: email)
@@ -353,8 +366,17 @@ private extension SPAuthViewController {
         viewController.title = title
         navigationController?.pushViewController(viewController, animated: true)
     }
+    
+    private func presentMagicLinkConfirmationView(email: String) {
+        let rootView = MagicLinkConfirmationView(email: email)
+        let hostingController = UIHostingController(rootView: rootView)
+        hostingController.sheetPresentationController?.detents = [.medium()]
+
+        present(hostingController, animated: true)
+    }
 }
 
+
 // MARK: - Simperium Services
 //
 private extension SPAuthViewController {
@@ -385,20 +407,6 @@ private extension SPAuthViewController {
             self.unlockInterface()
         }
     }
-
-    func requestLoginLink() {
-        lockdownInterface()
-
-        controller.requestLoginEmail(username: email) { error in
-            if let error {
-                self.handleError(error: error)
-            } else {
-                SPTracker.trackUserRequestedLoginLink()
-            }
-
-            self.unlockInterface()
-        }
-    }
 }
 
 // MARK: - Password Reset Flow
@@ -421,6 +429,7 @@ private extension SPAuthViewController {
     }
 }
 
+
 // MARK: - Error Handling
 //
 private extension SPAuthViewController {
diff --git a/Simplenote/MagicLinkConfirmationView.swift b/Simplenote/MagicLinkConfirmationView.swift
new file mode 100644
index 000000000..3007df207
--- /dev/null
+++ b/Simplenote/MagicLinkConfirmationView.swift
@@ -0,0 +1,76 @@
+//
+//  MagicLinkConfirmationView.swift
+//  Simplenote
+//
+//  Created by Jorge Leandro Perez on 6/7/24.
+//  Copyright © 2024 Automattic. All rights reserved.
+//
+
+import Foundation
+import SwiftUI
+import Gridicons
+
+
+// MARK: - MagicLinkConfirmationView
+//
+struct MagicLinkConfirmationView: View {
+    let email: String
+    @Environment(\.presentationMode) var presentationMode
+
+    var body: some View {
+        NavigationView {
+            VStack(alignment: .center, spacing: 10) {
+                Image(uiImage: MagicLinkImages.mail)
+                    .renderingMode(.template)
+                    .foregroundColor(Color(.simplenoteBlue60Color))
+
+                Text("Check your email")
+                    .bold()
+                    .font(.system(size: Metrics.titleFontSize))
+                
+                Spacer()
+                    .frame(height: Metrics.titlePaddingBottom)
+                
+                Text("If an account exists, we've sent an email to **\(email)** containing a link that'll log you in.")
+                    .font(.system(size: Metrics.detailsFontSize))
+                    .multilineTextAlignment(.center)
+            }
+            .padding()
+            .navigationBarTitleDisplayMode(.inline)
+            .toolbar {
+                ToolbarItem(placement: .navigationBarTrailing) {
+                    Button(action: {
+                        presentationMode.wrappedValue.dismiss()
+                    }) {
+                        Image(uiImage: MagicLinkImages.dismiss)
+                            .renderingMode(.template)
+                            .foregroundColor(Color(.darkGray))
+                    }
+                }
+            }
+        }
+    }
+}
+
+
+// MARK: - Constants
+//
+private enum Metrics {
+    static let titleFontSize: CGFloat = 22
+    static let titlePaddingBottom: CGFloat = 10
+    static let detailsFontSize: CGFloat = 17
+    static let mailIconSize = CGSize(width: 100, height: 100)
+    static let dismissSize = CGSize(width: 30, height: 30)
+}
+
+private enum MagicLinkImages {
+    static let mail = Gridicon.iconOfType(.mail, withSize: Metrics.mailIconSize)
+    static let dismiss = Gridicon.iconOfType(.crossCircle, withSize: Metrics.dismissSize)
+}
+
+
+struct MagicLinkConfirmationView_Previews: PreviewProvider {
+    static var previews: some View {
+        MagicLinkConfirmationView(email: "lord@yosemite.com")
+    }
+}

From 1220c6636065d0b3fd05f8943a272531d9e2f2cb Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 7 Jun 2024 13:11:54 -0300
Subject: [PATCH 201/547] Drops copyright

---
 Simplenote/LoginRemote.swift               | 8 --------
 Simplenote/MagicLinkConfirmationView.swift | 8 --------
 Simplenote/UIButton+Simplenote.swift       | 8 --------
 3 files changed, 24 deletions(-)

diff --git a/Simplenote/LoginRemote.swift b/Simplenote/LoginRemote.swift
index ae9e5b9ac..9cae5241e 100644
--- a/Simplenote/LoginRemote.swift
+++ b/Simplenote/LoginRemote.swift
@@ -1,11 +1,3 @@
-//
-//  LoginRemote.swift
-//  Simplenote
-//
-//  Created by Jorge Leandro Perez on 6/6/24.
-//  Copyright © 2024 Automattic. All rights reserved.
-//
-
 import Foundation
 
 // MARK: - LoginRemote
diff --git a/Simplenote/MagicLinkConfirmationView.swift b/Simplenote/MagicLinkConfirmationView.swift
index 3007df207..d03e20771 100644
--- a/Simplenote/MagicLinkConfirmationView.swift
+++ b/Simplenote/MagicLinkConfirmationView.swift
@@ -1,11 +1,3 @@
-//
-//  MagicLinkConfirmationView.swift
-//  Simplenote
-//
-//  Created by Jorge Leandro Perez on 6/7/24.
-//  Copyright © 2024 Automattic. All rights reserved.
-//
-
 import Foundation
 import SwiftUI
 import Gridicons
diff --git a/Simplenote/UIButton+Simplenote.swift b/Simplenote/UIButton+Simplenote.swift
index da092c987..1d2dad366 100644
--- a/Simplenote/UIButton+Simplenote.swift
+++ b/Simplenote/UIButton+Simplenote.swift
@@ -1,11 +1,3 @@
-//
-//  UIButton+Simplenote.swift
-//  Simplenote
-//
-//  Created by Jorge Leandro Perez on 6/7/24.
-//  Copyright © 2024 Automattic. All rights reserved.
-//
-
 import Foundation
 
 

From 431df3f6841207d48c2213b72a9652d347760691 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 7 Jun 2024 13:44:07 -0300
Subject: [PATCH 202/547] MagicLinkAuthenticator: Drops unneeded changes

---
 Simplenote/Classes/MagicLinkAuthenticator.swift | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Simplenote/Classes/MagicLinkAuthenticator.swift b/Simplenote/Classes/MagicLinkAuthenticator.swift
index 0f44767a6..ef2e24651 100644
--- a/Simplenote/Classes/MagicLinkAuthenticator.swift
+++ b/Simplenote/Classes/MagicLinkAuthenticator.swift
@@ -43,8 +43,7 @@ private extension MagicLinkAuthenticator {
     func attemptLoginWithAuthCode(queryItems: [URLQueryItem]) -> Bool {
         guard let email = queryItems.base64DecodedValue(for: Constants.emailField),
               let authCode = queryItems.value(for: Constants.authCodeField),
-              !email.isEmpty, !authCode.isEmpty
-        else {
+              !email.isEmpty, !authCode.isEmpty else {
             return false
         }
 
@@ -69,7 +68,6 @@ private extension MagicLinkAuthenticator {
     }
 }
 
-
 // MARK: - [URLQueryItem] Helper
 //
 private extension Array where Element == URLQueryItem {

From 207c586bdf41ca1f7c1ebea01b9bdf0de2884472 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 7 Jun 2024 13:50:38 -0300
Subject: [PATCH 203/547] Drops unneeded newlines

---
 Simplenote/Classes/MagicLinkAuthenticator.swift | 3 ++-
 Simplenote/Classes/SPAuthViewController.swift   | 1 -
 Simplenote/Remote.swift                         | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Simplenote/Classes/MagicLinkAuthenticator.swift b/Simplenote/Classes/MagicLinkAuthenticator.swift
index ef2e24651..7aa562b45 100644
--- a/Simplenote/Classes/MagicLinkAuthenticator.swift
+++ b/Simplenote/Classes/MagicLinkAuthenticator.swift
@@ -43,7 +43,8 @@ private extension MagicLinkAuthenticator {
     func attemptLoginWithAuthCode(queryItems: [URLQueryItem]) -> Bool {
         guard let email = queryItems.base64DecodedValue(for: Constants.emailField),
               let authCode = queryItems.value(for: Constants.authCodeField),
-              !email.isEmpty, !authCode.isEmpty else {
+              !email.isEmpty, !authCode.isEmpty
+        else {
             return false
         }
 
diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index ee282cdc2..ab2203597 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -672,7 +672,6 @@ extension SPAuthViewController {
         refreshPasswordInput(isHidden: mode.isPasswordHidden, animated: animated)
         refreshPrimaryAction(mode: mode)
         refreshSecondaryAction(mode: mode)
-        
     }
     
     func refreshPasswordInput(isHidden: Bool, animated: Bool) {
diff --git a/Simplenote/Remote.swift b/Simplenote/Remote.swift
index 8bcf20cb5..c334efd16 100644
--- a/Simplenote/Remote.swift
+++ b/Simplenote/Remote.swift
@@ -53,7 +53,6 @@ class Remote {
         do {
             let decoder = JSONDecoder()
             decoder.keyDecodingStrategy = .convertFromSnakeCase
-
             return try decoder.decode(type, from: data)
 
         } catch {

From f9b8526232a62291276474e78cfccf99bd2b7477 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 7 Jun 2024 13:59:51 -0300
Subject: [PATCH 204/547] SPAuthViewController: Spinner is now white

---
 Simplenote/Classes/SPAuthViewController.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index ab2203597..82fdc6848 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -81,6 +81,7 @@ class SPAuthViewController: UIViewController {
     @IBOutlet private var primaryActionSpinner: UIActivityIndicatorView! {
         didSet {
             primaryActionSpinner.style = .medium
+            primaryActionSpinner.color = .white
         }
     }
 

From 0a6a08be648aea24ed5202c87ef6d854f581ae24 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 7 Jun 2024 14:24:40 -0300
Subject: [PATCH 205/547] MagicLinkConfirmationView: Adjusts iPad UX

---
 Simplenote/Classes/SPAuthViewController.swift | 1 +
 Simplenote/MagicLinkConfirmationView.swift    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index 82fdc6848..05751f8b1 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -371,6 +371,7 @@ private extension SPAuthViewController {
     private func presentMagicLinkConfirmationView(email: String) {
         let rootView = MagicLinkConfirmationView(email: email)
         let hostingController = UIHostingController(rootView: rootView)
+        hostingController.modalPresentationStyle = .formSheet
         hostingController.sheetPresentationController?.detents = [.medium()]
 
         present(hostingController, animated: true)
diff --git a/Simplenote/MagicLinkConfirmationView.swift b/Simplenote/MagicLinkConfirmationView.swift
index d03e20771..08a025c38 100644
--- a/Simplenote/MagicLinkConfirmationView.swift
+++ b/Simplenote/MagicLinkConfirmationView.swift
@@ -41,6 +41,8 @@ struct MagicLinkConfirmationView: View {
                 }
             }
         }
+        .navigationViewStyle(.stack)
+        .preferredColorScheme(.light)
     }
 }
 

From 51a1f0f8600ca283318f25f40028a7e7ca61986e Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 7 Jun 2024 16:25:53 -0300
Subject: [PATCH 206/547] MagicLinkConfirmationView: Forcing Light Mode

---
 Simplenote/MagicLinkConfirmationView.swift | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Simplenote/MagicLinkConfirmationView.swift b/Simplenote/MagicLinkConfirmationView.swift
index 08a025c38..3d5511a4a 100644
--- a/Simplenote/MagicLinkConfirmationView.swift
+++ b/Simplenote/MagicLinkConfirmationView.swift
@@ -42,7 +42,9 @@ struct MagicLinkConfirmationView: View {
             }
         }
         .navigationViewStyle(.stack)
-        .preferredColorScheme(.light)
+        
+        /// Force Light Mode (since the Authentication UI is all light!)
+        .environment(\.colorScheme, .light)
     }
 }
 

From 3c5d4b693835e4dda70178ea56abd9de09ba09c4 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 7 Jun 2024 16:37:48 -0300
Subject: [PATCH 207/547] MagicLinkConfirmationView: Animation

---
 Simplenote/MagicLinkConfirmationView.swift | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Simplenote/MagicLinkConfirmationView.swift b/Simplenote/MagicLinkConfirmationView.swift
index 3d5511a4a..5a4e951cf 100644
--- a/Simplenote/MagicLinkConfirmationView.swift
+++ b/Simplenote/MagicLinkConfirmationView.swift
@@ -6,8 +6,10 @@ import Gridicons
 // MARK: - MagicLinkConfirmationView
 //
 struct MagicLinkConfirmationView: View {
-    let email: String
     @Environment(\.presentationMode) var presentationMode
+    @State private var displaysFullImage: Bool = false
+    let email: String
+    
 
     var body: some View {
         NavigationView {
@@ -15,6 +17,12 @@ struct MagicLinkConfirmationView: View {
                 Image(uiImage: MagicLinkImages.mail)
                     .renderingMode(.template)
                     .foregroundColor(Color(.simplenoteBlue60Color))
+                    .scaleEffect(displaysFullImage ? 1 : 0.4)
+                    .onAppear {
+                        withAnimation(.spring(response: 0.3, dampingFraction: 0.3)) {
+                            displaysFullImage = true
+                        }
+                    }
 
                 Text("Check your email")
                     .bold()

From 32b35e71d225051e97b845c45b7cd402b3f545a9 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 7 Jun 2024 17:01:07 -0300
Subject: [PATCH 208/547] SPAuthViewController: Fixes autofill glitch

---
 Simplenote/Classes/SPAuthViewController.swift | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index 05751f8b1..6fe8d4b43 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -674,6 +674,11 @@ extension SPAuthViewController {
         refreshPasswordInput(isHidden: mode.isPasswordHidden, animated: animated)
         refreshPrimaryAction(mode: mode)
         refreshSecondaryAction(mode: mode)
+
+        /// Workaround:
+        /// When revealing the Password Field, iOS's Autofill mechanism may not properly fill the password field!
+        passwordInputView.becomeFirstResponder()
+        emailInputView.becomeFirstResponder()
     }
     
     func refreshPasswordInput(isHidden: Bool, animated: Bool) {

From f93f970b21ee9855dda27e9938b66ad70114fec7 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 7 Jun 2024 17:01:15 -0300
Subject: [PATCH 209/547] SPAuthViewController: Fixes multiple Targets glitch

---
 Simplenote/Classes/SPAuthViewController.swift | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index 6fe8d4b43..df535f45c 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -696,6 +696,7 @@ extension SPAuthViewController {
     
     func refreshPrimaryAction(mode: AuthenticationMode) {
         primaryActionButton.setTitleWithoutAnimation(mode.primaryActionText, for: .normal)
+        primaryActionButton.removeTarget(self, action: nil, for: .touchUpInside)
         primaryActionButton.addTarget(self, action: mode.primaryActionSelector, for: .touchUpInside)
     }
     
@@ -709,6 +710,7 @@ extension SPAuthViewController {
         }
 
         secondaryActionButton.setTitleColor(.simplenoteBlue60Color, for: .normal)
+        secondaryActionButton.removeTarget(self, action: nil, for: .touchUpInside)
         secondaryActionButton.addTarget(self, action: mode.secondaryActionSelector, for: .touchUpInside)
     }
 }

From fbae38380ab40257bba29898c0189361c3499871 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 13 Jun 2024 15:37:15 -0600
Subject: [PATCH 210/547] Updated append intents to be able to return a failure
 reason

---
 .../ShortcutIntents.intentdefinition          | 90 ++++++++++---------
 1 file changed, 48 insertions(+), 42 deletions(-)

diff --git a/Simplenote/Supporting Files/Base.lproj/ShortcutIntents.intentdefinition b/Simplenote/Supporting Files/Base.lproj/ShortcutIntents.intentdefinition
index fcb648266..04ca75224 100644
--- a/Simplenote/Supporting Files/Base.lproj/ShortcutIntents.intentdefinition	
+++ b/Simplenote/Supporting Files/Base.lproj/ShortcutIntents.intentdefinition	
@@ -11,9 +11,9 @@
 	<key>INIntentDefinitionSystemVersion</key>
 	<string>23E214</string>
 	<key>INIntentDefinitionToolsBuildVersion</key>
-	<string>15E204a</string>
+	<string>15F31d</string>
 	<key>INIntentDefinitionToolsVersion</key>
-	<string>15.3</string>
+	<string>15.4</string>
 	<key>INIntents</key>
 	<array>
 		<dict>
@@ -308,10 +308,33 @@
 						<true/>
 					</dict>
 					<dict>
+						<key>INIntentResponseCodeFormatString</key>
+						<string>${failureReason}</string>
+						<key>INIntentResponseCodeFormatStringID</key>
+						<string>Lyqq4K</string>
 						<key>INIntentResponseCodeName</key>
 						<string>failure</string>
 					</dict>
 				</array>
+				<key>INIntentResponseLastParameterTag</key>
+				<integer>1</integer>
+				<key>INIntentResponseParameters</key>
+				<array>
+					<dict>
+						<key>INIntentResponseParameterDisplayName</key>
+						<string>Failure Reason</string>
+						<key>INIntentResponseParameterDisplayNameID</key>
+						<string>PueDbo</string>
+						<key>INIntentResponseParameterDisplayPriority</key>
+						<integer>1</integer>
+						<key>INIntentResponseParameterName</key>
+						<string>failureReason</string>
+						<key>INIntentResponseParameterTag</key>
+						<integer>1</integer>
+						<key>INIntentResponseParameterType</key>
+						<string>String</string>
+					</dict>
+				</array>
 			</dict>
 			<key>INIntentTitle</key>
 			<string>Append To Note</string>
@@ -409,10 +432,33 @@
 						<true/>
 					</dict>
 					<dict>
+						<key>INIntentResponseCodeFormatString</key>
+						<string>${failureReason}</string>
+						<key>INIntentResponseCodeFormatStringID</key>
+						<string>d67xB8</string>
 						<key>INIntentResponseCodeName</key>
 						<string>failure</string>
 					</dict>
 				</array>
+				<key>INIntentResponseLastParameterTag</key>
+				<integer>1</integer>
+				<key>INIntentResponseParameters</key>
+				<array>
+					<dict>
+						<key>INIntentResponseParameterDisplayName</key>
+						<string>Failure Reason</string>
+						<key>INIntentResponseParameterDisplayNameID</key>
+						<string>2w6Mce</string>
+						<key>INIntentResponseParameterDisplayPriority</key>
+						<integer>1</integer>
+						<key>INIntentResponseParameterName</key>
+						<string>failureReason</string>
+						<key>INIntentResponseParameterTag</key>
+						<integer>1</integer>
+						<key>INIntentResponseParameterType</key>
+						<string>String</string>
+					</dict>
+				</array>
 			</dict>
 			<key>INIntentTitle</key>
 			<string>Create New Note With Content</string>
@@ -660,26 +706,6 @@
 							<key>INIntentParameterPromptDialogType</key>
 							<string>Primary</string>
 						</dict>
-						<dict>
-							<key>INIntentParameterPromptDialogCustom</key>
-							<true/>
-							<key>INIntentParameterPromptDialogFormatString</key>
-							<string>There are ${count} options matching ‘${note}’.</string>
-							<key>INIntentParameterPromptDialogFormatStringID</key>
-							<string>VBtgac</string>
-							<key>INIntentParameterPromptDialogType</key>
-							<string>DisambiguationIntroduction</string>
-						</dict>
-						<dict>
-							<key>INIntentParameterPromptDialogCustom</key>
-							<true/>
-							<key>INIntentParameterPromptDialogFormatString</key>
-							<string>Just to confirm, you wanted ‘${note}’?</string>
-							<key>INIntentParameterPromptDialogFormatStringID</key>
-							<string>MdiZid</string>
-							<key>INIntentParameterPromptDialogType</key>
-							<string>Confirmation</string>
-						</dict>
 					</array>
 					<key>INIntentParameterSupportsDynamicEnumeration</key>
 					<true/>
@@ -797,26 +823,6 @@
 							<key>INIntentParameterPromptDialogType</key>
 							<string>Primary</string>
 						</dict>
-						<dict>
-							<key>INIntentParameterPromptDialogCustom</key>
-							<true/>
-							<key>INIntentParameterPromptDialogFormatString</key>
-							<string>There are ${count} options matching ‘${tag}’.</string>
-							<key>INIntentParameterPromptDialogFormatStringID</key>
-							<string>U4ce2H</string>
-							<key>INIntentParameterPromptDialogType</key>
-							<string>DisambiguationIntroduction</string>
-						</dict>
-						<dict>
-							<key>INIntentParameterPromptDialogCustom</key>
-							<true/>
-							<key>INIntentParameterPromptDialogFormatString</key>
-							<string>Just to confirm, you wanted ‘${tag}’?</string>
-							<key>INIntentParameterPromptDialogFormatStringID</key>
-							<string>qYKqOP</string>
-							<key>INIntentParameterPromptDialogType</key>
-							<string>Confirmation</string>
-						</dict>
 					</array>
 					<key>INIntentParameterSupportsDynamicEnumeration</key>
 					<true/>

From b833946e7e03648da413eec1f0cd1ae676d48a48 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 13 Jun 2024 15:44:45 -0600
Subject: [PATCH 211/547] Refactored downloader and uploader to throw if they
 fail

---
 SimplenoteShare/Simperium/Downloader.swift | 24 ++++++++++++++++++++-
 SimplenoteShare/Simperium/Uploader.swift   | 25 ++++++++++++++++------
 2 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/SimplenoteShare/Simperium/Downloader.swift b/SimplenoteShare/Simperium/Downloader.swift
index b8a4f645e..d86fd86c5 100644
--- a/SimplenoteShare/Simperium/Downloader.swift
+++ b/SimplenoteShare/Simperium/Downloader.swift
@@ -8,6 +8,24 @@
 
 import Foundation
 
+enum DownloaderError: Error {
+    case couldNotFetchNoteContent
+
+    var title: String {
+        switch self {
+        case .couldNotFetchNoteContent:
+            return NSLocalizedString("Could not fetch note content", comment: "note content fetch error title")
+        }
+    }
+
+    var message: String {
+        switch self {
+        case .couldNotFetchNoteContent:
+            return NSLocalizedString("Attempt to fetch current note content failed.  Please try again later.", comment: "Data Fetch error message")
+        }
+    }
+}
+
 class Downloader: NSObject {
 
     /// Simperium's Token
@@ -39,7 +57,11 @@ class Downloader: NSObject {
 
     func extractNoteContent(from data: Data) throws -> String? {
         let jsonObject = try JSONSerialization.jsonObject(with: data) as? [String: Any]
-        return jsonObject?["content"] as? String
+        guard let content =  jsonObject?["content"] as? String else {
+            throw DownloaderError.couldNotFetchNoteContent
+        }
+
+        return content
     }
 }
 
diff --git a/SimplenoteShare/Simperium/Uploader.swift b/SimplenoteShare/Simperium/Uploader.swift
index da6b6e9fe..dc57082a6 100644
--- a/SimplenoteShare/Simperium/Uploader.swift
+++ b/SimplenoteShare/Simperium/Uploader.swift
@@ -17,6 +17,24 @@ class Uploader: NSObject {
 
     // MARK: - Public Methods
     func send(_ note: Note) {
+        let request = requestToSend(note)
+
+        // Task!
+        let sc = URLSessionConfiguration.backgroundSessionConfigurationWithRandomizedIdentifier()
+
+        let session = Foundation.URLSession(configuration: sc, delegate: self, delegateQueue: .main)
+        let task = session.downloadTask(with: request)
+        task.resume()
+    }
+
+    func send(_ note: Note) async throws -> (URL, URLResponse) {
+        let request = requestToSend(note)
+
+        let session = Foundation.URLSession(configuration: .default)
+        return try await session.download(for: request)
+    }
+
+    private func requestToSend(_ note: Note) -> URLRequest {
         // Build the targetURL
         let endpoint = String(format: "%@/%@/%@/i/%@", kSimperiumBaseURL, SPCredentials.simperiumAppID, Settings.bucketName, note.simperiumKey)
         let targetURL = URL(string: endpoint.lowercased())!
@@ -27,12 +45,7 @@ class Uploader: NSObject {
         request.httpBody = note.toJsonData()
         request.setValue(token, forHTTPHeaderField: Settings.authHeader)
 
-        // Task!
-        let sc = URLSessionConfiguration.backgroundSessionConfigurationWithRandomizedIdentifier()
-
-        let session = Foundation.URLSession(configuration: sc, delegate: self, delegateQueue: .main)
-        let task = session.downloadTask(with: request)
-        task.resume()
+        return request
     }
 }
 

From 162eedf20d06112bfc852db6a4f7e0857c1a89ab Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 13 Jun 2024 15:49:59 -0600
Subject: [PATCH 212/547] Refactored append note handlers to return a reason
 for failure

---
 .../AppendNoteIntentHandler.swift             | 27 +++++++++++--------
 .../CreateNewNoteIntentHandler.swift          | 16 +++++------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift b/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift
index 2ab3df7b9..88baa9593 100644
--- a/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift	
+++ b/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift	
@@ -1,11 +1,3 @@
-//
-//  AppendNoteIntentHandler.swift
-//  SimplenoteIntents
-//
-//  Created by Charlie Scheer on 5/6/24.
-//  Copyright © 2024 Automattic. All rights reserved.
-//
-
 import Intents
 
 class AppendNoteIntentHandler: NSObject, AppendNoteIntentHandling {
@@ -38,11 +30,24 @@ class AppendNoteIntentHandler: NSObject, AppendNoteIntentHandling {
         guard let existingContent = try? await Downloader(simperiumToken: token).getNoteContent(for: identifier) else {
             return AppendNoteIntentResponse(code: .failure, userActivity: nil)
         }
+        do {
+            let existingContent = try await Downloader(simperiumToken: token).getNoteContent(for: identifier) ?? String()
+            note.content = existingContent + "\n\(content)"
+        } catch {
+            return handleFailure(with: error, content: content)
+        }
 
-        note.content = existingContent + "\n\(content)"
         let uploader = Uploader(simperiumToken: token)
-        uploader.send(note)
 
-        return AppendNoteIntentResponse(code: .success, userActivity: nil)
+        do {
+            _ = try await uploader.send(note)
+            return AppendNoteIntentResponse(code: .success, userActivity: nil)
+        } catch {
+            return handleFailure(with: error, content: content)
+        }
+    }
+
+    private func handleFailure(with error: Error, content: String) -> AppendNoteIntentResponse {
+        return AppendNoteIntentResponse.failure(failureReason: error.localizedDescription)
     }
 }
diff --git a/SimplenoteIntents/Intent Handlers/CreateNewNoteIntentHandler.swift b/SimplenoteIntents/Intent Handlers/CreateNewNoteIntentHandler.swift
index e105c7436..3ccc24781 100644
--- a/SimplenoteIntents/Intent Handlers/CreateNewNoteIntentHandler.swift	
+++ b/SimplenoteIntents/Intent Handlers/CreateNewNoteIntentHandler.swift	
@@ -1,11 +1,3 @@
-//
-//  CreateNewNoteIntentHandler.swift
-//  SimplenoteIntents
-//
-//  Created by Charlie Scheer on 5/8/24.
-//  Copyright © 2024 Automattic. All rights reserved.
-//
-
 import Intents
 
 class CreateNewNoteIntentHandler: NSObject, CreateNewNoteIntentHandling {
@@ -17,8 +9,12 @@ class CreateNewNoteIntentHandler: NSObject, CreateNewNoteIntentHandling {
             return CreateNewNoteIntentResponse(code: .failure, userActivity: nil)
         }
 
-        Uploader(simperiumToken: token).send(note(with: content))
-        return CreateNewNoteIntentResponse(code: .success, userActivity: nil)
+        do {
+            _ = try await Uploader(simperiumToken: token).send(note(with: content))
+            return CreateNewNoteIntentResponse(code: .success, userActivity: nil)
+        } catch {
+            return CreateNewNoteIntentResponse.failure(failureReason: error.localizedDescription)
+        }
     }
 
     private func note(with content: String) -> Note {

From 0bd1eef2892818e504dd2865b56b683b4c582ce0 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 13 Jun 2024 16:07:26 -0600
Subject: [PATCH 213/547] Added shortcut content recovery if shortcut fails

---
 Simplenote.xcodeproj/project.pbxproj          | 12 ++-
 .../Classes/FileManager+Simplenote.swift      | 14 ++++
 Simplenote/ContentRecoveryManager.swift       | 75 +++++++++++++++++++
 Simplenote/SPAppDelegate+Extensions.swift     | 26 +++++++
 Simplenote/SPAppDelegate.m                    |  1 +
 .../AppendNoteIntentHandler.swift             |  1 +
 .../CreateNewNoteIntentHandler.swift          |  1 +
 7 files changed, 127 insertions(+), 3 deletions(-)
 create mode 100644 Simplenote/ContentRecoveryManager.swift

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index c4d3df429..d1c297534 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -485,6 +485,8 @@
 		BA6DA19226DB5F1B000464C8 /* URLComponents.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA6DA19026DB5F1B000464C8 /* URLComponents.swift */; };
 		BA7071E526BB68A300D5DFF0 /* ListWidgetIntent.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = BA7071E426BB68A300D5DFF0 /* ListWidgetIntent.intentdefinition */; };
 		BA7071E626BB68A300D5DFF0 /* ListWidgetIntent.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = BA7071E426BB68A300D5DFF0 /* ListWidgetIntent.intentdefinition */; };
+		BA7240222C1BA1210088EC11 /* ContentRecoveryManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA7240212C1BA1210088EC11 /* ContentRecoveryManager.swift */; };
+		BA7240232C1BA1930088EC11 /* ContentRecoveryManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA7240212C1BA1210088EC11 /* ContentRecoveryManager.swift */; };
 		BA75D8A326C084E900883FFA /* Text+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA75D87D26C0843600883FFA /* Text+Simplenote.swift */; };
 		BA75D8AE26C0862E00883FFA /* View+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA75D8AD26C0862E00883FFA /* View+Simplenote.swift */; };
 		BA75D8BA26C0865C00883FFA /* Filling.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA75D8B926C0865C00883FFA /* Filling.swift */; };
@@ -509,13 +511,13 @@
 		BA8FC2A5267AC7470082962E /* SharedStorageMigrator.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA8FC2A4267AC7470082962E /* SharedStorageMigrator.swift */; };
 		BA9B19F926A8EF3200692366 /* SpinnerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9B19F826A8EF3200692366 /* SpinnerViewController.swift */; };
 		BA9B59022685549F00DAD1ED /* StorageSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9B59012685549F00DAD1ED /* StorageSettings.swift */; };
-		BA9C7EFB2BF2CC3E007A8460 /* Downloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9C7EFA2BF2CC3E007A8460 /* Downloader.swift */; };
-		BA9C7EFC2BF2CCAE007A8460 /* Downloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9C7EFA2BF2CC3E007A8460 /* Downloader.swift */; };
 		BA9C7EC92BED7AB1007A8460 /* CopyNoteContentIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9C7EC82BED7AB1007A8460 /* CopyNoteContentIntentHandler.swift */; };
 		BA9C7ECB2BED7F7B007A8460 /* FindNoteWithTagIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9C7ECA2BED7F7B007A8460 /* FindNoteWithTagIntentHandler.swift */; };
 		BA9C7ECD2BED813B007A8460 /* IntentTag+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9C7ECC2BED813B007A8460 /* IntentTag+Helpers.swift */; };
 		BA9C7ED02BEE9BA7007A8460 /* ShortcutIntents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = BA9C7ECF2BEE9BA7007A8460 /* ShortcutIntents.intentdefinition */; };
 		BA9C7ED12BEE9BA7007A8460 /* ShortcutIntents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = BA9C7ECF2BEE9BA7007A8460 /* ShortcutIntents.intentdefinition */; };
+		BA9C7EFB2BF2CC3E007A8460 /* Downloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9C7EFA2BF2CC3E007A8460 /* Downloader.swift */; };
+		BA9C7EFC2BF2CCAE007A8460 /* Downloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9C7EFA2BF2CC3E007A8460 /* Downloader.swift */; };
 		BAA4856925D5E40900F3BDB9 /* SearchQuery+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAA4856825D5E40900F3BDB9 /* SearchQuery+Simplenote.swift */; };
 		BAA59E79269F9FE30068BD3D /* Date+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAA59E78269F9FE30068BD3D /* Date+Simplenote.swift */; };
 		BAA63C3325EEDA83001589D7 /* NoteLinkTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAA63C3225EEDA83001589D7 /* NoteLinkTests.swift */; };
@@ -1185,6 +1187,7 @@
 		BA6D7B8A2BE588F0006AE368 /* IntentsError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntentsError.swift; sourceTree = "<group>"; };
 		BA6DA19026DB5F1B000464C8 /* URLComponents.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLComponents.swift; sourceTree = "<group>"; };
 		BA7071E426BB68A300D5DFF0 /* ListWidgetIntent.intentdefinition */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; path = ListWidgetIntent.intentdefinition; sourceTree = "<group>"; };
+		BA7240212C1BA1210088EC11 /* ContentRecoveryManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentRecoveryManager.swift; sourceTree = "<group>"; };
 		BA75D87D26C0843600883FFA /* Text+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Text+Simplenote.swift"; sourceTree = "<group>"; };
 		BA75D8AD26C0862E00883FFA /* View+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+Simplenote.swift"; sourceTree = "<group>"; };
 		BA75D8B926C0865C00883FFA /* Filling.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Filling.swift; sourceTree = "<group>"; };
@@ -1199,7 +1202,6 @@
 		BA8FC2A4267AC7470082962E /* SharedStorageMigrator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharedStorageMigrator.swift; sourceTree = "<group>"; };
 		BA9B19F826A8EF3200692366 /* SpinnerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpinnerViewController.swift; sourceTree = "<group>"; };
 		BA9B59012685549F00DAD1ED /* StorageSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StorageSettings.swift; sourceTree = "<group>"; };
-		BA9C7EFA2BF2CC3E007A8460 /* Downloader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Downloader.swift; sourceTree = "<group>"; };
 		BA9C7EC82BED7AB1007A8460 /* CopyNoteContentIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CopyNoteContentIntentHandler.swift; sourceTree = "<group>"; };
 		BA9C7ECA2BED7F7B007A8460 /* FindNoteWithTagIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FindNoteWithTagIntentHandler.swift; sourceTree = "<group>"; };
 		BA9C7ECC2BED813B007A8460 /* IntentTag+Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "IntentTag+Helpers.swift"; sourceTree = "<group>"; };
@@ -1224,6 +1226,7 @@
 		BA9C7EF52BEE9C3D007A8460 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/ShortcutIntents.strings; sourceTree = "<group>"; };
 		BA9C7EF72BEE9C3E007A8460 /* zh-Hant-TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant-TW"; path = "zh-Hant-TW.lproj/ShortcutIntents.strings"; sourceTree = "<group>"; };
 		BA9C7EF92BEE9C3F007A8460 /* zh-Hans-CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans-CN"; path = "zh-Hans-CN.lproj/ShortcutIntents.strings"; sourceTree = "<group>"; };
+		BA9C7EFA2BF2CC3E007A8460 /* Downloader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Downloader.swift; sourceTree = "<group>"; };
 		BAA4856825D5E40900F3BDB9 /* SearchQuery+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SearchQuery+Simplenote.swift"; sourceTree = "<group>"; };
 		BAA59E78269F9FE30068BD3D /* Date+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Date+Simplenote.swift"; sourceTree = "<group>"; };
 		BAA63C3225EEDA83001589D7 /* NoteLinkTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteLinkTests.swift; sourceTree = "<group>"; };
@@ -2233,6 +2236,7 @@
 				BA3856CC2681715700F388CC /* CoreDataManager.swift */,
 				BA9B59012685549F00DAD1ED /* StorageSettings.swift */,
 				BA32A90E26B7469F00727247 /* WidgetError.swift */,
+				BA7240212C1BA1210088EC11 /* ContentRecoveryManager.swift */,
 			);
 			name = Tools;
 			sourceTree = "<group>";
@@ -3454,6 +3458,7 @@
 				B543C7E323CF76EA00003A80 /* NotesListFilter.swift in Sources */,
 				46A3C96717DFA81A002865AE /* NSManagedObjectContext+CoreDataExtensions.m in Sources */,
 				A6C0DFA725C0992D00B9BE39 /* NoteScrollPositionCache.swift in Sources */,
+				BA7240222C1BA1210088EC11 /* ContentRecoveryManager.swift in Sources */,
 				B59314D81A486B3800B651ED /* SPConstants.m in Sources */,
 				375D24B421E01131007AB25A /* escape.c in Sources */,
 				B50F47A61D1D791B00822748 /* NSURL+Extensions.swift in Sources */,
@@ -3858,6 +3863,7 @@
 				BAF8D45526AE10FC00CA9383 /* Tag+Widget.swift in Sources */,
 				BAFFCEA726DDA9F6007F5EE3 /* ExtensionCoreDataWrapper.swift in Sources */,
 				BAF8D53C26AE175C00CA9383 /* Bundle+Simplenote.swift in Sources */,
+				BA7240232C1BA1930088EC11 /* ContentRecoveryManager.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/Simplenote/Classes/FileManager+Simplenote.swift b/Simplenote/Classes/FileManager+Simplenote.swift
index 95905de1e..c99e7e6b0 100644
--- a/Simplenote/Classes/FileManager+Simplenote.swift
+++ b/Simplenote/Classes/FileManager+Simplenote.swift
@@ -19,4 +19,18 @@ extension FileManager {
     var sharedContainerURL: URL {
         containerURL(forSecurityApplicationGroupIdentifier: SimplenoteConstants.sharedGroupDomain)!
     }
+
+    var recoveryDirectoryURL: URL {
+        sharedContainerURL.appendingPathComponent(Constants.recoveryDir)
+    }
+
+    func directoryExistsAtURL(_ url: URL) -> Bool {
+        var isDir: ObjCBool = false
+        let exists = self.fileExists(atPath: url.path, isDirectory: &isDir)
+        return exists && isDir.boolValue
+    }
+}
+
+private struct Constants {
+    static let recoveryDir = "Recovery"
 }
diff --git a/Simplenote/ContentRecoveryManager.swift b/Simplenote/ContentRecoveryManager.swift
new file mode 100644
index 000000000..b168a05a3
--- /dev/null
+++ b/Simplenote/ContentRecoveryManager.swift
@@ -0,0 +1,75 @@
+import Foundation
+import UniformTypeIdentifiers
+import CoreData
+
+public class ContentRecoveryManager {
+    private let fileManager: FileManager
+
+    public init(fileManager: FileManager = .default) {
+        self.fileManager = fileManager
+    }
+
+    private func createRecoveryDirIfNeeded() {
+        guard !fileManager.directoryExistsAtURL(fileManager.recoveryDirectoryURL) else {
+            return
+        }
+
+        try? fileManager.createDirectory(at: fileManager.recoveryDirectoryURL, withIntermediateDirectories: true)
+    }
+
+    // MARK: Archive
+    //
+    public func archiveContent(_ content: String) {
+        createRecoveryDirIfNeeded()
+
+        guard let data = content.data(using: .utf8) else {
+            return
+        }
+        try? data.write(to: url(for: UUID().uuidString))
+    }
+
+    private func url(for identifier: String) -> URL {
+        let formattedID = identifier.replacingOccurrences(of: "/", with: "-")
+        let fileName = "\(Constants.recoveredContent)-\(formattedID)"
+        return fileManager.recoveryDirectoryURL.appendingPathComponent(fileName, conformingTo: UTType.json)
+    }
+
+    // MARK: Restore
+    //
+    public func prepareRecoveredNoteContentIfNeeded(in context: NSManagedObjectContext) async -> [String] {
+        createRecoveryDirIfNeeded()
+
+        guard let recoveryFiles = try? fileManager.contentsOfDirectory(at: fileManager.recoveryDirectoryURL, includingPropertiesForKeys: nil),
+        !recoveryFiles.isEmpty else {
+            return []
+        }
+
+        return recoveryFiles.compactMap { url in
+            guard let content =  prepareNoteContent(at: url, in: context) else {
+                return nil
+            }
+
+            try? fileManager.removeItem(at: url)
+            return content
+        }
+    }
+
+    private func prepareNoteContent(at url: URL, in context: NSManagedObjectContext) -> String? {
+        guard let data = fileManager.contents(atPath: url.path),
+              let content = String(data: data, encoding: .utf8) else {
+            return nil
+        }
+        return content
+    }
+
+    private func identifier(from url: URL) -> String? {
+        let fileName = url.deletingPathExtension().lastPathComponent
+        let components = fileName.components(separatedBy: "-")
+        return components.last
+    }
+ }
+
+private struct Constants {
+    static let recoveredContent = "recoveredContent"
+    static let richTextKey = "richText"
+}
diff --git a/Simplenote/SPAppDelegate+Extensions.swift b/Simplenote/SPAppDelegate+Extensions.swift
index a2babfdfa..cfac0e0a0 100644
--- a/Simplenote/SPAppDelegate+Extensions.swift
+++ b/Simplenote/SPAppDelegate+Extensions.swift
@@ -557,3 +557,29 @@ extension SPAppDelegate {
         UserDefaults.standard.set(true, forKey: .hasMigratedSustainerPreferences)
     }
 }
+
+// MARK: - Content Recovery
+//
+extension SPAppDelegate {
+    @objc
+    func attemptContentRecoveryIfNeeded() {
+        let context = NSManagedObjectContext(concurrencyType: .privateQueueConcurrencyType)
+        context.persistentStoreCoordinator = coreDataManager.persistentStoreCoordinator
+
+        Task {
+            let restoredContent = await ContentRecoveryManager().prepareRecoveredNoteContentIfNeeded(in: context)
+            restoredContent.forEach({ insertNote(with: $0) })
+        }
+    }
+
+    private func insertNote(with content: String) {
+        guard let note = simperium.notesBucket.insertNewObject() as? Note else {
+            return
+        }
+        note.modificationDate = Date()
+        note.creationDate = Date()
+        note.content = content
+        note.markdown = UserDefaults.standard.bool(forKey: "kMarkdownPreferencesKey")
+        simperium.save()
+    }
+}
diff --git a/Simplenote/SPAppDelegate.m b/Simplenote/SPAppDelegate.m
index 847d1c47b..9537e48de 100644
--- a/Simplenote/SPAppDelegate.m
+++ b/Simplenote/SPAppDelegate.m
@@ -167,6 +167,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 
     [self setupNoticeController];
 
+    [self attemptContentRecoveryIfNeeded];
     return YES;
 }
 
diff --git a/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift b/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift
index 88baa9593..7a03f1e1f 100644
--- a/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift	
+++ b/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift	
@@ -48,6 +48,7 @@ class AppendNoteIntentHandler: NSObject, AppendNoteIntentHandling {
     }
 
     private func handleFailure(with error: Error, content: String) -> AppendNoteIntentResponse {
+        ContentRecoveryManager().archiveContent(content)
         return AppendNoteIntentResponse.failure(failureReason: error.localizedDescription)
     }
 }
diff --git a/SimplenoteIntents/Intent Handlers/CreateNewNoteIntentHandler.swift b/SimplenoteIntents/Intent Handlers/CreateNewNoteIntentHandler.swift
index 3ccc24781..d95f2ee88 100644
--- a/SimplenoteIntents/Intent Handlers/CreateNewNoteIntentHandler.swift	
+++ b/SimplenoteIntents/Intent Handlers/CreateNewNoteIntentHandler.swift	
@@ -13,6 +13,7 @@ class CreateNewNoteIntentHandler: NSObject, CreateNewNoteIntentHandling {
             _ = try await Uploader(simperiumToken: token).send(note(with: content))
             return CreateNewNoteIntentResponse(code: .success, userActivity: nil)
         } catch {
+            ContentRecoveryManager().archiveContent(content)
             return CreateNewNoteIntentResponse.failure(failureReason: error.localizedDescription)
         }
     }

From 0fadd457deb7c1f8fe1f5316d8af6dad595b7c72 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 13 Jun 2024 16:11:34 -0600
Subject: [PATCH 214/547] Added header to note recovery files

---
 Simplenote/ContentRecoveryManager.swift | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/Simplenote/ContentRecoveryManager.swift b/Simplenote/ContentRecoveryManager.swift
index b168a05a3..861c600de 100644
--- a/Simplenote/ContentRecoveryManager.swift
+++ b/Simplenote/ContentRecoveryManager.swift
@@ -56,20 +56,19 @@ public class ContentRecoveryManager {
 
     private func prepareNoteContent(at url: URL, in context: NSManagedObjectContext) -> String? {
         guard let data = fileManager.contents(atPath: url.path),
-              let content = String(data: data, encoding: .utf8) else {
+              let recoveredContent = String(data: data, encoding: .utf8) else {
             return nil
         }
-        return content
-    }
 
-    private func identifier(from url: URL) -> String? {
-        let fileName = url.deletingPathExtension().lastPathComponent
-        let components = fileName.components(separatedBy: "-")
-        return components.last
+        var content = Constants.recoveredContentHeader
+        content += "\n\n"
+        content += recoveredContent
+        return content
     }
  }
 
 private struct Constants {
     static let recoveredContent = "recoveredContent"
     static let richTextKey = "richText"
+    static let recoveredContentHeader = NSLocalizedString("Recovered Note Cotent - ", comment: "Header to put on any files that need to be recovered")
 }

From 4d4485931cb05a2f92087ad91915916e8543b5b0 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 14 Jun 2024 10:54:09 -0300
Subject: [PATCH 215/547] MagicLinkAuthenticator: Wiring endpoint updates

---
 Simplenote/Classes/MagicLinkAuthenticator.swift | 13 +++++++------
 Simplenote/Classes/SimplenoteConstants.swift    |  4 ++++
 Simplenote/LoginRemote.swift                    | 12 +++++++-----
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/Simplenote/Classes/MagicLinkAuthenticator.swift b/Simplenote/Classes/MagicLinkAuthenticator.swift
index 7aa562b45..d66c856ba 100644
--- a/Simplenote/Classes/MagicLinkAuthenticator.swift
+++ b/Simplenote/Classes/MagicLinkAuthenticator.swift
@@ -41,23 +41,23 @@ private extension MagicLinkAuthenticator {
 
     @discardableResult
     func attemptLoginWithAuthCode(queryItems: [URLQueryItem]) -> Bool {
-        guard let email = queryItems.base64DecodedValue(for: Constants.emailField),
+        guard let authKey = queryItems.value(for: Constants.authKeyField),
               let authCode = queryItems.value(for: Constants.authCodeField),
-              !email.isEmpty, !authCode.isEmpty
+              !authKey.isEmpty, !authCode.isEmpty
         else {
             return false
         }
 
-        NSLog("[MagicLinkAuthenticator] Requesting SyncToken for \(email) and \(authCode)")
+        NSLog("[MagicLinkAuthenticator] Requesting SyncToken for \(authKey) and \(authCode)")
         
         Task {
             do {
                 let remote = LoginRemote()
-                let syncToken = try await remote.requestSyncToken(email: email, authCode: authCode)
+                let confirmation = try await remote.requestLoginConfirmation(authKey: authKey, authCode: authCode)
                 
                 Task { @MainActor in
-                    NSLog("[MagicLinkAuthenticator] Should auth with token \(syncToken)")
-                    authenticator.authenticate(withUsername: email, token: syncToken)
+                    NSLog("[MagicLinkAuthenticator] Should auth with token \(confirmation.syncToken)")
+                    authenticator.authenticate(withUsername: confirmation.username, token: confirmation.syncToken)
                 }
 
             } catch {
@@ -92,5 +92,6 @@ private struct Constants {
     static let host = "login"
     static let emailField = "email"
     static let tokenField = "token"
+    static let authKeyField = "auth_key"
     static let authCodeField = "auth_code"
 }
diff --git a/Simplenote/Classes/SimplenoteConstants.swift b/Simplenote/Classes/SimplenoteConstants.swift
index 0aca91f4b..44ebabac8 100644
--- a/Simplenote/Classes/SimplenoteConstants.swift
+++ b/Simplenote/Classes/SimplenoteConstants.swift
@@ -28,6 +28,10 @@ class SimplenoteConstants: NSObject {
     /// Simplenote: Published Notes base URL
     ///
     static let simplenotePublishedBaseURL = "http://simp.ly/publish/"
+    
+    /// Simplenote: Current Platform
+    ///
+    static let simplenotePlatformName = "iOS"
 
     /// Simplenote: Domain for shared group directory
     ///
diff --git a/Simplenote/LoginRemote.swift b/Simplenote/LoginRemote.swift
index 9cae5241e..57b8a7b33 100644
--- a/Simplenote/LoginRemote.swift
+++ b/Simplenote/LoginRemote.swift
@@ -10,11 +10,11 @@ class LoginRemote: Remote {
         performDataTask(with: request, completion: completion)
     }
 
-    func requestSyncToken(email: String, authCode: String) async throws -> String {
-        let request = requestForLoginCompletion(email: email, authCode: authCode)
+    func requestLoginConfirmation(authKey: String, authCode: String) async throws -> LoginConfirmationResponse {
+        let request = requestForLoginCompletion(authKey: authKey, authCode: authCode)
         let response = try await performDataTask(with: request, type: LoginConfirmationResponse.self)
         
-        return response.syncToken
+        return response
     }
 }
 
@@ -22,6 +22,7 @@ class LoginRemote: Remote {
 // MARK: - LoginConfirmationResponse
 //
 struct LoginConfirmationResponse: Decodable {
+    let username: String
     let syncToken: String
 }
 
@@ -34,15 +35,16 @@ private extension LoginRemote {
         let url = URL(string: SimplenoteConstants.loginRequestURL)!
 
         return requestForURL(url, method: RemoteConstants.Method.POST, httpBody: [
+            "request_source": SimplenoteConstants.simplenotePlatformName,
             "username": email.lowercased()
         ])
     }
 
-    func requestForLoginCompletion(email: String, authCode: String) -> URLRequest {
+    func requestForLoginCompletion(authKey: String, authCode: String) -> URLRequest {
         let url = URL(string: SimplenoteConstants.loginCompletionURL)!
 
         return requestForURL(url, method: RemoteConstants.Method.POST, httpBody: [
-            "username": email.lowercased(),
+            "auth_key": authKey,
             "auth_code": authCode
         ])
     }

From 28a478c4bcb74a3d6305d6a9338de88ba05edce5 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 14 Jun 2024 11:21:40 -0300
Subject: [PATCH 216/547] MagicLinkAuthenticator: Reverts unneeded change

---
 Simplenote/Classes/MagicLinkAuthenticator.swift | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Simplenote/Classes/MagicLinkAuthenticator.swift b/Simplenote/Classes/MagicLinkAuthenticator.swift
index d66c856ba..b2cecdb16 100644
--- a/Simplenote/Classes/MagicLinkAuthenticator.swift
+++ b/Simplenote/Classes/MagicLinkAuthenticator.swift
@@ -30,8 +30,7 @@ private extension MagicLinkAuthenticator {
     func attemptLoginWithToken(queryItems: [URLQueryItem]) -> Bool {
         guard let email = queryItems.base64DecodedValue(for: Constants.emailField),
               let token = queryItems.value(for: Constants.tokenField),
-              !email.isEmpty, !token.isEmpty
-        else {
+              !email.isEmpty, !token.isEmpty else {
             return false
         }
 

From 9ad541342fbaa227a8755ac4e8ea3c94c7a20374 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 14 Jun 2024 11:51:54 -0300
Subject: [PATCH 217/547] Remote: Simplifies RemoteError Parsing

---
 Simplenote/Remote.swift      | 36 ++++++++++++++++--------------------
 Simplenote/RemoteError.swift | 20 +++++++++++++++++++-
 2 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/Simplenote/Remote.swift b/Simplenote/Remote.swift
index c334efd16..e06b4ead5 100644
--- a/Simplenote/Remote.swift
+++ b/Simplenote/Remote.swift
@@ -13,13 +13,8 @@ class Remote {
     func performDataTask(with request: URLRequest, completion: @escaping (_ result: Result<Data?, RemoteError>) -> Void) {
         let dataTask = urlSession.dataTask(with: request) { (data, response, dataTaskError) in
             DispatchQueue.main.async {
-                let statusCode = (response as? HTTPURLResponse)?.statusCode ?? 0
-
-                // Check for 2xx status code
-                guard statusCode / 100 == 2 else {
-                    let error = statusCode > 0 ?
-                        RemoteError.requestError(statusCode, dataTaskError):
-                        RemoteError.network
+                
+                if let response, let error = RemoteError(statusCode: response.responseStatusCode, error: dataTaskError) {
                     completion(.failure(error))
                     return
                 }
@@ -35,11 +30,9 @@ class Remote {
     ///
     func performDataTask(with request: URLRequest) async throws -> Data {
         let (data, response) = try await urlSession.data(for: request)
-        let statusCode = (response as? HTTPURLResponse)?.statusCode ?? .zero
-        
-        // Check for 2xx status code
-        guard statusCode / 100 == 2 else {
-            throw RemoteError.requestError(statusCode, nil)
+
+        if let error = RemoteError(statusCode: response.responseStatusCode) {
+            throw error
         }
         
         return data
@@ -50,14 +43,9 @@ class Remote {
     func performDataTask<T: Decodable>(with request: URLRequest, type: T.Type) async throws -> T {
         let data = try await performDataTask(with: request)
 
-        do {
-            let decoder = JSONDecoder()
-            decoder.keyDecodingStrategy = .convertFromSnakeCase
-            return try decoder.decode(type, from: data)
-
-        } catch {
-            throw RemoteError.responseUnableToDecode
-        }
+        let decoder = JSONDecoder()
+        decoder.keyDecodingStrategy = .convertFromSnakeCase
+        return try decoder.decode(type, from: data)
     }
     
     /// Builds a URLRequest for the specified URL / Method / params
@@ -75,3 +63,11 @@ class Remote {
         return request
     }
 }
+
+
+extension URLResponse {
+    
+    var responseStatusCode: Int {
+        (self as? HTTPURLResponse)?.statusCode ?? .zero
+    }
+}
diff --git a/Simplenote/RemoteError.swift b/Simplenote/RemoteError.swift
index cf87d6e30..4366d98e1 100644
--- a/Simplenote/RemoteError.swift
+++ b/Simplenote/RemoteError.swift
@@ -2,10 +2,28 @@ import Foundation
 
 enum RemoteError: Error {
     case network
-    case responseUnableToDecode
+    case tooManyAttempts
     case requestError(Int, Error?)
 }
 
+
+extension RemoteError {
+    
+    init?(statusCode: Int, error: Error? = nil) {
+        if statusCode / 100 == 2 {
+            return nil
+        }
+        
+        switch statusCode {
+        case 429:
+            self = .tooManyAttempts
+        default:
+            self = statusCode > 0 ? .requestError(statusCode, error) : .network
+        }
+    }
+}
+
+
 extension RemoteError: Equatable {
     static func == (lhs: RemoteError, rhs: RemoteError) -> Bool {
         switch (lhs, rhs) {

From bfa25395fcb82d14c3623225b653b1279b6e006b Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 14 Jun 2024 11:52:08 -0300
Subject: [PATCH 218/547] SPAuthHandler: Wires tooManyAttempts Error

---
 Simplenote/Classes/SPAuthError.swift   | 1 -
 Simplenote/Classes/SPAuthHandler.swift | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Simplenote/Classes/SPAuthError.swift b/Simplenote/Classes/SPAuthError.swift
index 8f84d634c..f8155d900 100644
--- a/Simplenote/Classes/SPAuthError.swift
+++ b/Simplenote/Classes/SPAuthError.swift
@@ -10,7 +10,6 @@ enum SPAuthError: Error {
     case compromisedPassword
     case unverifiedEmail
     case tooManyAttempts
-    case unableToDecode
     case unknown(statusCode: Int, response: String?, error: Error?)
 }
 
diff --git a/Simplenote/Classes/SPAuthHandler.swift b/Simplenote/Classes/SPAuthHandler.swift
index 0c658f82a..0562286c6 100644
--- a/Simplenote/Classes/SPAuthHandler.swift
+++ b/Simplenote/Classes/SPAuthHandler.swift
@@ -89,9 +89,9 @@ class SPAuthHandler {
     private func authenticationError(for remoteError: RemoteError) -> SPAuthError {
         switch remoteError {
         case .network:
-            return SPAuthError.network
-        case .responseUnableToDecode:
-            return SPAuthError.unableToDecode
+            return .network
+        case .tooManyAttempts:
+            return .tooManyAttempts
         case .requestError(let statusCode, let error):
             return SPAuthError(signupErrorCode: statusCode, response: error?.localizedDescription, error: error)
         }

From d7f319d7421fec6f5bc06d631ce7e9b6cfed784f Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 14 Jun 2024 11:52:20 -0300
Subject: [PATCH 219/547] SPSettingsViewController: Adds missing handling

---
 Simplenote/Classes/SPSettingsViewController+Extensions.swift | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Simplenote/Classes/SPSettingsViewController+Extensions.swift b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
index 5b4392105..18d09e6f9 100644
--- a/Simplenote/Classes/SPSettingsViewController+Extensions.swift
+++ b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
@@ -191,7 +191,10 @@ extension SPSettingsViewController {
         switch error {
         case .network:
             NoticeController.shared.present(NoticeFactory.networkError())
-        case .responseUnableToDecode, .requestError:
+        case .tooManyAttempts:
+// TODO
+            break
+        case .requestError:
             presentRequestErrorAlert()
         }
     }

From 73c9da177dfeba82ad6ba944dcb15ad7f2cc5ca7 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 14 Jun 2024 12:00:37 -0300
Subject: [PATCH 220/547] LoginRemote: Drops extra newlines

---
 Simplenote/Classes/SPAuthError.swift | 2 +-
 Simplenote/LoginRemote.swift         | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/Simplenote/Classes/SPAuthError.swift b/Simplenote/Classes/SPAuthError.swift
index f8155d900..21d3e61a3 100644
--- a/Simplenote/Classes/SPAuthError.swift
+++ b/Simplenote/Classes/SPAuthError.swift
@@ -89,7 +89,7 @@ extension SPAuthError {
             return NSLocalizedString("You must verify your email before being able to login.", comment: "Error for un verified email")
         case .tooManyAttempts:
             return NSLocalizedString("Too many login attempts. Try again later.", comment: "Error message for too many login attempts")
-        default:
+        case .unknown:
             return NSLocalizedString("We're having problems. Please try again soon.", comment: "Generic error")
         }
     }
diff --git a/Simplenote/LoginRemote.swift b/Simplenote/LoginRemote.swift
index 57b8a7b33..9b7fe181e 100644
--- a/Simplenote/LoginRemote.swift
+++ b/Simplenote/LoginRemote.swift
@@ -6,15 +6,12 @@ class LoginRemote: Remote {
 
     func requestLoginEmail(email: String, completion: @escaping (_ result: Result<Data?, RemoteError>) -> Void) {
         let request = requestForLoginRequest(with: email)
-
         performDataTask(with: request, completion: completion)
     }
 
     func requestLoginConfirmation(authKey: String, authCode: String) async throws -> LoginConfirmationResponse {
         let request = requestForLoginCompletion(authKey: authKey, authCode: authCode)
-        let response = try await performDataTask(with: request, type: LoginConfirmationResponse.self)
-        
-        return response
+        return try await performDataTask(with: request, type: LoginConfirmationResponse.self)
     }
 }
 
@@ -33,7 +30,6 @@ private extension LoginRemote {
 
     func requestForLoginRequest(with email: String) -> URLRequest {
         let url = URL(string: SimplenoteConstants.loginRequestURL)!
-
         return requestForURL(url, method: RemoteConstants.Method.POST, httpBody: [
             "request_source": SimplenoteConstants.simplenotePlatformName,
             "username": email.lowercased()
@@ -42,7 +38,6 @@ private extension LoginRemote {
 
     func requestForLoginCompletion(authKey: String, authCode: String) -> URLRequest {
         let url = URL(string: SimplenoteConstants.loginCompletionURL)!
-
         return requestForURL(url, method: RemoteConstants.Method.POST, httpBody: [
             "auth_key": authKey,
             "auth_code": authCode

From 6f70abc3a9570d716a535ad49a9f3e2b65460ba8 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 14 Jun 2024 12:07:45 -0300
Subject: [PATCH 221/547] MagicLinkAuthenticator: Adds tracks event

---
 Simplenote/Classes/MagicLinkAuthenticator.swift | 1 +
 Simplenote/Classes/SPTracker.h                  | 1 +
 Simplenote/Classes/SPTracker.m                  | 5 +++++
 3 files changed, 7 insertions(+)

diff --git a/Simplenote/Classes/MagicLinkAuthenticator.swift b/Simplenote/Classes/MagicLinkAuthenticator.swift
index b2cecdb16..ce3743ab7 100644
--- a/Simplenote/Classes/MagicLinkAuthenticator.swift
+++ b/Simplenote/Classes/MagicLinkAuthenticator.swift
@@ -57,6 +57,7 @@ private extension MagicLinkAuthenticator {
                 Task { @MainActor in
                     NSLog("[MagicLinkAuthenticator] Should auth with token \(confirmation.syncToken)")
                     authenticator.authenticate(withUsername: confirmation.username, token: confirmation.syncToken)
+                    SPTracker.trackUserConfirmedLoginLink()
                 }
 
             } catch {
diff --git a/Simplenote/Classes/SPTracker.h b/Simplenote/Classes/SPTracker.h
index a0804bfd5..8ce28db92 100644
--- a/Simplenote/Classes/SPTracker.h
+++ b/Simplenote/Classes/SPTracker.h
@@ -82,6 +82,7 @@
 + (void)trackUserAccountCreated;
 + (void)trackUserSignedIn;
 + (void)trackUserRequestedLoginLink;
++ (void)trackUserConfirmedLoginLink;
 + (void)trackUserSignedOut;
 
 #pragma mark - WP.com Sign In
diff --git a/Simplenote/Classes/SPTracker.m b/Simplenote/Classes/SPTracker.m
index a4872fb83..0d24392b1 100644
--- a/Simplenote/Classes/SPTracker.m
+++ b/Simplenote/Classes/SPTracker.m
@@ -322,6 +322,11 @@ + (void)trackUserRequestedLoginLink
     [self trackAutomatticEventWithName:@"user_requested_login_link" properties:nil];
 }
 
++ (void)trackUserConfirmedLoginLink
+{
+    [self trackAutomatticEventWithName:@"user_confirmed_login_link" properties:nil];
+}
+
 + (void)trackUserSignedOut
 {
     [self trackAutomatticEventWithName:@"user_signed_out" properties:nil];

From fe807724543a195a5b502d15dc0c1eb39a314601 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 14 Jun 2024 12:28:59 -0300
Subject: [PATCH 222/547] SPSettingsViewController: Adds missing case

---
 Simplenote/Classes/SPSettingsViewController+Extensions.swift | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Simplenote/Classes/SPSettingsViewController+Extensions.swift b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
index 18d09e6f9..fb9bcead3 100644
--- a/Simplenote/Classes/SPSettingsViewController+Extensions.swift
+++ b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
@@ -191,10 +191,7 @@ extension SPSettingsViewController {
         switch error {
         case .network:
             NoticeController.shared.present(NoticeFactory.networkError())
-        case .tooManyAttempts:
-// TODO
-            break
-        case .requestError:
+        default:
             presentRequestErrorAlert()
         }
     }

From 4915f55521fc40d28d4c172527bf8ceed6203694 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Fri, 14 Jun 2024 13:25:29 -0600
Subject: [PATCH 223/547] Split ContentRecoveryManager into two separate files

---
 Simplenote.xcodeproj/project.pbxproj          | 22 ++++++++---
 ...Manager.swift => RecoveryUnarchiver.swift} | 20 +---------
 Simplenote/SPAppDelegate+Extensions.swift     |  2 +-
 .../AppendNoteIntentHandler.swift             |  2 +-
 .../CreateNewNoteIntentHandler.swift          |  2 +-
 .../Tools/RecoveryArchiver.swift              | 39 +++++++++++++++++++
 6 files changed, 59 insertions(+), 28 deletions(-)
 rename Simplenote/{ContentRecoveryManager.swift => RecoveryUnarchiver.swift} (72%)
 create mode 100644 SimplenoteIntents/Tools/RecoveryArchiver.swift

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index d1c297534..95330ae55 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -464,6 +464,7 @@
 		BA4499B325ED8AB0000C563E /* NoticeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA4499B225ED8AB0000C563E /* NoticeView.swift */; };
 		BA4499BC25ED95D0000C563E /* Notice.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA4499BB25ED95D0000C563E /* Notice.swift */; };
 		BA4499C525ED95E5000C563E /* NoticeAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA4499C425ED95E5000C563E /* NoticeAction.swift */; };
+		BA4A01902C1CCEC100EEE567 /* RecoveryArchiver.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA4A018F2C1CCEC100EEE567 /* RecoveryArchiver.swift */; };
 		BA4C6CFC264C744300B723A7 /* SeparatorsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA4C6CFB264C744300B723A7 /* SeparatorsView.swift */; };
 		BA5249FD26DF0BC600DAC945 /* WidgetWarningView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA5249FC26DF0BC600DAC945 /* WidgetWarningView.swift */; };
 		BA524A0226DF1AE800DAC945 /* WidgetsState.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA524A0126DF1AE800DAC945 /* WidgetsState.swift */; };
@@ -485,8 +486,7 @@
 		BA6DA19226DB5F1B000464C8 /* URLComponents.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA6DA19026DB5F1B000464C8 /* URLComponents.swift */; };
 		BA7071E526BB68A300D5DFF0 /* ListWidgetIntent.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = BA7071E426BB68A300D5DFF0 /* ListWidgetIntent.intentdefinition */; };
 		BA7071E626BB68A300D5DFF0 /* ListWidgetIntent.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = BA7071E426BB68A300D5DFF0 /* ListWidgetIntent.intentdefinition */; };
-		BA7240222C1BA1210088EC11 /* ContentRecoveryManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA7240212C1BA1210088EC11 /* ContentRecoveryManager.swift */; };
-		BA7240232C1BA1930088EC11 /* ContentRecoveryManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA7240212C1BA1210088EC11 /* ContentRecoveryManager.swift */; };
+		BA7240222C1BA1210088EC11 /* RecoveryUnarchiver.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA7240212C1BA1210088EC11 /* RecoveryUnarchiver.swift */; };
 		BA75D8A326C084E900883FFA /* Text+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA75D87D26C0843600883FFA /* Text+Simplenote.swift */; };
 		BA75D8AE26C0862E00883FFA /* View+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA75D8AD26C0862E00883FFA /* View+Simplenote.swift */; };
 		BA75D8BA26C0865C00883FFA /* Filling.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA75D8B926C0865C00883FFA /* Filling.swift */; };
@@ -1168,6 +1168,7 @@
 		BA4499B225ED8AB0000C563E /* NoticeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoticeView.swift; sourceTree = "<group>"; };
 		BA4499BB25ED95D0000C563E /* Notice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notice.swift; sourceTree = "<group>"; };
 		BA4499C425ED95E5000C563E /* NoticeAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoticeAction.swift; sourceTree = "<group>"; };
+		BA4A018F2C1CCEC100EEE567 /* RecoveryArchiver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecoveryArchiver.swift; sourceTree = "<group>"; };
 		BA4C6CFB264C744300B723A7 /* SeparatorsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SeparatorsView.swift; sourceTree = "<group>"; };
 		BA5249FC26DF0BC600DAC945 /* WidgetWarningView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetWarningView.swift; sourceTree = "<group>"; };
 		BA524A0126DF1AE800DAC945 /* WidgetsState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetsState.swift; sourceTree = "<group>"; };
@@ -1187,7 +1188,7 @@
 		BA6D7B8A2BE588F0006AE368 /* IntentsError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntentsError.swift; sourceTree = "<group>"; };
 		BA6DA19026DB5F1B000464C8 /* URLComponents.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLComponents.swift; sourceTree = "<group>"; };
 		BA7071E426BB68A300D5DFF0 /* ListWidgetIntent.intentdefinition */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; path = ListWidgetIntent.intentdefinition; sourceTree = "<group>"; };
-		BA7240212C1BA1210088EC11 /* ContentRecoveryManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentRecoveryManager.swift; sourceTree = "<group>"; };
+		BA7240212C1BA1210088EC11 /* RecoveryUnarchiver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecoveryUnarchiver.swift; sourceTree = "<group>"; };
 		BA75D87D26C0843600883FFA /* Text+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Text+Simplenote.swift"; sourceTree = "<group>"; };
 		BA75D8AD26C0862E00883FFA /* View+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+Simplenote.swift"; sourceTree = "<group>"; };
 		BA75D8B926C0865C00883FFA /* Filling.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Filling.swift; sourceTree = "<group>"; };
@@ -2236,7 +2237,7 @@
 				BA3856CC2681715700F388CC /* CoreDataManager.swift */,
 				BA9B59012685549F00DAD1ED /* StorageSettings.swift */,
 				BA32A90E26B7469F00727247 /* WidgetError.swift */,
-				BA7240212C1BA1210088EC11 /* ContentRecoveryManager.swift */,
+				BA7240212C1BA1210088EC11 /* RecoveryUnarchiver.swift */,
 			);
 			name = Tools;
 			sourceTree = "<group>";
@@ -2414,6 +2415,14 @@
 			name = Notices;
 			sourceTree = "<group>";
 		};
+		BA4A018E2C1CCEB300EEE567 /* Tools */ = {
+			isa = PBXGroup;
+			children = (
+				BA4A018F2C1CCEC100EEE567 /* RecoveryArchiver.swift */,
+			);
+			path = Tools;
+			sourceTree = "<group>";
+		};
 		BA57692A269D2103008B510E /* Remotes */ = {
 			isa = PBXGroup;
 			children = (
@@ -2461,6 +2470,7 @@
 		BAB5762526703C8200B0C56F /* SimplenoteIntents */ = {
 			isa = PBXGroup;
 			children = (
+				BA4A018E2C1CCEB300EEE567 /* Tools */,
 				BA34B04F2BEAEF4800580E15 /* SimplenoteIntentsRelease.entitlements */,
 				092FD78026D7BB72006BE8E2 /* Supporting Files */,
 				BAB5762626703C8200B0C56F /* IntentHandler.swift */,
@@ -3458,7 +3468,7 @@
 				B543C7E323CF76EA00003A80 /* NotesListFilter.swift in Sources */,
 				46A3C96717DFA81A002865AE /* NSManagedObjectContext+CoreDataExtensions.m in Sources */,
 				A6C0DFA725C0992D00B9BE39 /* NoteScrollPositionCache.swift in Sources */,
-				BA7240222C1BA1210088EC11 /* ContentRecoveryManager.swift in Sources */,
+				BA7240222C1BA1210088EC11 /* RecoveryUnarchiver.swift in Sources */,
 				B59314D81A486B3800B651ED /* SPConstants.m in Sources */,
 				375D24B421E01131007AB25A /* escape.c in Sources */,
 				B50F47A61D1D791B00822748 /* NSURL+Extensions.swift in Sources */,
@@ -3845,6 +3855,7 @@
 				BA86622426B3AE4A00466746 /* ExtensionResultsController.swift in Sources */,
 				BABFFF2426CF9094003A4C25 /* WidgetDefaults.swift in Sources */,
 				BA289B762BE45BBB000E6794 /* OpenNoteIntentHandler.swift in Sources */,
+				BA4A01902C1CCEC100EEE567 /* RecoveryArchiver.swift in Sources */,
 				BAF8D46E26AE118800CA9383 /* SPCredentials.swift in Sources */,
 				BAF8D5C526AE254100CA9383 /* Simplenote.xcdatamodeld in Sources */,
 				BAB6C04426BA49F3007495C4 /* ContentSlice.swift in Sources */,
@@ -3863,7 +3874,6 @@
 				BAF8D45526AE10FC00CA9383 /* Tag+Widget.swift in Sources */,
 				BAFFCEA726DDA9F6007F5EE3 /* ExtensionCoreDataWrapper.swift in Sources */,
 				BAF8D53C26AE175C00CA9383 /* Bundle+Simplenote.swift in Sources */,
-				BA7240232C1BA1930088EC11 /* ContentRecoveryManager.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/Simplenote/ContentRecoveryManager.swift b/Simplenote/RecoveryUnarchiver.swift
similarity index 72%
rename from Simplenote/ContentRecoveryManager.swift
rename to Simplenote/RecoveryUnarchiver.swift
index 861c600de..cc19495d8 100644
--- a/Simplenote/ContentRecoveryManager.swift
+++ b/Simplenote/RecoveryUnarchiver.swift
@@ -2,7 +2,7 @@ import Foundation
 import UniformTypeIdentifiers
 import CoreData
 
-public class ContentRecoveryManager {
+public class RecoveryUnarchiver {
     private let fileManager: FileManager
 
     public init(fileManager: FileManager = .default) {
@@ -17,23 +17,6 @@ public class ContentRecoveryManager {
         try? fileManager.createDirectory(at: fileManager.recoveryDirectoryURL, withIntermediateDirectories: true)
     }
 
-    // MARK: Archive
-    //
-    public func archiveContent(_ content: String) {
-        createRecoveryDirIfNeeded()
-
-        guard let data = content.data(using: .utf8) else {
-            return
-        }
-        try? data.write(to: url(for: UUID().uuidString))
-    }
-
-    private func url(for identifier: String) -> URL {
-        let formattedID = identifier.replacingOccurrences(of: "/", with: "-")
-        let fileName = "\(Constants.recoveredContent)-\(formattedID)"
-        return fileManager.recoveryDirectoryURL.appendingPathComponent(fileName, conformingTo: UTType.json)
-    }
-
     // MARK: Restore
     //
     public func prepareRecoveredNoteContentIfNeeded(in context: NSManagedObjectContext) async -> [String] {
@@ -68,7 +51,6 @@ public class ContentRecoveryManager {
  }
 
 private struct Constants {
-    static let recoveredContent = "recoveredContent"
     static let richTextKey = "richText"
     static let recoveredContentHeader = NSLocalizedString("Recovered Note Cotent - ", comment: "Header to put on any files that need to be recovered")
 }
diff --git a/Simplenote/SPAppDelegate+Extensions.swift b/Simplenote/SPAppDelegate+Extensions.swift
index cfac0e0a0..44c959874 100644
--- a/Simplenote/SPAppDelegate+Extensions.swift
+++ b/Simplenote/SPAppDelegate+Extensions.swift
@@ -567,7 +567,7 @@ extension SPAppDelegate {
         context.persistentStoreCoordinator = coreDataManager.persistentStoreCoordinator
 
         Task {
-            let restoredContent = await ContentRecoveryManager().prepareRecoveredNoteContentIfNeeded(in: context)
+            let restoredContent = await RecoveryUnarchiver().prepareRecoveredNoteContentIfNeeded(in: context)
             restoredContent.forEach({ insertNote(with: $0) })
         }
     }
diff --git a/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift b/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift
index 7a03f1e1f..fe045a504 100644
--- a/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift	
+++ b/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift	
@@ -48,7 +48,7 @@ class AppendNoteIntentHandler: NSObject, AppendNoteIntentHandling {
     }
 
     private func handleFailure(with error: Error, content: String) -> AppendNoteIntentResponse {
-        ContentRecoveryManager().archiveContent(content)
+        RecoveryArchiver().archiveContent(content)
         return AppendNoteIntentResponse.failure(failureReason: error.localizedDescription)
     }
 }
diff --git a/SimplenoteIntents/Intent Handlers/CreateNewNoteIntentHandler.swift b/SimplenoteIntents/Intent Handlers/CreateNewNoteIntentHandler.swift
index d95f2ee88..ce5ec9078 100644
--- a/SimplenoteIntents/Intent Handlers/CreateNewNoteIntentHandler.swift	
+++ b/SimplenoteIntents/Intent Handlers/CreateNewNoteIntentHandler.swift	
@@ -13,7 +13,7 @@ class CreateNewNoteIntentHandler: NSObject, CreateNewNoteIntentHandling {
             _ = try await Uploader(simperiumToken: token).send(note(with: content))
             return CreateNewNoteIntentResponse(code: .success, userActivity: nil)
         } catch {
-            ContentRecoveryManager().archiveContent(content)
+            RecoveryArchiver().archiveContent(content)
             return CreateNewNoteIntentResponse.failure(failureReason: error.localizedDescription)
         }
     }
diff --git a/SimplenoteIntents/Tools/RecoveryArchiver.swift b/SimplenoteIntents/Tools/RecoveryArchiver.swift
new file mode 100644
index 000000000..78e71a458
--- /dev/null
+++ b/SimplenoteIntents/Tools/RecoveryArchiver.swift
@@ -0,0 +1,39 @@
+import Foundation
+import UniformTypeIdentifiers
+
+public class RecoveryArchiver {
+    private let fileManager: FileManager
+
+    public init(fileManager: FileManager = .default) {
+        self.fileManager = fileManager
+    }
+
+    private func createRecoveryDirIfNeeded() {
+        guard !fileManager.directoryExistsAtURL(fileManager.recoveryDirectoryURL) else {
+            return
+        }
+
+        try? fileManager.createDirectory(at: fileManager.recoveryDirectoryURL, withIntermediateDirectories: true)
+    }
+
+    // MARK: Archive
+    //
+    public func archiveContent(_ content: String) {
+        createRecoveryDirIfNeeded()
+
+        guard let data = content.data(using: .utf8) else {
+            return
+        }
+        try? data.write(to: url(for: UUID().uuidString))
+    }
+
+    private func url(for identifier: String) -> URL {
+        let formattedID = identifier.replacingOccurrences(of: "/", with: "-")
+        let fileName = "\(Constants.recoveredContent)-\(formattedID)"
+        return fileManager.recoveryDirectoryURL.appendingPathComponent(fileName, conformingTo: UTType.json)
+    }
+}
+
+private struct Constants {
+    static let recoveredContent = "recoveredContent"
+}

From c46fe7a4ac849078cba9f538e53908e7fdb02d14 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Fri, 14 Jun 2024 13:33:27 -0600
Subject: [PATCH 224/547] Refactored recovery unarchiver to handle creating new
 objects

---
 Simplenote/RecoveryUnarchiver.swift       | 33 +++++++++++++----------
 Simplenote/SPAppDelegate+Extensions.swift | 17 +-----------
 2 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/Simplenote/RecoveryUnarchiver.swift b/Simplenote/RecoveryUnarchiver.swift
index cc19495d8..beaa20dbe 100644
--- a/Simplenote/RecoveryUnarchiver.swift
+++ b/Simplenote/RecoveryUnarchiver.swift
@@ -9,6 +9,10 @@ public class RecoveryUnarchiver {
         self.fileManager = fileManager
     }
 
+    var simperium: Simperium {
+        SPAppDelegate.shared().simperium
+    }
+
     private func createRecoveryDirIfNeeded() {
         guard !fileManager.directoryExistsAtURL(fileManager.recoveryDirectoryURL) else {
             return
@@ -19,38 +23,39 @@ public class RecoveryUnarchiver {
 
     // MARK: Restore
     //
-    public func prepareRecoveredNoteContentIfNeeded(in context: NSManagedObjectContext) async -> [String] {
+    public func prepareRecoveredNoteContentIfNeeded() {
         createRecoveryDirIfNeeded()
-
         guard let recoveryFiles = try? fileManager.contentsOfDirectory(at: fileManager.recoveryDirectoryURL, includingPropertiesForKeys: nil),
         !recoveryFiles.isEmpty else {
-            return []
+            return
         }
 
-        return recoveryFiles.compactMap { url in
-            guard let content =  prepareNoteContent(at: url, in: context) else {
-                return nil
-            }
-
+        recoveryFiles.forEach { url in
+            insertNote(from: url)
             try? fileManager.removeItem(at: url)
-            return content
         }
     }
 
-    private func prepareNoteContent(at url: URL, in context: NSManagedObjectContext) -> String? {
+    private func insertNote(from url: URL) {
         guard let data = fileManager.contents(atPath: url.path),
-              let recoveredContent = String(data: data, encoding: .utf8) else {
-            return nil
+              let recoveredContent = String(data: data, encoding: .utf8),
+              let note = simperium.notesBucket.insertNewObject() as? Note else {
+            return
         }
 
         var content = Constants.recoveredContentHeader
         content += "\n\n"
         content += recoveredContent
-        return content
+        note.content = content
+
+        note.modificationDate = Date()
+        note.creationDate = Date()
+        note.markdown = UserDefaults.standard.bool(forKey: "kMarkdownPreferencesKey")
+
+        simperium.save()
     }
  }
 
 private struct Constants {
-    static let richTextKey = "richText"
     static let recoveredContentHeader = NSLocalizedString("Recovered Note Cotent - ", comment: "Header to put on any files that need to be recovered")
 }
diff --git a/Simplenote/SPAppDelegate+Extensions.swift b/Simplenote/SPAppDelegate+Extensions.swift
index 44c959874..b7a268076 100644
--- a/Simplenote/SPAppDelegate+Extensions.swift
+++ b/Simplenote/SPAppDelegate+Extensions.swift
@@ -565,21 +565,6 @@ extension SPAppDelegate {
     func attemptContentRecoveryIfNeeded() {
         let context = NSManagedObjectContext(concurrencyType: .privateQueueConcurrencyType)
         context.persistentStoreCoordinator = coreDataManager.persistentStoreCoordinator
-
-        Task {
-            let restoredContent = await RecoveryUnarchiver().prepareRecoveredNoteContentIfNeeded(in: context)
-            restoredContent.forEach({ insertNote(with: $0) })
-        }
-    }
-
-    private func insertNote(with content: String) {
-        guard let note = simperium.notesBucket.insertNewObject() as? Note else {
-            return
-        }
-        note.modificationDate = Date()
-        note.creationDate = Date()
-        note.content = content
-        note.markdown = UserDefaults.standard.bool(forKey: "kMarkdownPreferencesKey")
-        simperium.save()
+        RecoveryUnarchiver().prepareRecoveredNoteContentIfNeeded()
     }
 }

From a0f1276a61737ec4333f73953431a34dfa3aa95b Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Fri, 14 Jun 2024 13:35:29 -0600
Subject: [PATCH 225/547] Fixed issue defining markdown on recovered notes

---
 Simplenote/RecoveryUnarchiver.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Simplenote/RecoveryUnarchiver.swift b/Simplenote/RecoveryUnarchiver.swift
index beaa20dbe..e1fb2433b 100644
--- a/Simplenote/RecoveryUnarchiver.swift
+++ b/Simplenote/RecoveryUnarchiver.swift
@@ -50,7 +50,7 @@ public class RecoveryUnarchiver {
 
         note.modificationDate = Date()
         note.creationDate = Date()
-        note.markdown = UserDefaults.standard.bool(forKey: "kMarkdownPreferencesKey")
+        note.markdown = UserDefaults.standard.bool(forKey: .markdown)
 
         simperium.save()
     }

From 677710cd81cf83fdc679199b5b76439003053997 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Fri, 14 Jun 2024 13:36:11 -0600
Subject: [PATCH 226/547] Dropped unused context

---
 Simplenote/SPAppDelegate+Extensions.swift | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Simplenote/SPAppDelegate+Extensions.swift b/Simplenote/SPAppDelegate+Extensions.swift
index b7a268076..da9ba5da6 100644
--- a/Simplenote/SPAppDelegate+Extensions.swift
+++ b/Simplenote/SPAppDelegate+Extensions.swift
@@ -563,8 +563,6 @@ extension SPAppDelegate {
 extension SPAppDelegate {
     @objc
     func attemptContentRecoveryIfNeeded() {
-        let context = NSManagedObjectContext(concurrencyType: .privateQueueConcurrencyType)
-        context.persistentStoreCoordinator = coreDataManager.persistentStoreCoordinator
         RecoveryUnarchiver().prepareRecoveredNoteContentIfNeeded()
     }
 }

From 7824122ab7f47ae22a8aadd806d482f3d2829409 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Fri, 14 Jun 2024 13:37:13 -0600
Subject: [PATCH 227/547] Dropped repeat fetching of existing app content

---
 .../Intent Handlers/AppendNoteIntentHandler.swift              | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift b/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift
index fe045a504..73b3a150b 100644
--- a/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift	
+++ b/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift	
@@ -27,9 +27,6 @@ class AppendNoteIntentHandler: NSObject, AppendNoteIntentHandling {
             return AppendNoteIntentResponse(code: .failure, userActivity: nil)
         }
 
-        guard let existingContent = try? await Downloader(simperiumToken: token).getNoteContent(for: identifier) else {
-            return AppendNoteIntentResponse(code: .failure, userActivity: nil)
-        }
         do {
             let existingContent = try await Downloader(simperiumToken: token).getNoteContent(for: identifier) ?? String()
             note.content = existingContent + "\n\(content)"

From de636357cd399243965b95329e9e56c2412870fe Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Fri, 14 Jun 2024 13:46:00 -0600
Subject: [PATCH 228/547] Refactored creating recovery dir to filemanager
 extension

---
 .../Classes/FileManager+Simplenote.swift      | 21 +++++++++++++++++--
 Simplenote/RecoveryUnarchiver.swift           | 14 +++----------
 .../Tools/RecoveryArchiver.swift              | 21 ++++++++-----------
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/Simplenote/Classes/FileManager+Simplenote.swift b/Simplenote/Classes/FileManager+Simplenote.swift
index c99e7e6b0..782f685a7 100644
--- a/Simplenote/Classes/FileManager+Simplenote.swift
+++ b/Simplenote/Classes/FileManager+Simplenote.swift
@@ -20,8 +20,25 @@ extension FileManager {
         containerURL(forSecurityApplicationGroupIdentifier: SimplenoteConstants.sharedGroupDomain)!
     }
 
-    var recoveryDirectoryURL: URL {
-        sharedContainerURL.appendingPathComponent(Constants.recoveryDir)
+    func recoveryDirectoryURL() -> URL? {
+        let dir = sharedContainerURL.appendingPathComponent(Constants.recoveryDir)
+
+        do {
+            try createDirectoryIfNeeded(at: dir)
+        } catch {
+            NSLog("Could not create recovery directory because: $@", error.localizedDescription)
+            return nil
+        }
+
+        return dir
+    }
+
+    func createDirectoryIfNeeded(at url: URL, withIntermediateDirectories: Bool = true) throws {
+        if directoryExistsAtURL(url) {
+            return
+        }
+
+        try createDirectory(at: url, withIntermediateDirectories: true)
     }
 
     func directoryExistsAtURL(_ url: URL) -> Bool {
diff --git a/Simplenote/RecoveryUnarchiver.swift b/Simplenote/RecoveryUnarchiver.swift
index e1fb2433b..d7c4d84e0 100644
--- a/Simplenote/RecoveryUnarchiver.swift
+++ b/Simplenote/RecoveryUnarchiver.swift
@@ -13,20 +13,12 @@ public class RecoveryUnarchiver {
         SPAppDelegate.shared().simperium
     }
 
-    private func createRecoveryDirIfNeeded() {
-        guard !fileManager.directoryExistsAtURL(fileManager.recoveryDirectoryURL) else {
-            return
-        }
-
-        try? fileManager.createDirectory(at: fileManager.recoveryDirectoryURL, withIntermediateDirectories: true)
-    }
-
     // MARK: Restore
     //
     public func prepareRecoveredNoteContentIfNeeded() {
-        createRecoveryDirIfNeeded()
-        guard let recoveryFiles = try? fileManager.contentsOfDirectory(at: fileManager.recoveryDirectoryURL, includingPropertiesForKeys: nil),
-        !recoveryFiles.isEmpty else {
+        guard let recoveryURL = fileManager.recoveryDirectoryURL(),
+              let recoveryFiles = try? fileManager.contentsOfDirectory(at: recoveryURL, includingPropertiesForKeys: nil),
+              !recoveryFiles.isEmpty else {
             return
         }
 
diff --git a/SimplenoteIntents/Tools/RecoveryArchiver.swift b/SimplenoteIntents/Tools/RecoveryArchiver.swift
index 78e71a458..17f516c9c 100644
--- a/SimplenoteIntents/Tools/RecoveryArchiver.swift
+++ b/SimplenoteIntents/Tools/RecoveryArchiver.swift
@@ -8,29 +8,26 @@ public class RecoveryArchiver {
         self.fileManager = fileManager
     }
 
-    private func createRecoveryDirIfNeeded() {
-        guard !fileManager.directoryExistsAtURL(fileManager.recoveryDirectoryURL) else {
-            return
-        }
-
-        try? fileManager.createDirectory(at: fileManager.recoveryDirectoryURL, withIntermediateDirectories: true)
-    }
-
     // MARK: Archive
     //
     public func archiveContent(_ content: String) {
-        createRecoveryDirIfNeeded()
+        guard let fileURL = url(for: UUID().uuidString) else {
+            return
+        }
 
         guard let data = content.data(using: .utf8) else {
             return
         }
-        try? data.write(to: url(for: UUID().uuidString))
+        try? data.write(to: fileURL)
     }
 
-    private func url(for identifier: String) -> URL {
+    private func url(for identifier: String) -> URL? {
+        guard let recoveryDirURL = fileManager.recoveryDirectoryURL() else {
+            return nil
+        }
         let formattedID = identifier.replacingOccurrences(of: "/", with: "-")
         let fileName = "\(Constants.recoveredContent)-\(formattedID)"
-        return fileManager.recoveryDirectoryURL.appendingPathComponent(fileName, conformingTo: UTType.json)
+        return recoveryDirURL.appendingPathComponent(fileName, conformingTo: UTType.json)
     }
 }
 

From 2d42e295a35ae82ee73dd97c56e443c891fe02ba Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Fri, 14 Jun 2024 14:07:36 -0600
Subject: [PATCH 229/547] Recover files when app becomes active instead of on
 launch

---
 Simplenote/RecoveryUnarchiver.swift       | 2 +-
 Simplenote/SPAppDelegate+Extensions.swift | 2 +-
 Simplenote/SPAppDelegate.m                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Simplenote/RecoveryUnarchiver.swift b/Simplenote/RecoveryUnarchiver.swift
index d7c4d84e0..c6b40fb51 100644
--- a/Simplenote/RecoveryUnarchiver.swift
+++ b/Simplenote/RecoveryUnarchiver.swift
@@ -15,7 +15,7 @@ public class RecoveryUnarchiver {
 
     // MARK: Restore
     //
-    public func prepareRecoveredNoteContentIfNeeded() {
+    public func insertNotesFromRecoveryFilesIfNeeded() {
         guard let recoveryURL = fileManager.recoveryDirectoryURL(),
               let recoveryFiles = try? fileManager.contentsOfDirectory(at: recoveryURL, includingPropertiesForKeys: nil),
               !recoveryFiles.isEmpty else {
diff --git a/Simplenote/SPAppDelegate+Extensions.swift b/Simplenote/SPAppDelegate+Extensions.swift
index da9ba5da6..66ed67990 100644
--- a/Simplenote/SPAppDelegate+Extensions.swift
+++ b/Simplenote/SPAppDelegate+Extensions.swift
@@ -563,6 +563,6 @@ extension SPAppDelegate {
 extension SPAppDelegate {
     @objc
     func attemptContentRecoveryIfNeeded() {
-        RecoveryUnarchiver().prepareRecoveredNoteContentIfNeeded()
+        RecoveryUnarchiver().insertNotesFromRecoveryFilesIfNeeded()
     }
 }
diff --git a/Simplenote/SPAppDelegate.m b/Simplenote/SPAppDelegate.m
index 9537e48de..b83831128 100644
--- a/Simplenote/SPAppDelegate.m
+++ b/Simplenote/SPAppDelegate.m
@@ -167,7 +167,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 
     [self setupNoticeController];
 
-    [self attemptContentRecoveryIfNeeded];
     return YES;
 }
 
@@ -175,6 +174,7 @@ - (void)applicationDidBecomeActive:(UIApplication *)application
 {
     [SPTracker trackApplicationOpened];
     [self syncWidgetDefaults];
+    [self attemptContentRecoveryIfNeeded];
 }
 
 - (void)applicationDidEnterBackground:(UIApplication *)application

From b9da5bf632077007e0841e51057a8b4d34b808e1 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Fri, 14 Jun 2024 14:29:23 -0600
Subject: [PATCH 230/547] Added information into shortcut errors showing
 recovery details

---
 SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift | 2 +-
 .../Intent Handlers/CreateNewNoteIntentHandler.swift            | 2 +-
 SimplenoteIntents/IntentsConstants.swift                        | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift b/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift
index 73b3a150b..02d8908f4 100644
--- a/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift	
+++ b/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift	
@@ -46,6 +46,6 @@ class AppendNoteIntentHandler: NSObject, AppendNoteIntentHandling {
 
     private func handleFailure(with error: Error, content: String) -> AppendNoteIntentResponse {
         RecoveryArchiver().archiveContent(content)
-        return AppendNoteIntentResponse.failure(failureReason: error.localizedDescription)
+        return AppendNoteIntentResponse.failure(failureReason: "\(error.localizedDescription) - \(IntentsConstants.recoveryMessage)")
     }
 }
diff --git a/SimplenoteIntents/Intent Handlers/CreateNewNoteIntentHandler.swift b/SimplenoteIntents/Intent Handlers/CreateNewNoteIntentHandler.swift
index ce5ec9078..c36b20a72 100644
--- a/SimplenoteIntents/Intent Handlers/CreateNewNoteIntentHandler.swift	
+++ b/SimplenoteIntents/Intent Handlers/CreateNewNoteIntentHandler.swift	
@@ -14,7 +14,7 @@ class CreateNewNoteIntentHandler: NSObject, CreateNewNoteIntentHandling {
             return CreateNewNoteIntentResponse(code: .success, userActivity: nil)
         } catch {
             RecoveryArchiver().archiveContent(content)
-            return CreateNewNoteIntentResponse.failure(failureReason: error.localizedDescription)
+            return CreateNewNoteIntentResponse.failure(failureReason: "\(error.localizedDescription) - \(IntentsConstants.recoveryMessage)")
         }
     }
 
diff --git a/SimplenoteIntents/IntentsConstants.swift b/SimplenoteIntents/IntentsConstants.swift
index 18e8bfdb8..f91def3a8 100644
--- a/SimplenoteIntents/IntentsConstants.swift
+++ b/SimplenoteIntents/IntentsConstants.swift
@@ -10,4 +10,6 @@ import Foundation
 
 struct IntentsConstants {
     static let noteIdentifierKey = "OpenNoteIntentHandlerIdentifierKey"
+
+    static let recoveryMessage = NSLocalizedString("Will attempt to recover shortcut content on next launch", comment: "Alerting users that we will attempt to restore lost content on next launch")
 }

From a34a3195fed6110df2d1e2992fc09949e9a90340 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Fri, 14 Jun 2024 17:02:24 -0600
Subject: [PATCH 231/547] Refactored append note intent handler to avoid
 multiple do catches

---
 .../AppendNoteIntentHandler.swift             | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift b/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift
index 02d8908f4..97a7b15ac 100644
--- a/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift	
+++ b/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift	
@@ -28,20 +28,23 @@ class AppendNoteIntentHandler: NSObject, AppendNoteIntentHandling {
         }
 
         do {
-            let existingContent = try await Downloader(simperiumToken: token).getNoteContent(for: identifier) ?? String()
+            let existingContent = try await downloadNoteContent(for: identifier, token: token) ?? String()
             note.content = existingContent + "\n\(content)"
+
+            try await uploadNoteContent(note, token: token)
         } catch {
             return handleFailure(with: error, content: content)
         }
+    }
 
-        let uploader = Uploader(simperiumToken: token)
+    private func downloadNoteContent(for identifier: String, token: String) async throws -> String? {
+        let downloader = Downloader(simperiumToken: token)
+        return try await downloader.getNoteContent(for: identifier)
+    }
 
-        do {
-            _ = try await uploader.send(note)
-            return AppendNoteIntentResponse(code: .success, userActivity: nil)
-        } catch {
-            return handleFailure(with: error, content: content)
-        }
+    private func uploadNoteContent(_ note: Note, token: String) async throws {
+        let uploader = Uploader(simperiumToken: token)
+        _ = try await uploader.send(note)
     }
 
     private func handleFailure(with error: Error, content: String) -> AppendNoteIntentResponse {

From 5fb295472898f6e7c4ed477fe0c4624f3f06cc1e Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Fri, 14 Jun 2024 17:03:13 -0600
Subject: [PATCH 232/547] Added missing return for append note intent handler

---
 SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift b/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift
index 97a7b15ac..4a9350882 100644
--- a/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift	
+++ b/SimplenoteIntents/Intent Handlers/AppendNoteIntentHandler.swift	
@@ -32,6 +32,7 @@ class AppendNoteIntentHandler: NSObject, AppendNoteIntentHandling {
             note.content = existingContent + "\n\(content)"
 
             try await uploadNoteContent(note, token: token)
+            return AppendNoteIntentResponse(code: .success, userActivity: nil)
         } catch {
             return handleFailure(with: error, content: content)
         }

From 23bd4e9a21c1813a1a12dbdea4341385575ae514 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Fri, 14 Jun 2024 17:04:35 -0600
Subject: [PATCH 233/547] Moved simperium for unarchiver to be stored as a
 property

---
 Simplenote/RecoveryUnarchiver.swift       | 8 +++-----
 Simplenote/SPAppDelegate+Extensions.swift | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Simplenote/RecoveryUnarchiver.swift b/Simplenote/RecoveryUnarchiver.swift
index c6b40fb51..0e67e8c46 100644
--- a/Simplenote/RecoveryUnarchiver.swift
+++ b/Simplenote/RecoveryUnarchiver.swift
@@ -4,13 +4,11 @@ import CoreData
 
 public class RecoveryUnarchiver {
     private let fileManager: FileManager
+    private let simperium: Simperium
 
-    public init(fileManager: FileManager = .default) {
+    public init(fileManager: FileManager = .default, simperium: Simperium) {
         self.fileManager = fileManager
-    }
-
-    var simperium: Simperium {
-        SPAppDelegate.shared().simperium
+        self.simperium = simperium
     }
 
     // MARK: Restore
diff --git a/Simplenote/SPAppDelegate+Extensions.swift b/Simplenote/SPAppDelegate+Extensions.swift
index 66ed67990..fd4430759 100644
--- a/Simplenote/SPAppDelegate+Extensions.swift
+++ b/Simplenote/SPAppDelegate+Extensions.swift
@@ -563,6 +563,6 @@ extension SPAppDelegate {
 extension SPAppDelegate {
     @objc
     func attemptContentRecoveryIfNeeded() {
-        RecoveryUnarchiver().insertNotesFromRecoveryFilesIfNeeded()
+        RecoveryUnarchiver(simperium: simperium).insertNotesFromRecoveryFilesIfNeeded()
     }
 }

From 88676927ec3602632173cf202a9858192e60e332 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Tue, 18 Jun 2024 15:13:33 -0300
Subject: [PATCH 234/547] Fixes breaking Unit Tests

---
 Simplenote/Remote.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Simplenote/Remote.swift b/Simplenote/Remote.swift
index e06b4ead5..5c32883ea 100644
--- a/Simplenote/Remote.swift
+++ b/Simplenote/Remote.swift
@@ -14,7 +14,7 @@ class Remote {
         let dataTask = urlSession.dataTask(with: request) { (data, response, dataTaskError) in
             DispatchQueue.main.async {
                 
-                if let response, let error = RemoteError(statusCode: response.responseStatusCode, error: dataTaskError) {
+                if let error = RemoteError(statusCode: response?.responseStatusCode ?? .zero, error: dataTaskError) {
                     completion(.failure(error))
                     return
                 }

From 3709c897f096d1f019692fbbcc904099635230bc Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Wed, 26 Jun 2024 14:32:42 -0300
Subject: [PATCH 235/547] SimplenoteConstants: Updates Magic Link Endpoints

---
 Simplenote/Classes/SimplenoteConstants.swift | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Simplenote/Classes/SimplenoteConstants.swift b/Simplenote/Classes/SimplenoteConstants.swift
index 44ebabac8..7d1c734fd 100644
--- a/Simplenote/Classes/SimplenoteConstants.swift
+++ b/Simplenote/Classes/SimplenoteConstants.swift
@@ -45,9 +45,8 @@ class SimplenoteConstants: NSObject {
     ///
     static let resetPasswordURL     = currentEngineBaseURL.appendingPathComponent("/reset/?redirect=simplenote://launch&email=")
     static let settingsURL          = currentEngineBaseURL.appendingPathComponent("/settings")
-/// TODO: FIXME
-    static let loginRequestURL      = "https://magic-links-dot-simple-note-hrd.appspot.com/account/request-login" ////currentEngineBaseURL.appendingPathComponent("/account/request-login")
-    static let loginCompletionURL   = "https://magic-links-dot-simple-note-hrd.appspot.com/account/complete-login" ////currentEngineBaseURL.appendingPathComponent("/account/complete-login")
+    static let loginRequestURL      = currentEngineBaseURL.appendingPathComponent("/account/request-login")
+    static let loginCompletionURL   = currentEngineBaseURL.appendingPathComponent("/account/complete-login")
     static let signupURL            = currentEngineBaseURL.appendingPathComponent("/account/request-signup")
     static let verificationURL      = currentEngineBaseURL.appendingPathComponent("/account/verify-email/")
     static let accountDeletionURL   = currentEngineBaseURL.appendingPathComponent("/account/request-delete/")

From 59da15534e87271264540db8148dfd31cbed762c Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Thu, 27 Jun 2024 14:44:44 -0300
Subject: [PATCH 236/547] MagicLinkConfirmationView: Updates copy

---
 Simplenote/MagicLinkConfirmationView.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Simplenote/MagicLinkConfirmationView.swift b/Simplenote/MagicLinkConfirmationView.swift
index 5a4e951cf..b14dbb173 100644
--- a/Simplenote/MagicLinkConfirmationView.swift
+++ b/Simplenote/MagicLinkConfirmationView.swift
@@ -31,7 +31,7 @@ struct MagicLinkConfirmationView: View {
                 Spacer()
                     .frame(height: Metrics.titlePaddingBottom)
                 
-                Text("If an account exists, we've sent an email to **\(email)** containing a link that'll log you in.")
+                Text("If an account exists, we've sent an email with a link that'll log you in to **\(email)**")
                     .font(.system(size: Metrics.detailsFontSize))
                     .multilineTextAlignment(.center)
             }

From 40575b588dab22e24383763794a46b6932202b30 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Thu, 27 Jun 2024 15:24:15 -0300
Subject: [PATCH 237/547] Renames MagicLinkConfirmationView >
 MagicLinkRequestedView

---
 Simplenote.xcodeproj/project.pbxproj                      | 8 ++++----
 Simplenote/Classes/SPAuthViewController.swift             | 6 +++---
 ...onfirmationView.swift => MagicLinkRequestedView.swift} | 8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)
 rename Simplenote/{MagicLinkConfirmationView.swift => MagicLinkRequestedView.swift} (92%)

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index 49cee357c..129029306 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -296,7 +296,7 @@
 		B549E249290B3BDB0072C3E8 /* Preferences+IAP.swift in Sources */ = {isa = PBXBuildFile; fileRef = B549E248290B3BDB0072C3E8 /* Preferences+IAP.swift */; };
 		B549E24B290B3DD70072C3E8 /* StoreConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = B549E24A290B3DD70072C3E8 /* StoreConstants.swift */; };
 		B54A11C22C135EA2002AC8AA /* UIButton+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54A11C12C135EA2002AC8AA /* UIButton+Simplenote.swift */; };
-		B54A11C42C136225002AC8AA /* MagicLinkConfirmationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54A11C32C136225002AC8AA /* MagicLinkConfirmationView.swift */; };
+		B54A11C42C136225002AC8AA /* MagicLinkRequestedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54A11C32C136225002AC8AA /* MagicLinkRequestedView.swift */; };
 		B54B04D82407169500401FBB /* SPAppDelegate+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54B04D72407169500401FBB /* SPAppDelegate+Extensions.swift */; };
 		B54D9C572909BA2600D0E0EC /* StoreManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54D9C562909BA2600D0E0EC /* StoreManager.swift */; };
 		B54D9C592909CC4400D0E0EC /* StoreProduct.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54D9C582909CC4400D0E0EC /* StoreProduct.swift */; };
@@ -992,7 +992,7 @@
 		B549E248290B3BDB0072C3E8 /* Preferences+IAP.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Preferences+IAP.swift"; sourceTree = "<group>"; };
 		B549E24A290B3DD70072C3E8 /* StoreConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoreConstants.swift; sourceTree = "<group>"; };
 		B54A11C12C135EA2002AC8AA /* UIButton+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIButton+Simplenote.swift"; sourceTree = "<group>"; };
-		B54A11C32C136225002AC8AA /* MagicLinkConfirmationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MagicLinkConfirmationView.swift; sourceTree = "<group>"; };
+		B54A11C32C136225002AC8AA /* MagicLinkRequestedView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MagicLinkRequestedView.swift; sourceTree = "<group>"; };
 		B54B04D72407169500401FBB /* SPAppDelegate+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SPAppDelegate+Extensions.swift"; sourceTree = "<group>"; };
 		B54D9C542909B21700D0E0EC /* Simplenote 6.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Simplenote 6.xcdatamodel"; sourceTree = "<group>"; };
 		B54D9C562909BA2600D0E0EC /* StoreManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoreManager.swift; sourceTree = "<group>"; };
@@ -2077,9 +2077,9 @@
 				B5AB169722FA124F00B4EBA5 /* SPSheetController.swift */,
 				B5AB169922FA128000B4EBA5 /* SPSheetController.xib */,
 				A6CDD9C725F0163D00E0BC4D /* MagicLinkAuthenticator.swift */,
+				B54A11C32C136225002AC8AA /* MagicLinkRequestedView.swift */,
 				A628BEB425ECD97900121B64 /* SignupVerificationViewController.swift */,
 				A628BEB525ECD97900121B64 /* SignupVerificationViewController.xib */,
-				B54A11C32C136225002AC8AA /* MagicLinkConfirmationView.swift */,
 			);
 			name = Onboarding;
 			sourceTree = "<group>";
@@ -3703,7 +3703,7 @@
 				B5CBEF4222D3B419009DBE67 /* Bundle+Simplenote.swift in Sources */,
 				B575736C232D454300443C2E /* UIColor+Helpers.swift in Sources */,
 				37E55A6721BF2B1800F14241 /* SPTextAttachment.swift in Sources */,
-				B54A11C42C136225002AC8AA /* MagicLinkConfirmationView.swift in Sources */,
+				B54A11C42C136225002AC8AA /* MagicLinkRequestedView.swift in Sources */,
 				BA8FC2A5267AC7470082962E /* SharedStorageMigrator.swift in Sources */,
 				A69F850F253EC2B2005140F2 /* SPCardConfigurable.swift in Sources */,
 				B5BE05541AB75C3B002417BF /* Settings.m in Sources */,
diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index df535f45c..39e19309e 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -314,7 +314,7 @@ private extension SPAuthViewController {
             if let error {
                 self.handleError(error: error)
             } else {
-                self.presentMagicLinkConfirmationView(email: email)
+                self.presentMagicLinkRequestedView(email: email)
                 SPTracker.trackUserRequestedLoginLink()
             }
 
@@ -368,8 +368,8 @@ private extension SPAuthViewController {
         navigationController?.pushViewController(viewController, animated: true)
     }
     
-    private func presentMagicLinkConfirmationView(email: String) {
-        let rootView = MagicLinkConfirmationView(email: email)
+    private func presentMagicLinkRequestedView(email: String) {
+        let rootView = MagicLinkRequestedView(email: email)
         let hostingController = UIHostingController(rootView: rootView)
         hostingController.modalPresentationStyle = .formSheet
         hostingController.sheetPresentationController?.detents = [.medium()]
diff --git a/Simplenote/MagicLinkConfirmationView.swift b/Simplenote/MagicLinkRequestedView.swift
similarity index 92%
rename from Simplenote/MagicLinkConfirmationView.swift
rename to Simplenote/MagicLinkRequestedView.swift
index b14dbb173..d1afdbca6 100644
--- a/Simplenote/MagicLinkConfirmationView.swift
+++ b/Simplenote/MagicLinkRequestedView.swift
@@ -3,9 +3,9 @@ import SwiftUI
 import Gridicons
 
 
-// MARK: - MagicLinkConfirmationView
+// MARK: - MagicLinkRequestedView
 //
-struct MagicLinkConfirmationView: View {
+struct MagicLinkRequestedView: View {
     @Environment(\.presentationMode) var presentationMode
     @State private var displaysFullImage: Bool = false
     let email: String
@@ -73,8 +73,8 @@ private enum MagicLinkImages {
 }
 
 
-struct MagicLinkConfirmationView_Previews: PreviewProvider {
+struct MagicLinkRequestedView_Previews: PreviewProvider {
     static var previews: some View {
-        MagicLinkConfirmationView(email: "lord@yosemite.com")
+        MagicLinkRequestedView(email: "lord@yosemite.com")
     }
 }

From d0e26e2452717a1cf31a5794bf25ba4497170be5 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Thu, 27 Jun 2024 15:44:52 -0300
Subject: [PATCH 238/547] Implements MagicLinkInvalidView

---
 Simplenote.xcodeproj/project.pbxproj  |  4 ++
 Simplenote/MagicLinkInvalidView.swift | 61 +++++++++++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 Simplenote/MagicLinkInvalidView.swift

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index 129029306..ac6b13a17 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -327,6 +327,7 @@
 		B56AA00022AEDD06003F85CB /* PlainTextExtractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56A9FFF22AEDD06003F85CB /* PlainTextExtractor.swift */; };
 		B56AA00622B03CBB003F85CB /* Extractors.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56AA00522B03CBB003F85CB /* Extractors.swift */; };
 		B56B357F1AC3565600B9F365 /* UITextView+Simplenote.m in Sources */ = {isa = PBXBuildFile; fileRef = B56B357D1AC3565600B9F365 /* UITextView+Simplenote.m */; };
+		B56BAF612C2DE317005065C9 /* MagicLinkInvalidView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56BAF602C2DE317005065C9 /* MagicLinkInvalidView.swift */; };
 		B56C8CA2234CEAF100FE55F4 /* TagListViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = B56C8CA1234CEAF100FE55F4 /* TagListViewController.xib */; };
 		B56E763422BD394C00C5AA47 /* UIImage+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56E763322BD394C00C5AA47 /* UIImage+Simplenote.swift */; };
 		B56E763622BD565700C5AA47 /* UIView+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56E763522BD565700C5AA47 /* UIView+Simplenote.swift */; };
@@ -1036,6 +1037,7 @@
 		B56AA00522B03CBB003F85CB /* Extractors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extractors.swift; sourceTree = "<group>"; };
 		B56B357C1AC3565600B9F365 /* UITextView+Simplenote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UITextView+Simplenote.h"; path = "Classes/UITextView+Simplenote.h"; sourceTree = "<group>"; };
 		B56B357D1AC3565600B9F365 /* UITextView+Simplenote.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UITextView+Simplenote.m"; path = "Classes/UITextView+Simplenote.m"; sourceTree = "<group>"; };
+		B56BAF602C2DE317005065C9 /* MagicLinkInvalidView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MagicLinkInvalidView.swift; sourceTree = "<group>"; };
 		B56C8CA1234CEAF100FE55F4 /* TagListViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = TagListViewController.xib; path = Classes/TagListViewController.xib; sourceTree = "<group>"; };
 		B56E763322BD394C00C5AA47 /* UIImage+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "UIImage+Simplenote.swift"; path = "Classes/UIImage+Simplenote.swift"; sourceTree = "<group>"; };
 		B56E763522BD565700C5AA47 /* UIView+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "UIView+Simplenote.swift"; path = "Classes/UIView+Simplenote.swift"; sourceTree = "<group>"; };
@@ -2078,6 +2080,7 @@
 				B5AB169922FA128000B4EBA5 /* SPSheetController.xib */,
 				A6CDD9C725F0163D00E0BC4D /* MagicLinkAuthenticator.swift */,
 				B54A11C32C136225002AC8AA /* MagicLinkRequestedView.swift */,
+				B56BAF602C2DE317005065C9 /* MagicLinkInvalidView.swift */,
 				A628BEB425ECD97900121B64 /* SignupVerificationViewController.swift */,
 				A628BEB525ECD97900121B64 /* SignupVerificationViewController.xib */,
 			);
@@ -3441,6 +3444,7 @@
 				E215C793180B115C00AD36B5 /* SPNavigationController.m in Sources */,
 				B5DF734422A56E2800602CE7 /* UserDefaults+Simplenote.swift in Sources */,
 				A6DB2C1525BF5D6E00437B99 /* SPMarkdownPreviewViewController+Extensions.swift in Sources */,
+				B56BAF612C2DE317005065C9 /* MagicLinkInvalidView.swift in Sources */,
 				B56A696022F9D53400B90398 /* SPAuthHandler.swift in Sources */,
 				A6E1E78924B5196C008A44BC /* SPNoteHistoryControllerDelegate.swift in Sources */,
 				B5B9AB4522EE8AF0001CB0AD /* UIImageName.swift in Sources */,
diff --git a/Simplenote/MagicLinkInvalidView.swift b/Simplenote/MagicLinkInvalidView.swift
new file mode 100644
index 000000000..a686a4f9f
--- /dev/null
+++ b/Simplenote/MagicLinkInvalidView.swift
@@ -0,0 +1,61 @@
+import Foundation
+import SwiftUI
+import Gridicons
+
+
+// MARK: - MagicLinkConfirmationView
+//
+struct MagicLinkInvalidView: View {
+    @Environment(\.presentationMode) var presentationMode
+    
+    
+    var body: some View {
+        NavigationView {
+            VStack(alignment: .center, spacing: 10) {
+                Image(uiImage: MagicLinkImages.cross)
+                    .renderingMode(.template)
+                    .foregroundColor(Color(.simplenoteLightBlueColor))
+
+                Text("Invalid Link")
+                    .bold()
+                    .font(.system(size: Metrics.titleFontSize))
+                    .padding()
+                
+                Text("Your authentication link is no longer valid")
+                    .font(.system(size: Metrics.detailsFontSize))
+                    .multilineTextAlignment(.center)
+            }
+            .padding()
+            .navigationBarTitleDisplayMode(.inline)
+            .toolbar {
+                ToolbarItem(placement: .navigationBarTrailing) {
+                    Button(action: {
+                        presentationMode.wrappedValue.dismiss()
+                    }) {
+                        Image(uiImage: MagicLinkImages.dismiss)
+                            .renderingMode(.template)
+                            .foregroundColor(Color(.darkGray))
+                    }
+                }
+            }
+        }
+        .navigationViewStyle(.stack)
+        
+        /// Force Light Mode (since the Authentication UI is all light!)
+        .environment(\.colorScheme, .light)
+    }
+}
+
+// MARK: - Constants
+//
+private enum Metrics {
+    static let titleFontSize: CGFloat = 22
+    static let detailsFontSize: CGFloat = 17
+    static let crossIconSize = CGSize(width: 100, height: 100)
+    static let dismissSize = CGSize(width: 30, height: 30)
+}
+
+private enum MagicLinkImages {
+    static let cross = Gridicon.iconOfType(.crossCircle, withSize: Metrics.crossIconSize)
+    static let dismiss = Gridicon.iconOfType(.crossCircle, withSize: Metrics.dismissSize)
+}

From 7443d84d27f9ad21386fe6a0092ea95c4bf75bf3 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Thu, 27 Jun 2024 15:45:01 -0300
Subject: [PATCH 239/547] MagicLinkAuthenticator: Posting Notification Events

---
 Simplenote/Classes/MagicLinkAuthenticator.swift | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/Simplenote/Classes/MagicLinkAuthenticator.swift b/Simplenote/Classes/MagicLinkAuthenticator.swift
index ce3743ab7..6ce6b355c 100644
--- a/Simplenote/Classes/MagicLinkAuthenticator.swift
+++ b/Simplenote/Classes/MagicLinkAuthenticator.swift
@@ -1,5 +1,15 @@
 import Foundation
 
+
+// MARK: - Notifications
+//
+extension NSNotification.Name {
+    static let magicLinkAuthWillStart = NSNotification.Name("magicLinkAuthWillStart")
+    static let magicLinkAuthDidSucceed = NSNotification.Name("magicLinkAuthDidSucceed")
+    static let magicLinkAuthDidFail = NSNotification.Name("magicLinkAuthDidFail")
+}
+
+
 // MARK: - MagicLinkAuthenticator
 //
 struct MagicLinkAuthenticator {
@@ -48,7 +58,8 @@ private extension MagicLinkAuthenticator {
         }
 
         NSLog("[MagicLinkAuthenticator] Requesting SyncToken for \(authKey) and \(authCode)")
-        
+        NotificationCenter.default.post(name: .magicLinkAuthWillStart, object: nil)
+
         Task {
             do {
                 let remote = LoginRemote()
@@ -57,11 +68,14 @@ private extension MagicLinkAuthenticator {
                 Task { @MainActor in
                     NSLog("[MagicLinkAuthenticator] Should auth with token \(confirmation.syncToken)")
                     authenticator.authenticate(withUsername: confirmation.username, token: confirmation.syncToken)
+                    
+                    NotificationCenter.default.post(name: .magicLinkAuthDidSucceed, object: nil)
                     SPTracker.trackUserConfirmedLoginLink()
                 }
 
             } catch {
                 NSLog("[MagicLinkAuthenticator] Magic Link TokenExchange Error: \(error)")
+                NotificationCenter.default.post(name: .magicLinkAuthDidFail, object: error)
             }
         }
 

From 487466f58f9663487742368e74dd0339a711141f Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Thu, 27 Jun 2024 15:50:21 -0300
Subject: [PATCH 240/547] SPOnboardingViewController: Presenting Invalid Link
 UI

---
 .../Classes/SPOnboardingViewController.swift  | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/Simplenote/Classes/SPOnboardingViewController.swift b/Simplenote/Classes/SPOnboardingViewController.swift
index 008476bc2..797ff5780 100644
--- a/Simplenote/Classes/SPOnboardingViewController.swift
+++ b/Simplenote/Classes/SPOnboardingViewController.swift
@@ -1,6 +1,7 @@
 import Foundation
 import UIKit
 import SafariServices
+import SwiftUI
 
 // MARK: - SPOnboardingViewController
 //
@@ -196,8 +197,10 @@ private extension SPOnboardingViewController {
 
     func startListeningToNotifications() {
         let name = NSNotification.Name(rawValue: kSignInErrorNotificationName)
-
-        NotificationCenter.default.addObserver(self, selector: #selector(handleSignInError), name: name, object: nil)
+        
+        let nc = NotificationCenter.default
+        nc.addObserver(self, selector: #selector(handleSignInError), name: name, object: nil)
+        nc.addObserver(self, selector: #selector(handleMagicLinkAuthDidFail), name: .magicLinkAuthDidFail, object: nil)
     }
 
     @objc func handleSignInError(note: Notification) {
@@ -210,9 +213,31 @@ private extension SPOnboardingViewController {
         presentedViewController?.dismiss(animated: true, completion: nil)
         present(alertController, animated: true, completion: nil)
     }
+    
+    @objc func handleMagicLinkAuthDidFail() {
+        DispatchQueue.main.async {
+            self.presentMagicLinkInvalidView()
+        }
+    }
+}
+
 
+// MARK: - Magic Link Helpers
+//
+private extension SPOnboardingViewController {
+
+    private func presentMagicLinkInvalidView() {
+        let rootView = MagicLinkInvalidView()
+        let hostingController = UIHostingController(rootView: rootView)
+        hostingController.modalPresentationStyle = .formSheet
+        hostingController.sheetPresentationController?.detents = [.medium()]
+
+        let presenter = presentedViewController ?? self
+        presenter.present(hostingController, animated: true)
+    }
 }
 
+
 // MARK: - Private Types
 //
 private struct OnboardingStrings {

From 1a2c0871e28636d59480b016aeb2aeb477f18be6 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 28 Jun 2024 13:37:09 -0300
Subject: [PATCH 241/547] MagicLinkInvalidView: Implements Request new Link
 Action

---
 Simplenote/Classes/SPAuthViewController.swift |  2 +-
 .../Classes/SPOnboardingViewController.swift  | 20 ++++++++++-
 Simplenote/MagicLinkInvalidView.swift         | 35 +++++++++++++++++--
 3 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index 39e19309e..e8af5e7d3 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -718,7 +718,7 @@ extension SPAuthViewController {
 
 // MARK: - AuthenticationMode: Signup / Login
 //
-struct AuthenticationMode {
+struct AuthenticationMode: Equatable {
     let title: String
     let validationStyle: AuthenticationValidator.Style
     let primaryActionSelector: Selector
diff --git a/Simplenote/Classes/SPOnboardingViewController.swift b/Simplenote/Classes/SPOnboardingViewController.swift
index 797ff5780..d0904949d 100644
--- a/Simplenote/Classes/SPOnboardingViewController.swift
+++ b/Simplenote/Classes/SPOnboardingViewController.swift
@@ -226,8 +226,14 @@ private extension SPOnboardingViewController {
 //
 private extension SPOnboardingViewController {
 
+    /// Presents the Invalid Magic Link UI
+    ///
     private func presentMagicLinkInvalidView() {
-        let rootView = MagicLinkInvalidView()
+        var rootView = MagicLinkInvalidView()
+        rootView.onPressRequestNewLink = { [weak self] in
+            self?.presentAuthenticationInterfaceIfNeeded(mode: .loginWithMagicLink)
+        }
+
         let hostingController = UIHostingController(rootView: rootView)
         hostingController.modalPresentationStyle = .formSheet
         hostingController.sheetPresentationController?.detents = [.medium()]
@@ -235,6 +241,18 @@ private extension SPOnboardingViewController {
         let presenter = presentedViewController ?? self
         presenter.present(hostingController, animated: true)
     }
+    
+    /// Dismisses all of the presented ViewControllers, and pushes the Authentication UI with the specified mode.
+    /// - Note: Whenever the required AuthUI is already onscreen, we'll do nothing
+    ///
+    func presentAuthenticationInterfaceIfNeeded(mode: AuthenticationMode) {
+        if let authController = navigationController?.topViewController as? SPAuthViewController, authController.mode == mode {
+            return
+        }
+
+        navigationController?.popToRootViewController(animated: true)
+        presentAuthenticationInterface(mode: mode)
+    }
 }
 
 
diff --git a/Simplenote/MagicLinkInvalidView.swift b/Simplenote/MagicLinkInvalidView.swift
index a686a4f9f..500ff462f 100644
--- a/Simplenote/MagicLinkInvalidView.swift
+++ b/Simplenote/MagicLinkInvalidView.swift
@@ -8,6 +8,8 @@ import Gridicons
 struct MagicLinkInvalidView: View {
     @Environment(\.presentationMode) var presentationMode
     
+    var onPressRequestNewLink: (() -> Void)?
+    
     
     var body: some View {
         NavigationView {
@@ -24,6 +26,18 @@ struct MagicLinkInvalidView: View {
                 Text("Your authentication link is no longer valid")
                     .font(.system(size: Metrics.detailsFontSize))
                     .multilineTextAlignment(.center)
+                    .padding(.bottom, Metrics.detailsPaddingBottom)
+                
+                Button(action: pressedRequestNewLink) {
+                    Text("Request a new Link")
+                        .fontWeight(.bold)
+                        .foregroundStyle(.white)
+                }
+                .padding()
+                .background(Color(.simplenoteBlue50Color))
+                .cornerRadius(Metrics.actionCornerRadius)
+                .buttonStyle(PlainButtonStyle())
+                
             }
             .padding()
             .navigationBarTitleDisplayMode(.inline)
@@ -44,18 +58,35 @@ struct MagicLinkInvalidView: View {
         /// Force Light Mode (since the Authentication UI is all light!)
         .environment(\.colorScheme, .light)
     }
+    
+    func pressedRequestNewLink() {
+        presentationMode.wrappedValue.dismiss()
+        onPressRequestNewLink?()
+    }
 }
 
+
 // MARK: - Constants
 //
 private enum Metrics {
-    static let titleFontSize: CGFloat = 22
-    static let detailsFontSize: CGFloat = 17
     static let crossIconSize = CGSize(width: 100, height: 100)
     static let dismissSize = CGSize(width: 30, height: 30)
+    static let titleFontSize: CGFloat = 22
+    static let detailsFontSize: CGFloat = 17
+    static let detailsPaddingBottom: CGFloat = 30
+    static let actionCornerRadius: CGFloat = 10
 }
 
 private enum MagicLinkImages {
     static let cross = Gridicon.iconOfType(.crossCircle, withSize: Metrics.crossIconSize)
     static let dismiss = Gridicon.iconOfType(.crossCircle, withSize: Metrics.dismissSize)
 }
+
+
+// MARK: - Preview
+//
+struct MagicLinkInvalidView_Previews: PreviewProvider {
+    static var previews: some View {
+        MagicLinkInvalidView()
+    }
+}

From e7c55fc78de058a214b6a5013cabb962a4017032 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 28 Jun 2024 18:43:45 -0300
Subject: [PATCH 242/547] Entitlements: App Links

---
 Simplenote/Supporting Files/Simplenote-Internal.entitlements | 1 +
 Simplenote/Supporting Files/Simplenote.entitlements          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Simplenote/Supporting Files/Simplenote-Internal.entitlements b/Simplenote/Supporting Files/Simplenote-Internal.entitlements
index 523982a37..c16966fec 100644
--- a/Simplenote/Supporting Files/Simplenote-Internal.entitlements	
+++ b/Simplenote/Supporting Files/Simplenote-Internal.entitlements	
@@ -5,6 +5,7 @@
 	<key>com.apple.developer.associated-domains</key>
 	<array>
 		<string>webcredentials:simplenote.com</string>
+		<string>applinks:app.simplenote.com</string>
 	</array>
 	<key>com.apple.security.application-groups</key>
 	<array>
diff --git a/Simplenote/Supporting Files/Simplenote.entitlements b/Simplenote/Supporting Files/Simplenote.entitlements
index 523982a37..c16966fec 100644
--- a/Simplenote/Supporting Files/Simplenote.entitlements	
+++ b/Simplenote/Supporting Files/Simplenote.entitlements	
@@ -5,6 +5,7 @@
 	<key>com.apple.developer.associated-domains</key>
 	<array>
 		<string>webcredentials:simplenote.com</string>
+		<string>applinks:app.simplenote.com</string>
 	</array>
 	<key>com.apple.security.application-groups</key>
 	<array>

From 9aadac1178080c4815cc9dcc0f2f47488ee81371 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 1 Jul 2024 10:27:49 -0300
Subject: [PATCH 243/547] SPAppDelegate: Supporting Authentication User
 Activity

---
 Simplenote/Classes/MagicLinkAuthenticator.swift |  9 +++++----
 Simplenote/SPAppDelegate+Extensions.swift       | 14 ++++++++++++--
 Simplenote/SPAppDelegate.m                      |  4 ++++
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/Simplenote/Classes/MagicLinkAuthenticator.swift b/Simplenote/Classes/MagicLinkAuthenticator.swift
index 38c97012a..4f511f0f5 100644
--- a/Simplenote/Classes/MagicLinkAuthenticator.swift
+++ b/Simplenote/Classes/MagicLinkAuthenticator.swift
@@ -5,22 +5,23 @@ import Foundation
 struct MagicLinkAuthenticator {
     let authenticator: SPAuthenticator
 
-    func handle(url: URL) {
+    func handle(url: URL) -> Bool {
         guard url.host == Constants.host else {
-            return
+            return false
         }
 
         guard let queryItems = URLComponents(url: url, resolvingAgainstBaseURL: false)?.queryItems else {
-            return
+            return false
         }
 
         guard let email = queryItems.base64DecodedValue(for: Constants.emailField),
               let token = queryItems.value(for: Constants.tokenField),
               !email.isEmpty, !token.isEmpty else {
-            return
+            return false
         }
 
         authenticator.authenticate(withUsername: email, token: token)
+        return true
     }
 }
 
diff --git a/Simplenote/SPAppDelegate+Extensions.swift b/Simplenote/SPAppDelegate+Extensions.swift
index fd4430759..4e19255b3 100644
--- a/Simplenote/SPAppDelegate+Extensions.swift
+++ b/Simplenote/SPAppDelegate+Extensions.swift
@@ -447,10 +447,20 @@ private extension SPAppDelegate {
 // MARK: - Magic Link authentication
 //
 extension SPAppDelegate {
-    @objc
-    func performMagicLinkAuthentication(with url: URL) {
+
+    @objc @discardableResult
+    func performMagicLinkAuthentication(with url: URL) -> Bool {
         MagicLinkAuthenticator(authenticator: simperium.authenticator).handle(url: url)
     }
+    
+    @objc(performMagicLinkAuthenticationWithUserActivity:)
+    func performMagicLinkAuthentication(with userActivity: NSUserActivity) -> Bool {
+        guard let url = userActivity.webpageURL else {
+            return false
+        }
+        
+        return performMagicLinkAuthentication(with: url)
+    }
 }
 
 // MARK: - Scroll position cache
diff --git a/Simplenote/SPAppDelegate.m b/Simplenote/SPAppDelegate.m
index b83831128..6d2979ba4 100644
--- a/Simplenote/SPAppDelegate.m
+++ b/Simplenote/SPAppDelegate.m
@@ -200,6 +200,10 @@ - (void)applicationWillEnterForeground:(UIApplication *)application
 
 - (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray<id<UIUserActivityRestoring>> * _Nullable))restorationHandler
 {
+    if ([self performMagicLinkAuthenticationWithUserActivity:userActivity]) {
+        return YES;
+    }
+    
     return [[ShortcutsHandler shared] handleUserActivity:userActivity];
 }
 

From 09aeb50a53c76d16eb749d2b9836ec575569e71e Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 1 Jul 2024 12:13:50 -0300
Subject: [PATCH 244/547] MagicLinkAuthenticator: Allowing AppEngine URLs

---
 Simplenote/Classes/MagicLinkAuthenticator.swift | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Simplenote/Classes/MagicLinkAuthenticator.swift b/Simplenote/Classes/MagicLinkAuthenticator.swift
index 4f511f0f5..b168ecf3b 100644
--- a/Simplenote/Classes/MagicLinkAuthenticator.swift
+++ b/Simplenote/Classes/MagicLinkAuthenticator.swift
@@ -6,7 +6,7 @@ struct MagicLinkAuthenticator {
     let authenticator: SPAuthenticator
 
     func handle(url: URL) -> Bool {
-        guard url.host == Constants.host else {
+        guard AllowedHosts.all.contains(url.host) else {
             return false
         }
 
@@ -44,8 +44,13 @@ private extension Array where Element == URLQueryItem {
 
 // MARK: - Constants
 //
+private struct AllowedHosts {
+    static let hostForSimplenoteSchema = "login"
+    static let hostForUniversalLinks = URL(string: SPCredentials.defaultEngineURL)!.host
+    static let all = [hostForSimplenoteSchema, hostForUniversalLinks]
+}
+
 private struct Constants {
-    static let host = "login"
     static let emailField = "email"
     static let tokenField = "token"
 }

From 8cfaa215006112a14a93a07b33cc010883dfc26b Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 1 Jul 2024 16:52:37 -0300
Subject: [PATCH 245/547] SPAppDelegate+Extensions: Drops whitespaces

---
 Simplenote/SPAppDelegate+Extensions.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Simplenote/SPAppDelegate+Extensions.swift b/Simplenote/SPAppDelegate+Extensions.swift
index 4e19255b3..151fc1c60 100644
--- a/Simplenote/SPAppDelegate+Extensions.swift
+++ b/Simplenote/SPAppDelegate+Extensions.swift
@@ -452,13 +452,13 @@ extension SPAppDelegate {
     func performMagicLinkAuthentication(with url: URL) -> Bool {
         MagicLinkAuthenticator(authenticator: simperium.authenticator).handle(url: url)
     }
-    
+
     @objc(performMagicLinkAuthenticationWithUserActivity:)
     func performMagicLinkAuthentication(with userActivity: NSUserActivity) -> Bool {
         guard let url = userActivity.webpageURL else {
             return false
         }
-        
+
         return performMagicLinkAuthentication(with: url)
     }
 }

From 812d62298603f0e2539d71ccac15f04b50d98320 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 1 Jul 2024 16:55:37 -0300
Subject: [PATCH 246/547] Updates Linter Rules

---
 .swiftlint.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.swiftlint.yml b/.swiftlint.yml
index cf03a5a91..0826295f6 100644
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@@ -42,9 +42,9 @@ only_rules:
   - trailing_semicolon
 
   # Lines should not have trailing whitespace.
-  - trailing_whitespace
+#  - trailing_whitespace
 
-  - vertical_whitespace
+#  - vertical_whitespace
 
   - custom_rules
 

From 59f95421a065292f37ae41a4a975fbdb6d3b1668 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 1 Jul 2024 17:06:35 -0300
Subject: [PATCH 247/547] Fixes UI Tests

---
 SimplenoteUITests/EmailLogin.swift | 1 +
 SimplenoteUITests/UIDs.swift       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/SimplenoteUITests/EmailLogin.swift b/SimplenoteUITests/EmailLogin.swift
index 6fae2609a..22041a7f6 100644
--- a/SimplenoteUITests/EmailLogin.swift
+++ b/SimplenoteUITests/EmailLogin.swift
@@ -34,6 +34,7 @@ class EmailLogin {
 
     class func logIn(email: String, password: String) {
         enterEmail(enteredValue: email)
+        app.buttons[UID.Button.continueWithPassword].tap()
         enterPassword(enteredValue: password)
         app.buttons[UID.Button.logIn].tap()
         handleSavePasswordPrompt()
diff --git a/SimplenoteUITests/UIDs.swift b/SimplenoteUITests/UIDs.swift
index 65ae52e39..e47813a04 100644
--- a/SimplenoteUITests/UIDs.swift
+++ b/SimplenoteUITests/UIDs.swift
@@ -26,6 +26,7 @@ enum UID {
         static let menu = "menu"
         static let signUp = "Sign Up"
         static let logIn = "Log In"
+        static let continueWithPassword = "Continue with Password"
         static let logInWithEmail = "Log in with email"
         static let allNotes = "All Notes"
         static let trash = "Trash"

From d5d9526a7e60a6f3be32216cf368cea84aeefa63 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 1 Jul 2024 18:13:22 -0300
Subject: [PATCH 248/547] Fixes UI Tests. Take II

---
 SimplenoteUITests/EmailLogin.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SimplenoteUITests/EmailLogin.swift b/SimplenoteUITests/EmailLogin.swift
index 22041a7f6..9c3e3431b 100644
--- a/SimplenoteUITests/EmailLogin.swift
+++ b/SimplenoteUITests/EmailLogin.swift
@@ -35,6 +35,7 @@ class EmailLogin {
     class func logIn(email: String, password: String) {
         enterEmail(enteredValue: email)
         app.buttons[UID.Button.continueWithPassword].tap()
+        _ = app.buttons[UID.Button.logIn].waitForExistence(timeout: minLoadTimeout)
         enterPassword(enteredValue: password)
         app.buttons[UID.Button.logIn].tap()
         handleSavePasswordPrompt()

From 2ab79c02731d5fe3aa31f9828ee6508017e5f085 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Thu, 11 Jul 2024 11:43:20 -0300
Subject: [PATCH 249/547] MagicLinkAuthenticator: Wires code based endpoints

---
 Simplenote/Classes/MagicLinkAuthenticator.swift | 9 ++++-----
 Simplenote/LoginRemote.swift                    | 8 ++++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Simplenote/Classes/MagicLinkAuthenticator.swift b/Simplenote/Classes/MagicLinkAuthenticator.swift
index 48962c7c8..6170983d7 100644
--- a/Simplenote/Classes/MagicLinkAuthenticator.swift
+++ b/Simplenote/Classes/MagicLinkAuthenticator.swift
@@ -50,20 +50,20 @@ private extension MagicLinkAuthenticator {
 
     @discardableResult
     func attemptLoginWithAuthCode(queryItems: [URLQueryItem]) -> Bool {
-        guard let authKey = queryItems.value(for: Constants.authKeyField),
+        guard let email = queryItems.value(for: Constants.emailField),
               let authCode = queryItems.value(for: Constants.authCodeField),
-              !authKey.isEmpty, !authCode.isEmpty
+              !email.isEmpty, !authCode.isEmpty
         else {
             return false
         }
 
-        NSLog("[MagicLinkAuthenticator] Requesting SyncToken for \(authKey) and \(authCode)")
+        NSLog("[MagicLinkAuthenticator] Requesting SyncToken for \(email) and \(authCode)")
         NotificationCenter.default.post(name: .magicLinkAuthWillStart, object: nil)
 
         Task {
             do {
                 let remote = LoginRemote()
-                let confirmation = try await remote.requestLoginConfirmation(authKey: authKey, authCode: authCode)
+                let confirmation = try await remote.requestLoginConfirmation(email: email, authCode: authCode)
                 
                 Task { @MainActor in
                     NSLog("[MagicLinkAuthenticator] Should auth with token \(confirmation.syncToken)")
@@ -111,6 +111,5 @@ private struct AllowedHosts {
 private struct Constants {
     static let emailField = "email"
     static let tokenField = "token"
-    static let authKeyField = "auth_key"
     static let authCodeField = "auth_code"
 }
diff --git a/Simplenote/LoginRemote.swift b/Simplenote/LoginRemote.swift
index 9b7fe181e..6d059f506 100644
--- a/Simplenote/LoginRemote.swift
+++ b/Simplenote/LoginRemote.swift
@@ -9,8 +9,8 @@ class LoginRemote: Remote {
         performDataTask(with: request, completion: completion)
     }
 
-    func requestLoginConfirmation(authKey: String, authCode: String) async throws -> LoginConfirmationResponse {
-        let request = requestForLoginCompletion(authKey: authKey, authCode: authCode)
+    func requestLoginConfirmation(email: String, authCode: String) async throws -> LoginConfirmationResponse {
+        let request = requestForLoginCompletion(email: email, authCode: authCode)
         return try await performDataTask(with: request, type: LoginConfirmationResponse.self)
     }
 }
@@ -36,11 +36,11 @@ private extension LoginRemote {
         ])
     }
 
-    func requestForLoginCompletion(authKey: String, authCode: String) -> URLRequest {
+    func requestForLoginCompletion(username: String, authCode: String) -> URLRequest {
         let url = URL(string: SimplenoteConstants.loginCompletionURL)!
         return requestForURL(url, method: RemoteConstants.Method.POST, httpBody: [
             "auth_key": authKey,
-            "auth_code": authCode
+            "username": username
         ])
     }
 }

From 2513a19869becf2e99ae02632a117fc38d6f6ee4 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Thu, 11 Jul 2024 11:43:54 -0300
Subject: [PATCH 250/547] SimplenoteConstants: Switching to Magic Links Staging

---
 Simplenote/Classes/SimplenoteConstants.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Simplenote/Classes/SimplenoteConstants.swift b/Simplenote/Classes/SimplenoteConstants.swift
index 7d1c734fd..63cca619e 100644
--- a/Simplenote/Classes/SimplenoteConstants.swift
+++ b/Simplenote/Classes/SimplenoteConstants.swift
@@ -45,8 +45,8 @@ class SimplenoteConstants: NSObject {
     ///
     static let resetPasswordURL     = currentEngineBaseURL.appendingPathComponent("/reset/?redirect=simplenote://launch&email=")
     static let settingsURL          = currentEngineBaseURL.appendingPathComponent("/settings")
-    static let loginRequestURL      = currentEngineBaseURL.appendingPathComponent("/account/request-login")
-    static let loginCompletionURL   = currentEngineBaseURL.appendingPathComponent("/account/complete-login")
+    static let loginRequestURL      = "https://magic-code-dot-simple-note-hrd.appspot.com/account/request-login" //googleAppEngineBaseURL.appendingPathComponent("/account/request-login")
+    static let loginCompletionURL   = "https://magic-code-dot-simple-note-hrd.appspot.com/account/complete-login" //googleAppEngineBaseURL.appendingPathComponent("/account/complete-login")
     static let signupURL            = currentEngineBaseURL.appendingPathComponent("/account/request-signup")
     static let verificationURL      = currentEngineBaseURL.appendingPathComponent("/account/verify-email/")
     static let accountDeletionURL   = currentEngineBaseURL.appendingPathComponent("/account/request-delete/")

From 8d76ccd32fdb48e7600fc074f119dbf3b79aab91 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Thu, 11 Jul 2024 11:46:36 -0300
Subject: [PATCH 251/547] LoginRemote: Fixes incorrect constants

---
 Simplenote/LoginRemote.swift | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Simplenote/LoginRemote.swift b/Simplenote/LoginRemote.swift
index 6d059f506..b69fce3f6 100644
--- a/Simplenote/LoginRemote.swift
+++ b/Simplenote/LoginRemote.swift
@@ -5,7 +5,7 @@ import Foundation
 class LoginRemote: Remote {
 
     func requestLoginEmail(email: String, completion: @escaping (_ result: Result<Data?, RemoteError>) -> Void) {
-        let request = requestForLoginRequest(with: email)
+        let request = requestForLoginRequest(email: email)
         performDataTask(with: request, completion: completion)
     }
 
@@ -28,7 +28,7 @@ struct LoginConfirmationResponse: Decodable {
 //
 private extension LoginRemote {
 
-    func requestForLoginRequest(with email: String) -> URLRequest {
+    func requestForLoginRequest(email: String) -> URLRequest {
         let url = URL(string: SimplenoteConstants.loginRequestURL)!
         return requestForURL(url, method: RemoteConstants.Method.POST, httpBody: [
             "request_source": SimplenoteConstants.simplenotePlatformName,
@@ -36,11 +36,11 @@ private extension LoginRemote {
         ])
     }
 
-    func requestForLoginCompletion(username: String, authCode: String) -> URLRequest {
+    func requestForLoginCompletion(email: String, authCode: String) -> URLRequest {
         let url = URL(string: SimplenoteConstants.loginCompletionURL)!
         return requestForURL(url, method: RemoteConstants.Method.POST, httpBody: [
-            "auth_key": authKey,
-            "username": username
+            "auth_code": authCode,
+            "username": email
         ])
     }
 }

From a9e74b69eadab8c78906a54d37589d7e6cd5289f Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Thu, 11 Jul 2024 11:51:30 -0300
Subject: [PATCH 252/547] MagicLinkAuthenticator: Adds missing decode

---
 Simplenote/Classes/MagicLinkAuthenticator.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Simplenote/Classes/MagicLinkAuthenticator.swift b/Simplenote/Classes/MagicLinkAuthenticator.swift
index 6170983d7..9edc05435 100644
--- a/Simplenote/Classes/MagicLinkAuthenticator.swift
+++ b/Simplenote/Classes/MagicLinkAuthenticator.swift
@@ -50,7 +50,7 @@ private extension MagicLinkAuthenticator {
 
     @discardableResult
     func attemptLoginWithAuthCode(queryItems: [URLQueryItem]) -> Bool {
-        guard let email = queryItems.value(for: Constants.emailField),
+        guard let email = queryItems.base64DecodedValue(for: Constants.emailField),
               let authCode = queryItems.value(for: Constants.authCodeField),
               !email.isEmpty, !authCode.isEmpty
         else {

From 067a05404fade344d6ad438917de61f7a5130e8e Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Thu, 11 Jul 2024 15:37:42 -0300
Subject: [PATCH 253/547] MagicLinkAuthenticator: Updates Events

---
 .../Classes/MagicLinkAuthenticator.swift      |  3 ++-
 Simplenote/Classes/SPAuthViewController.swift |  2 +-
 Simplenote/Classes/SPTracker.h                |  7 +++++--
 Simplenote/Classes/SPTracker.m                | 21 +++++++++++++------
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/Simplenote/Classes/MagicLinkAuthenticator.swift b/Simplenote/Classes/MagicLinkAuthenticator.swift
index 9edc05435..cc8cbcee4 100644
--- a/Simplenote/Classes/MagicLinkAuthenticator.swift
+++ b/Simplenote/Classes/MagicLinkAuthenticator.swift
@@ -70,12 +70,13 @@ private extension MagicLinkAuthenticator {
                     authenticator.authenticate(withUsername: confirmation.username, token: confirmation.syncToken)
                     
                     NotificationCenter.default.post(name: .magicLinkAuthDidSucceed, object: nil)
-                    SPTracker.trackUserConfirmedLoginLink()
+                    SPTracker.trackLoginLinkConfirmationSuccess()
                 }
 
             } catch {
                 NSLog("[MagicLinkAuthenticator] Magic Link TokenExchange Error: \(error)")
                 NotificationCenter.default.post(name: .magicLinkAuthDidFail, object: error)
+                SPTracker.trackLoginLinkConfirmationFailure()
             }
         }
 
diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index e8af5e7d3..db8c3c4e1 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -315,7 +315,7 @@ private extension SPAuthViewController {
                 self.handleError(error: error)
             } else {
                 self.presentMagicLinkRequestedView(email: email)
-                SPTracker.trackUserRequestedLoginLink()
+                SPTracker.trackLoginLinkRequested()
             }
 
             self.unlockInterface()
diff --git a/Simplenote/Classes/SPTracker.h b/Simplenote/Classes/SPTracker.h
index 8ce28db92..9bd867c26 100644
--- a/Simplenote/Classes/SPTracker.h
+++ b/Simplenote/Classes/SPTracker.h
@@ -81,10 +81,13 @@
 #pragma mark - User
 + (void)trackUserAccountCreated;
 + (void)trackUserSignedIn;
-+ (void)trackUserRequestedLoginLink;
-+ (void)trackUserConfirmedLoginLink;
 + (void)trackUserSignedOut;
 
+#pragma mark - Login Links
++ (void)trackLoginLinkRequested;
++ (void)trackLoginLinkConfirmationSuccess;
++ (void)trackLoginLinkConfirmationFailure;
+
 #pragma mark - WP.com Sign In
 + (void)trackWPCCButtonPressed;
 + (void)trackWPCCLoginSucceeded;
diff --git a/Simplenote/Classes/SPTracker.m b/Simplenote/Classes/SPTracker.m
index 0d24392b1..548e2b786 100644
--- a/Simplenote/Classes/SPTracker.m
+++ b/Simplenote/Classes/SPTracker.m
@@ -317,21 +317,30 @@ + (void)trackUserSignedIn
     [self trackAutomatticEventWithName:@"user_signed_in" properties:nil];
 }
 
-+ (void)trackUserRequestedLoginLink
++ (void)trackUserSignedOut
 {
-    [self trackAutomatticEventWithName:@"user_requested_login_link" properties:nil];
+    [self trackAutomatticEventWithName:@"user_signed_out" properties:nil];
 }
 
-+ (void)trackUserConfirmedLoginLink
+
+#pragma mark - Login Links
+
++ (void)trackLoginLinkRequested
 {
-    [self trackAutomatticEventWithName:@"user_confirmed_login_link" properties:nil];
+    [self trackAutomatticEventWithName:@"login_link_requested" properties:nil];
 }
 
-+ (void)trackUserSignedOut
++ (void)trackLoginLinkConfirmationSuccess
 {
-    [self trackAutomatticEventWithName:@"user_signed_out" properties:nil];
+    [self trackAutomatticEventWithName:@"login_link_confirmation_success" properties:nil];
 }
 
++ (void)trackLoginLinkConfirmationFailure
+{
+    [self trackAutomatticEventWithName:@"login_link_confirmation_failure" properties:nil];
+}
+
+
 #pragma mark - WP.com Sign In
 
 + (void)trackWPCCButtonPressed

From 6d779c0f22c2b80b4f71bc7996d0b5a0e26ed437 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Thu, 11 Jul 2024 15:37:51 -0300
Subject: [PATCH 254/547] MagicLinkInvalidView: Adjusting Copy

---
 Simplenote/MagicLinkInvalidView.swift | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/Simplenote/MagicLinkInvalidView.swift b/Simplenote/MagicLinkInvalidView.swift
index 500ff462f..dcb6faf81 100644
--- a/Simplenote/MagicLinkInvalidView.swift
+++ b/Simplenote/MagicLinkInvalidView.swift
@@ -18,15 +18,11 @@ struct MagicLinkInvalidView: View {
                     .renderingMode(.template)
                     .foregroundColor(Color(.simplenoteLightBlueColor))
 
-                Text("Invalid Link")
+                Text("Link no longer valid")
                     .bold()
                     .font(.system(size: Metrics.titleFontSize))
-                    .padding()
-                
-                Text("Your authentication link is no longer valid")
-                    .font(.system(size: Metrics.detailsFontSize))
                     .multilineTextAlignment(.center)
-                    .padding(.bottom, Metrics.detailsPaddingBottom)
+                    .padding(.bottom, Metrics.titlePaddingBottom)
                 
                 Button(action: pressedRequestNewLink) {
                     Text("Request a new Link")
@@ -71,9 +67,8 @@ struct MagicLinkInvalidView: View {
 private enum Metrics {
     static let crossIconSize = CGSize(width: 100, height: 100)
     static let dismissSize = CGSize(width: 30, height: 30)
-    static let titleFontSize: CGFloat = 22
-    static let detailsFontSize: CGFloat = 17
-    static let detailsPaddingBottom: CGFloat = 30
+    static let titleFontSize: CGFloat = 20
+    static let titlePaddingBottom: CGFloat = 30
     static let actionCornerRadius: CGFloat = 10
 }
 

From b0ba41e2e3291ac89ad712b6cf85ee16855b7959 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 12 Jul 2024 15:43:34 -0300
Subject: [PATCH 255/547] SPOnboardingViewController: Removes Sheet UI on Login

---
 .../Classes/SPOnboardingViewController.swift  | 25 +------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/Simplenote/Classes/SPOnboardingViewController.swift b/Simplenote/Classes/SPOnboardingViewController.swift
index d0904949d..dc5ec7f87 100644
--- a/Simplenote/Classes/SPOnboardingViewController.swift
+++ b/Simplenote/Classes/SPOnboardingViewController.swift
@@ -149,20 +149,7 @@ private extension SPOnboardingViewController {
 
     @IBAction
     func loginWasPressed() {
-        let sheetController = SPSheetController()
-
-        sheetController.setTitleForButton0(title: OnboardingStrings.loginWithEmailText)
-        sheetController.setTitleForButton1(title: OnboardingStrings.loginWithWpcomText)
-
-        sheetController.onClickButton0 = { [weak self] in
-            self?.presentAuthenticationInterface(mode: .loginWithMagicLink)
-        }
-
-        sheetController.onClickButton1 = { [weak self] in
-            self?.presentWordpressSSO()
-        }
-
-        sheetController.present(from: self)
+        presentAuthenticationInterface(mode: .loginWithMagicLink)
     }
 
     @IBAction
@@ -185,10 +172,6 @@ private extension SPOnboardingViewController {
         viewController.debugEnabled = debugEnabled
         navigationController?.pushViewController(viewController, animated: true)
     }
-
-    func presentWordpressSSO() {
-        WPAuthHandler.presentWordPressSSO(from: self)
-    }
 }
 
 // MARK: - Actions
@@ -246,10 +229,6 @@ private extension SPOnboardingViewController {
     /// - Note: Whenever the required AuthUI is already onscreen, we'll do nothing
     ///
     func presentAuthenticationInterfaceIfNeeded(mode: AuthenticationMode) {
-        if let authController = navigationController?.topViewController as? SPAuthViewController, authController.mode == mode {
-            return
-        }
-
         navigationController?.popToRootViewController(animated: true)
         presentAuthenticationInterface(mode: mode)
     }
@@ -265,8 +244,6 @@ private struct OnboardingStrings {
     static let signupText = NSLocalizedString("Sign Up", comment: "Signup Action")
     static let loginText = NSLocalizedString("Log In", comment: "Login Action")
     static let headerText = NSLocalizedString("The simplest way to keep notes.", comment: "Onboarding Header Text")
-    static let loginWithEmailText = NSLocalizedString("Log in with email", comment: "Presents the regular Email signin flow")
-    static let loginWithWpcomText = NSLocalizedString("Log in with WordPress.com", comment: "Allows the user to SignIn using their WPCOM Account")
 }
 
 private struct SignInError {

From 982dd12d3fa2ee9693c33fb9cae1b142c25479a1 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 12 Jul 2024 15:44:10 -0300
Subject: [PATCH 256/547] SPAuthViewController: Mode is static again

---
 Simplenote/Classes/SPAuthViewController.swift | 59 +------------------
 1 file changed, 1 insertion(+), 58 deletions(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index e8af5e7d3..629e68502 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -161,11 +161,7 @@ class SPAuthViewController: UIViewController {
 
     /// # Authentication Mode: Signup or Login
     ///
-    private(set) var mode: AuthenticationMode {
-        didSet {
-            refreshInterface(mode: mode)
-        }
-    }
+    private let mode: AuthenticationMode
 
     /// Indicates if the Extended Debug Mode is enabled
     ///
@@ -662,59 +658,6 @@ extension SPAuthViewController: SPTextInputViewDelegate {
     }
 }
 
-// MARK: - Mode Switching
-//
-extension SPAuthViewController {
-    
-    func refreshInterface(mode: AuthenticationMode, animated: Bool = true) {
-        title = mode.title
-        
-        dismissAllValidationWarnings()
-
-        refreshPasswordInput(isHidden: mode.isPasswordHidden, animated: animated)
-        refreshPrimaryAction(mode: mode)
-        refreshSecondaryAction(mode: mode)
-
-        /// Workaround:
-        /// When revealing the Password Field, iOS's Autofill mechanism may not properly fill the password field!
-        passwordInputView.becomeFirstResponder()
-        emailInputView.becomeFirstResponder()
-    }
-    
-    func refreshPasswordInput(isHidden: Bool, animated: Bool) {
-        let work = {
-            self.passwordInputView.isHidden = isHidden
-        }
-        
-        guard animated else {
-            work()
-            return
-        }
-
-        UIView.animate(withDuration: UIKitConstants.animationDelayShort, animations: work)
-    }
-    
-    func refreshPrimaryAction(mode: AuthenticationMode) {
-        primaryActionButton.setTitleWithoutAnimation(mode.primaryActionText, for: .normal)
-        primaryActionButton.removeTarget(self, action: nil, for: .touchUpInside)
-        primaryActionButton.addTarget(self, action: mode.primaryActionSelector, for: .touchUpInside)
-    }
-    
-    func refreshSecondaryAction(mode: AuthenticationMode) {
-        if let title = mode.secondaryActionText {
-            secondaryActionButton.setTitleWithoutAnimation(title, for: .normal)
-        }
-        
-        if let attributedTitle = mode.secondaryActionAttributedText {
-            secondaryActionButton.setAttributedTitleWithoutAnimation(attributedTitle, for: .normal)
-        }
-
-        secondaryActionButton.setTitleColor(.simplenoteBlue60Color, for: .normal)
-        secondaryActionButton.removeTarget(self, action: nil, for: .touchUpInside)
-        secondaryActionButton.addTarget(self, action: mode.secondaryActionSelector, for: .touchUpInside)
-    }
-}
-
 
 // MARK: - AuthenticationMode: Signup / Login
 //

From f364ad321e9898133bcbadc7f65a8bcc96cc83b4 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 12 Jul 2024 15:46:19 -0300
Subject: [PATCH 257/547] SPAuthViewController: Updates mode descriptors

---
 Simplenote/Classes/SPAuthViewController.swift | 93 +++++++++++++------
 1 file changed, 63 insertions(+), 30 deletions(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index 629e68502..0553e541e 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -664,12 +664,18 @@ extension SPAuthViewController: SPTextInputViewDelegate {
 struct AuthenticationMode: Equatable {
     let title: String
     let validationStyle: AuthenticationValidator.Style
+    let isUsernameHidden: Bool
+    let isPasswordHidden: Bool
+    
     let primaryActionSelector: Selector
     let primaryActionText: String
-    let secondaryActionSelector: Selector
+
+    let secondaryActionSelector: Selector?
     let secondaryActionText: String?
     let secondaryActionAttributedText: NSAttributedString?
-    let isPasswordHidden: Bool
+    
+    let tertiaryActionSelector: Selector?
+    let tertiaryActionText: String?
 }
 
 // MARK: - Default Operation Modes
@@ -679,55 +685,56 @@ extension AuthenticationMode {
     /// Login Operation Mode: Contains all of the strings + delegate wirings, so that the AuthUI handles authentication scenarios.
     ///
     static var loginWithPassword: AuthenticationMode {
-        return .init(title: AuthenticationStrings.loginTitle,
+        return .init(title: PasswordStrings.title,
                      validationStyle: .legacy,
-                     primaryActionSelector: #selector(SPAuthViewController.performLogIn),
-                     primaryActionText: AuthenticationStrings.loginPrimaryAction,
+                     isUsernameHidden: true,
+                     isPasswordHidden: false,
+                     primaryActionSelector: #selector(SPAuthViewController.performLogInWithPassword),
+                     primaryActionText: PasswordStrings.login,
                      secondaryActionSelector: #selector(SPAuthViewController.presentPasswordReset),
-                     secondaryActionText: AuthenticationStrings.loginSecondaryAction,
+                     secondaryActionText: PasswordStrings.forgotPassword,
                      secondaryActionAttributedText: nil,
-                     isPasswordHidden: false)
+                     tertiaryActionSelector: nil,
+                     tertiaryActionText: nil)
     }
 
     /// Login Operation Mode: Authentication is handled via Magic Links!
     ///
     static var loginWithMagicLink: AuthenticationMode {
-        return .init(title: AuthenticationStrings.loginTitle,
+        return .init(title: MagicLinkStrings.title,
                      validationStyle: .legacy,
+                     isUsernameHidden: false,
+                     isPasswordHidden: true,
                      primaryActionSelector: #selector(SPAuthViewController.performLogInWithMagicLink),
-                     primaryActionText: AuthenticationStrings.loginWithLinkPrimaryAction,
-                     secondaryActionSelector: #selector(SPAuthViewController.switchToLoginWithPassword),
-                     secondaryActionText: AuthenticationStrings.loginWithLinkSecondaryAction,
+                     primaryActionText: MagicLinkStrings.loginWithEmail,
+                     secondaryActionSelector: nil,
+                     secondaryActionText: nil,
                      secondaryActionAttributedText: nil,
-                     isPasswordHidden: true)
+                     tertiaryActionSelector: #selector(SPAuthViewController.performLogInWithWPCOM),
+                     tertiaryActionText: MagicLinkStrings.loginWithWPCOM)
     }
 
     /// Signup Operation Mode: Contains all of the strings + delegate wirings, so that the AuthUI handles user account creation scenarios.
     ///
     static var signup: AuthenticationMode {
-        return .init(title: AuthenticationStrings.signupTitle,
+        return .init(title: SignupStrings.title,
                      validationStyle: .strong,
+                     isUsernameHidden: false,
+                     isPasswordHidden: true,
                      primaryActionSelector: #selector(SPAuthViewController.performSignUp),
-                     primaryActionText: AuthenticationStrings.signupPrimaryAction,
+                     primaryActionText: SignupStrings.signup,
                      secondaryActionSelector: #selector(SPAuthViewController.presentTermsOfService),
                      secondaryActionText: nil,
-                     secondaryActionAttributedText: AuthenticationStrings.signupSecondaryAttributedAction,
-                     isPasswordHidden: true)
+                     secondaryActionAttributedText: SignupStrings.termsOfService,
+                     tertiaryActionSelector: nil,
+                     tertiaryActionText: nil)
     }
 }
 
+
 // MARK: - Authentication Strings
 //
 private enum AuthenticationStrings {
-    static let loginTitle                   = NSLocalizedString("Log In", comment: "LogIn Interface Title")
-    static let loginPrimaryAction           = NSLocalizedString("Log In", comment: "LogIn Action")
-    static let loginSecondaryAction         = NSLocalizedString("Forgotten password?", comment: "Password Reset Action")
-    static let loginWithLinkPrimaryAction   = NSLocalizedString("Instantly Log In with Email", comment: "LogIn with Magic Link Action")
-    static let loginWithLinkSecondaryAction = NSLocalizedString("Continue with Password", comment: "Password fallback Action")
-    static let signupTitle                  = NSLocalizedString("Sign Up", comment: "SignUp Interface Title")
-    static let signupPrimaryAction          = NSLocalizedString("Sign Up", comment: "SignUp Action")
-    static let signupSecondaryActionPrefix  = NSLocalizedString("By creating an account you agree to our", comment: "Terms of Service Legend *PREFIX*: printed in dark color")
-    static let signupSecondaryActionSuffix  = NSLocalizedString("Terms and Conditions", comment: "Terms of Service Legend *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue")
     static let emailPlaceholder             = NSLocalizedString("Email", comment: "Email TextField Placeholder")
     static let passwordPlaceholder          = NSLocalizedString("Password", comment: "Password TextField Placeholder")
     static let acceptActionText             = NSLocalizedString("Accept", comment: "Accept Action")
@@ -758,20 +765,46 @@ private enum PasswordInsecureString {
     ].joined(separator: .newline)
 }
 
-// MARK: - Strings >> Authenticated Strings Convenience Properties
+
+// MARK: - Mode: .loginWithPassword
+//
+private enum PasswordStrings {
+    static let title            = NSLocalizedString("Log In", comment: "LogIn Interface Title")
+    static let login            = NSLocalizedString("Log In", comment: "LogIn Action")
+    static let forgotPassword   = NSLocalizedString("Forgot your password?", comment: "Password Reset Action")
+}
+
+
+// MARK: - Mode: .loginWithMagicLink
 //
-private extension AuthenticationStrings {
+private enum MagicLinkStrings {
+    static let title            = NSLocalizedString("Log In", comment: "LogIn Interface Title")
+    static let loginWithEmail   = NSLocalizedString("Log in with email", comment: "Sends the User an email with an Authentication Code")
+    static let loginWithWPCOM   = NSLocalizedString("Log in with WordPress.com", comment: "Password fallback Action")
+}
+
+
+// MARK: - Mode: .signup
+//
+private enum SignupStrings {
+    static let title                = NSLocalizedString("Sign Up", comment: "SignUp Interface Title")
+    static let signup               = NSLocalizedString("Sign Up", comment: "SignUp Action")
+    static let termsOfServicePrefix = NSLocalizedString("By creating an account you agree to our", comment: "Terms of Service Legend *PREFIX*: printed in dark color")
+    static let termsOfServiceSuffix = NSLocalizedString("Terms and Conditions", comment: "Terms of Service Legend *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue")
+}
+
+private extension SignupStrings {
 
     /// Returns a properly formatted Secondary Action String for Signup
     ///
-    static var signupSecondaryAttributedAction: NSAttributedString {
+    static var termsOfService: NSAttributedString {
         let output = NSMutableAttributedString(string: String(), attributes: [
             .font: UIFont.preferredFont(forTextStyle: .subheadline)
         ])
 
-        output.append(string: signupSecondaryActionPrefix, foregroundColor: .simplenoteGray60Color)
+        output.append(string: termsOfServicePrefix, foregroundColor: .simplenoteGray60Color)
         output.append(string: " ")
-        output.append(string: signupSecondaryActionSuffix, foregroundColor: .simplenoteBlue60Color)
+        output.append(string: termsOfServiceSuffix, foregroundColor: .simplenoteBlue60Color)
 
         return output
     }

From a80d7921378287b98dcbdbf7d8ecf18b04368387 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 12 Jul 2024 15:46:35 -0300
Subject: [PATCH 258/547] SPAuthViewController: New Navigation Helper

---
 Simplenote/Classes/SPAuthViewController.swift | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index 0553e541e..0902321cb 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -357,20 +357,22 @@ private extension SPAuthViewController {
         safariViewController.modalPresentationStyle = .overFullScreen
         present(safariViewController, animated: true, completion: nil)
     }
+}
+
 
-    private func presentSignupVerification() {
+// MARK: - Navigation Helpers
+//
+private extension SPAuthViewController {
+
+    func presentSignupVerification() {
         let viewController = SignupVerificationViewController(email: email)
         viewController.title = title
         navigationController?.pushViewController(viewController, animated: true)
     }
     
-    private func presentMagicLinkRequestedView(email: String) {
-        let rootView = MagicLinkRequestedView(email: email)
-        let hostingController = UIHostingController(rootView: rootView)
-        hostingController.modalPresentationStyle = .formSheet
-        hostingController.sheetPresentationController?.detents = [.medium()]
-
-        present(hostingController, animated: true)
+    func presentPasswordInterface() {
+        let viewController = SPAuthViewController(controller: controller, mode: .loginWithPassword)
+        navigationController?.pushViewController(viewController, animated: true)
     }
 }
 

From c9b82e6877af90c7edaca96ead7824574fc4f175 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 12 Jul 2024 15:46:42 -0300
Subject: [PATCH 259/547] SPAuthViewController: Drops dead API

---
 Simplenote/Classes/SPAuthViewController.swift | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index 0902321cb..8b47a7d2e 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -340,10 +340,6 @@ private extension SPAuthViewController {
         }
     }
     
-    @IBAction func switchToLoginWithPassword() {
-        mode = .loginWithPassword
-    }
-
     @IBAction func presentPasswordReset() {
         controller.presentPasswordReset(from: self, username: email)
     }

From 66f37140f71423060054e63b282eb4292db03027 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 12 Jul 2024 15:46:55 -0300
Subject: [PATCH 260/547] SPAuthViewController: Adds WPCOM SSO

---
 Simplenote/Classes/SPAuthViewController.swift | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index 8b47a7d2e..1e313243e 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -318,6 +318,10 @@ private extension SPAuthViewController {
         }
     }
     
+    @IBAction func performLogInWithWPCOM() {
+        WPAuthHandler.presentWordPressSSO(from: self)
+    }
+    
     @IBAction func performSignUp() {
         guard ensureWarningsAreOnScreenWhenNeeded() else {
             return

From 77ca14704e575ed997016ade7ce7b98aebb478ad Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 12 Jul 2024 15:47:09 -0300
Subject: [PATCH 261/547] SPAuthViewController: Updates tertiaryAction
 Management

---
 Simplenote/Classes/SPAuthViewController.swift | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index 1e313243e..f9ef1704a 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -100,7 +100,10 @@ class SPAuthViewController: UIViewController {
 
             secondaryActionButton.titleLabel?.textAlignment = .center
             secondaryActionButton.titleLabel?.numberOfLines = 0
-            secondaryActionButton.addTarget(self, action: mode.secondaryActionSelector, for: .touchUpInside)
+            
+            if let action = mode.secondaryActionSelector {
+                secondaryActionButton.addTarget(self, action: action, for: .touchUpInside)
+            }
         }
     }
 
@@ -119,6 +122,29 @@ class SPAuthViewController: UIViewController {
         return button
     }()
 
+    /// # Tertiary Action: Container View
+    ///
+    @IBOutlet private var tertiaryActionContainerView: UIView! {
+        didSet {
+            tertiaryActionContainerView.isHidden = mode.tertiaryActionSelector == nil
+        }
+    }
+
+    /// # Tertiary Action: WPCOM SSO
+    ///
+    @IBOutlet private var tertiaryActionButton: SPSquaredButton! {
+        didSet {
+            guard let title = mode.tertiaryActionText, let action = mode.tertiaryActionSelector else {
+                return
+            }
+            
+            tertiaryActionButton.setTitle(title, for: .normal)
+            tertiaryActionButton.setTitleColor(.white, for: .normal)
+            tertiaryActionButton.backgroundColor = .simplenoteWPBlue50Color
+            tertiaryActionButton.addTarget(self, action: action, for: .touchUpInside)
+        }
+    }
+
     /// # Simperium's Authenticator Instance
     ///
     private let controller: SPAuthHandler

From ec93dc6a5376102895427617b130cf76b7f9fe00 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 12 Jul 2024 15:47:27 -0300
Subject: [PATCH 262/547] SPAuthViewController: Enhancing default first
 responder management

---
 Simplenote/Classes/SPAuthViewController.swift | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index f9ef1704a..43f121758 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -214,6 +214,7 @@ class SPAuthViewController: UIViewController {
         setupNavigationController()
         startListeningToNotifications()
 
+        emailInputView.isHidden = mode.isUsernameHidden
         passwordInputView.isHidden = mode.isPasswordHidden
 
         // hiding text from back button
@@ -232,7 +233,9 @@ class SPAuthViewController: UIViewController {
         // Note: running becomeFirstResponder in `viewWillAppear` has the weird side effect of breaking caret
         // repositioning in the Text Field. Seriously.
         // Ref. https://github.com/Automattic/simplenote-ios/issues/453
-        self.emailInputView.becomeFirstResponder()
+        //
+        let initialFirstResponder = mode.isPasswordHidden ? emailInputView : passwordInputView
+        initialFirstResponder?.becomeFirstResponder()
     }
 }
 

From fce0c2f416d96046b7015353c79ef3407da7092d Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 12 Jul 2024 15:47:35 -0300
Subject: [PATCH 263/547] SPAuthViewController: Renames API

---
 Simplenote/Classes/SPAuthViewController.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index 43f121758..1dad9591f 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -313,8 +313,8 @@ private extension SPAuthViewController {
 
         perform(mode.primaryActionSelector)
     }
-
-    @IBAction func performLogIn() {
+    
+    @IBAction func performLogInWithPassword() {
         guard ensureWarningsAreOnScreenWhenNeeded() else {
             return
         }

From ac25839fbe98312942108c128c2ee5586ddb6ff8 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 12 Jul 2024 15:47:42 -0300
Subject: [PATCH 264/547] SPAuthViewController: Updates nib

---
 Simplenote/Classes/SPAuthViewController.xib | 66 ++++++++++++++++++---
 1 file changed, 57 insertions(+), 9 deletions(-)

diff --git a/Simplenote/Classes/SPAuthViewController.xib b/Simplenote/Classes/SPAuthViewController.xib
index ac1bcbb84..4fddaadda 100644
--- a/Simplenote/Classes/SPAuthViewController.xib
+++ b/Simplenote/Classes/SPAuthViewController.xib
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14854.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="ipad9_7" orientation="landscape" layout="fullscreen" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14806.4"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -19,6 +20,8 @@
                 <outlet property="secondaryActionButton" destination="PfS-vU-7i3" id="zj3-Ly-5X9"/>
                 <outlet property="stackView" destination="CJS-5O-pxK" id="Grg-ZD-DYy"/>
                 <outlet property="stackViewTopConstraint" destination="Cyh-nE-ql7" id="WHM-m6-Cht"/>
+                <outlet property="tertiaryActionButton" destination="Uy8-va-3uF" id="NfE-QO-aLc"/>
+                <outlet property="tertiaryActionContainerView" destination="nxG-8M-wxx" id="FtU-Ac-O5T"/>
                 <outlet property="view" destination="iN0-l3-epB" id="bxN-Zo-xBW"/>
             </connections>
         </placeholder>
@@ -28,7 +31,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="CJS-5O-pxK">
-                    <rect key="frame" x="332" y="40" width="360" height="252"/>
+                    <rect key="frame" x="332" y="60" width="360" height="304"/>
                     <subviews>
                         <view contentMode="center" translatesAutoresizingMaskIntoConstraints="NO" id="hW6-K1-OyV" customClass="SPTextInputView" customModule="Simplenote" customModuleProvider="target">
                             <rect key="frame" x="0.0" y="0.0" width="360" height="44"/>
@@ -43,7 +46,7 @@
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="#Invalid email#" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="n7T-Gj-plH" customClass="SPLabel" customModule="Simplenote" customModuleProvider="target">
                             <rect key="frame" x="0.0" y="52" width="102.5" height="18"/>
                             <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
-                            <color key="textColor" systemColor="systemPinkColor" red="1" green="0.17647058823529413" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <color key="textColor" systemColor="systemPinkColor"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <view contentMode="center" translatesAutoresizingMaskIntoConstraints="NO" id="pdF-nK-gXE" customClass="SPTextInputView" customModule="Simplenote" customModuleProvider="target">
@@ -59,13 +62,13 @@
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="#Invalid password#" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UyC-If-pXj" customClass="SPLabel" customModule="Simplenote" customModuleProvider="target">
                             <rect key="frame" x="0.0" y="130" width="132" height="18"/>
                             <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
-                            <color key="textColor" systemColor="systemRedColor" red="1" green="0.23137254901960785" blue="0.18823529411764706" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <color key="textColor" systemColor="systemRedColor"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CGr-O3-MBQ" userLabel="Primary Action View">
                             <rect key="frame" x="0.0" y="156" width="360" height="44"/>
                             <subviews>
-                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="q3p-Ji-dOm" customClass="SPSquaredButton" customModule="Simplenote" customModuleProvider="target">
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="q3p-Ji-dOm" customClass="SPSquaredButton" customModule="Simplenote" customModuleProvider="target">
                                     <rect key="frame" x="0.0" y="0.0" width="360" height="44"/>
                                     <fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
                                     <state key="normal" title="#Primary#"/>
@@ -74,7 +77,7 @@
                                     <rect key="frame" x="322" y="12" width="20" height="20"/>
                                 </activityIndicatorView>
                             </subviews>
-                            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                             <constraints>
                                 <constraint firstAttribute="bottom" secondItem="q3p-Ji-dOm" secondAttribute="bottom" id="42P-Dw-g8A"/>
                                 <constraint firstAttribute="trailing" secondItem="o3M-2A-urw" secondAttribute="trailing" constant="18" id="5zP-Ho-8zY"/>
@@ -85,8 +88,26 @@
                                 <constraint firstItem="o3M-2A-urw" firstAttribute="centerY" secondItem="CGr-O3-MBQ" secondAttribute="centerY" id="wvA-qg-zbY"/>
                             </constraints>
                         </view>
-                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PfS-vU-7i3">
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nxG-8M-wxx" userLabel="Tertiary Action View">
                             <rect key="frame" x="0.0" y="208" width="360" height="44"/>
+                            <subviews>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Uy8-va-3uF" userLabel="#Tertiary#" customClass="SPSquaredButton" customModule="Simplenote" customModuleProvider="target">
+                                    <rect key="frame" x="0.0" y="0.0" width="360" height="44"/>
+                                    <fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
+                                    <state key="normal" title="#Tertiary#"/>
+                                </button>
+                            </subviews>
+                            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                            <constraints>
+                                <constraint firstAttribute="trailing" secondItem="Uy8-va-3uF" secondAttribute="trailing" id="4sz-wJ-Fm5"/>
+                                <constraint firstAttribute="bottom" secondItem="Uy8-va-3uF" secondAttribute="bottom" id="7XH-hU-NF8"/>
+                                <constraint firstItem="Uy8-va-3uF" firstAttribute="leading" secondItem="nxG-8M-wxx" secondAttribute="leading" id="F1T-yV-yFY"/>
+                                <constraint firstAttribute="height" constant="44" id="jJo-79-bms"/>
+                                <constraint firstItem="Uy8-va-3uF" firstAttribute="top" secondItem="nxG-8M-wxx" secondAttribute="top" id="rt4-P1-Ygd"/>
+                            </constraints>
+                        </view>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PfS-vU-7i3">
+                            <rect key="frame" x="0.0" y="260" width="360" height="44"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="44" id="u8s-d9-Em4"/>
                             </constraints>
@@ -102,11 +123,14 @@
                         <constraint firstAttribute="trailing" secondItem="hW6-K1-OyV" secondAttribute="trailing" id="RSC-Vk-xbB"/>
                         <constraint firstItem="hW6-K1-OyV" firstAttribute="leading" secondItem="CJS-5O-pxK" secondAttribute="leading" id="UoC-hu-yxe"/>
                         <constraint firstAttribute="width" relation="lessThanOrEqual" constant="360" id="nLp-JP-Ott"/>
+                        <constraint firstItem="nxG-8M-wxx" firstAttribute="leading" secondItem="CJS-5O-pxK" secondAttribute="leading" id="sEH-qo-ZdT"/>
                         <constraint firstAttribute="trailing" secondItem="CGr-O3-MBQ" secondAttribute="trailing" id="vUF-qZ-Vmm"/>
+                        <constraint firstAttribute="trailing" secondItem="nxG-8M-wxx" secondAttribute="trailing" id="w8N-O1-2au"/>
                         <constraint firstItem="pdF-nK-gXE" firstAttribute="leading" secondItem="CJS-5O-pxK" secondAttribute="leading" id="xzh-aD-Ag5"/>
                     </constraints>
                 </stackView>
             </subviews>
+            <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="CJS-5O-pxK" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" constant="40" id="Cyh-nE-ql7"/>
@@ -114,8 +138,32 @@
                 <constraint firstItem="CJS-5O-pxK" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="H6h-v9-Uwb"/>
                 <constraint firstItem="CJS-5O-pxK" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" priority="999" constant="24" id="Odu-ev-HSV"/>
             </constraints>
-            <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
             <point key="canvasLocation" x="137.68115942028987" y="152.67857142857142"/>
         </view>
     </objects>
+    <designables>
+        <designable name="Uy8-va-3uF">
+            <size key="intrinsicContentSize" width="83" height="33"/>
+        </designable>
+        <designable name="UyC-If-pXj">
+            <size key="intrinsicContentSize" width="132" height="18"/>
+        </designable>
+        <designable name="n7T-Gj-plH">
+            <size key="intrinsicContentSize" width="102.5" height="18"/>
+        </designable>
+        <designable name="q3p-Ji-dOm">
+            <size key="intrinsicContentSize" width="84" height="33"/>
+        </designable>
+    </designables>
+    <resources>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+        <systemColor name="systemPinkColor">
+            <color red="1" green="0.1764705882" blue="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+        <systemColor name="systemRedColor">
+            <color red="1" green="0.23137254900000001" blue="0.18823529410000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+    </resources>
 </document>

From 048ae6a4b3ad7860fca7b08354955cd1c6c72af4 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 12 Jul 2024 16:05:06 -0300
Subject: [PATCH 265/547] SPAuthViewController: Updates comment

---
 Simplenote/Classes/SPAuthViewController.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index 1dad9591f..2be981bb8 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -185,7 +185,7 @@ class SPAuthViewController: UIViewController {
     ///
     private var mustResetPasswordField = false
 
-    /// # Authentication Mode: Signup or Login
+    /// # Authentication Mode: Signup / Login with Password / Login with Link
     ///
     private let mode: AuthenticationMode
 

From f5431c332eba2b1292eb6cc58f348937d05fa46d Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 12 Jul 2024 16:05:19 -0300
Subject: [PATCH 266/547] SPAuthViewController: Updates validation logic

---
 Simplenote/Classes/SPAuthViewController.swift | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index 2be981bb8..97a5b9a7f 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -602,16 +602,21 @@ private extension SPAuthViewController {
 private extension SPAuthViewController {
 
     func performUsernameValidation() -> AuthenticationValidator.Result {
-        validator.performUsernameValidation(username: email)
+        if mode.isUsernameHidden {
+            return .success
+        }
+
+        return validator.performUsernameValidation(username: email)
     }
 
     /// When we're in `.login` mode, password requirements are relaxed (since we must allow users with old passwords to sign in).
     /// That's where the `validationStyle` comes in.
     ///
     func performPasswordValidation() -> AuthenticationValidator.Result {
-        guard !mode.isPasswordHidden else {
+        if mode.isPasswordHidden {
             return .success
         }
+
         return validator.performPasswordValidation(username: email, password: password, style: mode.validationStyle)
     }
 

From 929a6ccf247772d300684d07a1b5b1910a604b00 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 12 Jul 2024 16:05:30 -0300
Subject: [PATCH 267/547] SPAuthViewController: Updates title

---
 Simplenote/Classes/SPAuthViewController.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index 97a5b9a7f..11568945f 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -805,7 +805,7 @@ private enum PasswordInsecureString {
 // MARK: - Mode: .loginWithPassword
 //
 private enum PasswordStrings {
-    static let title            = NSLocalizedString("Log In", comment: "LogIn Interface Title")
+    static let title            = NSLocalizedString("Log In with Password", comment: "LogIn Interface Title")
     static let login            = NSLocalizedString("Log In", comment: "LogIn Action")
     static let forgotPassword   = NSLocalizedString("Forgot your password?", comment: "Password Reset Action")
 }

From 9853ceec20d916439755c67306d11e96b873df69 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 12 Jul 2024 16:25:58 -0300
Subject: [PATCH 268/547] Implements AuthenticationState

---
 Simplenote/Classes/SPAuthViewController.swift | 63 ++++++++++++-------
 1 file changed, 41 insertions(+), 22 deletions(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index 11568945f..9262f82f1 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -162,23 +162,13 @@ class SPAuthViewController: UIViewController {
     /// # Returns the EmailInputView's Text: When empty this getter returns an empty string, instead of nil
     ///
     private var email: String {
-        get {
-            return emailInputView.text ?? String()
-        }
-        set {
-            emailInputView.text = newValue
-        }
+        state.username
     }
 
     /// # Returns the PasswordInputView's Text: When empty this getter returns an empty string, instead of nil
     ///
     private var password: String {
-        get {
-            return passwordInputView.text ?? String()
-        }
-        set {
-            passwordInputView.text = newValue
-        }
+        state.password
     }
 
     /// Indicates if we must nuke the Password Field's contents whenever the App becomes active
@@ -188,6 +178,15 @@ class SPAuthViewController: UIViewController {
     /// # Authentication Mode: Signup / Login with Password / Login with Link
     ///
     private let mode: AuthenticationMode
+    
+    /// # State: Allows us to preserve State, when dealing with a multi staged flow
+    ///
+    private var state: AuthenticationState {
+        didSet {
+            ensureStylesMatchValidationState()
+            ensureWarningsAreDismissedWhenNeeded()
+        }
+    }
 
     /// Indicates if the Extended Debug Mode is enabled
     ///
@@ -201,9 +200,10 @@ class SPAuthViewController: UIViewController {
 
     /// Designated Initializer
     ///
-    init(controller: SPAuthHandler, mode: AuthenticationMode = .loginWithMagicLink) {
+    init(controller: SPAuthHandler, mode: AuthenticationMode = .loginWithMagicLink, state: AuthenticationState = .init()) {
         self.controller = controller
         self.mode = mode
+        self.state = state
         super.init(nibName: nil, bundle: nil)
     }
 
@@ -214,8 +214,7 @@ class SPAuthViewController: UIViewController {
         setupNavigationController()
         startListeningToNotifications()
 
-        emailInputView.isHidden = mode.isUsernameHidden
-        passwordInputView.isHidden = mode.isPasswordHidden
+        refreshInputViews()
 
         // hiding text from back button
         navigationItem.backBarButtonItem = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
@@ -270,6 +269,14 @@ private extension SPAuthViewController {
         navigationController?.setNavigationBarHidden(false, animated: true)
     }
 
+    func refreshInputViews() {
+        emailInputView.text = state.username
+        passwordInputView.text = state.password
+        
+        emailInputView.isHidden = mode.isUsernameHidden
+        passwordInputView.isHidden = mode.isPasswordHidden
+    }
+
     func ensureStylesMatchValidationState() {
         primaryActionButton.backgroundColor = isInputValid ? .simplenoteBlue50Color : .simplenoteGray20Color
     }
@@ -400,7 +407,7 @@ private extension SPAuthViewController {
     }
     
     func presentPasswordInterface() {
-        let viewController = SPAuthViewController(controller: controller, mode: .loginWithPassword)
+        let viewController = SPAuthViewController(controller: controller, mode: .loginWithPassword, state: state)
         navigationController?.pushViewController(viewController, animated: true)
     }
 }
@@ -546,11 +553,8 @@ private extension SPAuthViewController {
         }
 
         // Prefill the LoginViewController
-        let loginViewController = SPAuthViewController(controller: controller, mode: .loginWithPassword)
-
+        let loginViewController = SPAuthViewController(controller: controller, mode: .loginWithPassword, state: state)
         loginViewController.loadViewIfNeeded()
-        loginViewController.email = email
-        loginViewController.password = password
 
         // Swap the current VC
         var updatedHierarchy = navigationController.viewControllers.filter { ($0 is SPAuthViewController) == false }
@@ -653,13 +657,20 @@ private extension SPAuthViewController {
     }
 }
 
+
 // MARK: - UITextFieldDelegate Conformance
 //
 extension SPAuthViewController: SPTextInputViewDelegate {
 
     func textInputDidChange(_ textInput: SPTextInputView) {
-        ensureStylesMatchValidationState()
-        ensureWarningsAreDismissedWhenNeeded()
+        switch textInput {
+        case emailInputView:
+            state.username = textInput.text ?? ""
+        case passwordInputView:
+            state.password = textInput.text ?? ""
+        default:
+            break
+        }
     }
 
     func textInputShouldReturn(_ textInput: SPTextInputView) -> Bool {
@@ -695,6 +706,14 @@ extension SPAuthViewController: SPTextInputViewDelegate {
 }
 
 
+// MARK: - State
+//
+struct AuthenticationState {
+    var username = String()
+    var password = String()
+}
+
+
 // MARK: - AuthenticationMode: Signup / Login
 //
 struct AuthenticationMode: Equatable {

From f97b47807f667ed92a161890770bbbb68170bffb Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 12 Jul 2024 17:03:47 -0300
Subject: [PATCH 269/547] SPAuthViewController: Adds separator view

---
 Simplenote/Classes/SPAuthViewController.swift | 23 +++++++
 Simplenote/Classes/SPAuthViewController.xib   | 69 +++++++++++++++----
 2 files changed, 79 insertions(+), 13 deletions(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index 9262f82f1..4dcb9d539 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -122,6 +122,22 @@ class SPAuthViewController: UIViewController {
         return button
     }()
 
+    /// # Tertiary Separator: COntainer
+    ///
+    @IBOutlet private var tertiaryTopSeparator: UIView! {
+        didSet {
+            tertiaryTopSeparator.isHidden = mode.tertiaryActionSelector == nil
+        }
+    }
+
+    /// # Tertiary Separator: Label (Or)
+    ///
+    @IBOutlet private var tertiaryTopSeparatorLabel: UILabel! {
+        didSet {
+            tertiaryTopSeparatorLabel.text = AuthenticationStrings.separatorText
+        }
+    }
+    
     /// # Tertiary Action: Container View
     ///
     @IBOutlet private var tertiaryActionContainerView: UIView! {
@@ -214,6 +230,7 @@ class SPAuthViewController: UIViewController {
         setupNavigationController()
         startListeningToNotifications()
 
+        refreshActions()
         refreshInputViews()
 
         // hiding text from back button
@@ -269,6 +286,11 @@ private extension SPAuthViewController {
         navigationController?.setNavigationBarHidden(false, animated: true)
     }
 
+    func refreshActions() {
+        secondaryActionButton.isHidden = mode.secondaryActionSelector == nil
+        tertiaryActionButton.isHidden = mode.tertiaryActionSelector == nil
+    }
+
     func refreshInputViews() {
         emailInputView.text = state.username
         passwordInputView.text = state.password
@@ -790,6 +812,7 @@ extension AuthenticationMode {
 // MARK: - Authentication Strings
 //
 private enum AuthenticationStrings {
+    static let separatorText                = NSLocalizedString("Or", comment: "Or, used as a separator between Actions")
     static let emailPlaceholder             = NSLocalizedString("Email", comment: "Email TextField Placeholder")
     static let passwordPlaceholder          = NSLocalizedString("Password", comment: "Password TextField Placeholder")
     static let acceptActionText             = NSLocalizedString("Accept", comment: "Accept Action")
diff --git a/Simplenote/Classes/SPAuthViewController.xib b/Simplenote/Classes/SPAuthViewController.xib
index 4fddaadda..92d384f0a 100644
--- a/Simplenote/Classes/SPAuthViewController.xib
+++ b/Simplenote/Classes/SPAuthViewController.xib
@@ -22,6 +22,8 @@
                 <outlet property="stackViewTopConstraint" destination="Cyh-nE-ql7" id="WHM-m6-Cht"/>
                 <outlet property="tertiaryActionButton" destination="Uy8-va-3uF" id="NfE-QO-aLc"/>
                 <outlet property="tertiaryActionContainerView" destination="nxG-8M-wxx" id="FtU-Ac-O5T"/>
+                <outlet property="tertiaryTopSeparator" destination="Kpm-3a-0Z7" id="vyp-IY-5NB"/>
+                <outlet property="tertiaryTopSeparatorLabel" destination="223-DD-dLN" id="4cS-eP-Gg8"/>
                 <outlet property="view" destination="iN0-l3-epB" id="bxN-Zo-xBW"/>
             </connections>
         </placeholder>
@@ -31,7 +33,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="CJS-5O-pxK">
-                    <rect key="frame" x="332" y="60" width="360" height="304"/>
+                    <rect key="frame" x="332" y="60" width="360" height="356"/>
                     <subviews>
                         <view contentMode="center" translatesAutoresizingMaskIntoConstraints="NO" id="hW6-K1-OyV" customClass="SPTextInputView" customModule="Simplenote" customModuleProvider="target">
                             <rect key="frame" x="0.0" y="0.0" width="360" height="44"/>
@@ -88,8 +90,55 @@
                                 <constraint firstItem="o3M-2A-urw" firstAttribute="centerY" secondItem="CGr-O3-MBQ" secondAttribute="centerY" id="wvA-qg-zbY"/>
                             </constraints>
                         </view>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nxG-8M-wxx" userLabel="Tertiary Action View">
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PfS-vU-7i3">
                             <rect key="frame" x="0.0" y="208" width="360" height="44"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="44" id="u8s-d9-Em4"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
+                            <state key="normal" title="#Secondary#">
+                                <color key="titleColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            </state>
+                        </button>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Kpm-3a-0Z7" userLabel="Tertiary Separator View">
+                            <rect key="frame" x="0.0" y="260" width="360" height="44"/>
+                            <subviews>
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1Ls-SS-l0Q" userLabel="Leading View">
+                                    <rect key="frame" x="0.0" y="21.5" width="167" height="1"/>
+                                    <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="1" id="rVl-M6-Cd1"/>
+                                    </constraints>
+                                </view>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Or" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="223-DD-dLN">
+                                    <rect key="frame" x="172" y="13.5" width="16" height="17"/>
+                                    <fontDescription key="fontDescription" type="italicSystem" pointSize="14"/>
+                                    <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zDI-3J-P7n" userLabel="Trailing View">
+                                    <rect key="frame" x="193" y="21.5" width="167" height="1"/>
+                                    <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="1" id="q0n-gB-kwQ"/>
+                                    </constraints>
+                                </view>
+                            </subviews>
+                            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                            <constraints>
+                                <constraint firstItem="223-DD-dLN" firstAttribute="leading" secondItem="1Ls-SS-l0Q" secondAttribute="trailing" constant="5" id="6eB-VO-Lvv"/>
+                                <constraint firstItem="223-DD-dLN" firstAttribute="centerY" secondItem="Kpm-3a-0Z7" secondAttribute="centerY" id="I7a-xZ-3cO"/>
+                                <constraint firstAttribute="trailing" secondItem="zDI-3J-P7n" secondAttribute="trailing" id="Jk5-Jv-Cgt"/>
+                                <constraint firstItem="223-DD-dLN" firstAttribute="centerX" secondItem="Kpm-3a-0Z7" secondAttribute="centerX" id="WH4-zc-WJ7"/>
+                                <constraint firstAttribute="height" constant="44" id="m11-VH-7Ya"/>
+                                <constraint firstItem="1Ls-SS-l0Q" firstAttribute="leading" secondItem="Kpm-3a-0Z7" secondAttribute="leading" id="nl1-rW-o3J"/>
+                                <constraint firstItem="zDI-3J-P7n" firstAttribute="centerY" secondItem="Kpm-3a-0Z7" secondAttribute="centerY" id="oQH-pJ-ASQ"/>
+                                <constraint firstItem="1Ls-SS-l0Q" firstAttribute="centerY" secondItem="Kpm-3a-0Z7" secondAttribute="centerY" id="peR-N9-64H"/>
+                                <constraint firstItem="zDI-3J-P7n" firstAttribute="leading" secondItem="223-DD-dLN" secondAttribute="trailing" constant="5" id="vE8-Zf-q7V"/>
+                            </constraints>
+                        </view>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nxG-8M-wxx" userLabel="Tertiary Action View">
+                            <rect key="frame" x="0.0" y="312" width="360" height="44"/>
                             <subviews>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Uy8-va-3uF" userLabel="#Tertiary#" customClass="SPSquaredButton" customModule="Simplenote" customModuleProvider="target">
                                     <rect key="frame" x="0.0" y="0.0" width="360" height="44"/>
@@ -106,21 +155,15 @@
                                 <constraint firstItem="Uy8-va-3uF" firstAttribute="top" secondItem="nxG-8M-wxx" secondAttribute="top" id="rt4-P1-Ygd"/>
                             </constraints>
                         </view>
-                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PfS-vU-7i3">
-                            <rect key="frame" x="0.0" y="260" width="360" height="44"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="44" id="u8s-d9-Em4"/>
-                            </constraints>
-                            <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
-                            <state key="normal" title="#Secondary#"/>
-                        </button>
                     </subviews>
                     <constraints>
                         <constraint firstAttribute="trailing" secondItem="PfS-vU-7i3" secondAttribute="trailing" id="0QL-Iw-KLz"/>
                         <constraint firstItem="PfS-vU-7i3" firstAttribute="leading" secondItem="CJS-5O-pxK" secondAttribute="leading" id="314-fc-3eX"/>
                         <constraint firstAttribute="trailing" secondItem="pdF-nK-gXE" secondAttribute="trailing" id="51g-0D-Oyv"/>
+                        <constraint firstAttribute="trailing" secondItem="Kpm-3a-0Z7" secondAttribute="trailing" id="7SY-4J-Rv5"/>
                         <constraint firstItem="CGr-O3-MBQ" firstAttribute="leading" secondItem="CJS-5O-pxK" secondAttribute="leading" id="BIX-Fy-gqY"/>
                         <constraint firstAttribute="trailing" secondItem="hW6-K1-OyV" secondAttribute="trailing" id="RSC-Vk-xbB"/>
+                        <constraint firstItem="Kpm-3a-0Z7" firstAttribute="leading" secondItem="CJS-5O-pxK" secondAttribute="leading" id="S94-pS-Aza"/>
                         <constraint firstItem="hW6-K1-OyV" firstAttribute="leading" secondItem="CJS-5O-pxK" secondAttribute="leading" id="UoC-hu-yxe"/>
                         <constraint firstAttribute="width" relation="lessThanOrEqual" constant="360" id="nLp-JP-Ott"/>
                         <constraint firstItem="nxG-8M-wxx" firstAttribute="leading" secondItem="CJS-5O-pxK" secondAttribute="leading" id="sEH-qo-ZdT"/>
@@ -138,7 +181,7 @@
                 <constraint firstItem="CJS-5O-pxK" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="H6h-v9-Uwb"/>
                 <constraint firstItem="CJS-5O-pxK" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" priority="999" constant="24" id="Odu-ev-HSV"/>
             </constraints>
-            <point key="canvasLocation" x="137.68115942028987" y="152.67857142857142"/>
+            <point key="canvasLocation" x="137.109375" y="152.34375"/>
         </view>
     </objects>
     <designables>
@@ -160,10 +203,10 @@
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
         <systemColor name="systemPinkColor">
-            <color red="1" green="0.1764705882" blue="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="1" green="0.17647058823529413" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
         <systemColor name="systemRedColor">
-            <color red="1" green="0.23137254900000001" blue="0.18823529410000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="1" green="0.23137254901960785" blue="0.18823529411764706" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
     </resources>
 </document>

From 1812b5babc531a376bd5a1351c1ffd5f5cba7ad0 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 12 Jul 2024 18:59:42 -0300
Subject: [PATCH 270/547] Fixes UI Tests

---
 SimplenoteUITests/EmailLogin.swift             | 11 +++++++----
 SimplenoteUITests/SimplenoteUITestsLogin.swift | 15 ++-------------
 SimplenoteUITests/UIDs.swift                   |  2 +-
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/SimplenoteUITests/EmailLogin.swift b/SimplenoteUITests/EmailLogin.swift
index 9c3e3431b..c3ea46142 100644
--- a/SimplenoteUITests/EmailLogin.swift
+++ b/SimplenoteUITests/EmailLogin.swift
@@ -5,8 +5,6 @@ class EmailLogin {
     class func open() {
         app.buttons[UID.Button.logIn].waitForIsHittable()
         app.buttons[UID.Button.logIn].tap()
-        app.buttons[UID.Button.logInWithEmail].waitForIsHittable()
-        app.buttons[UID.Button.logInWithEmail].tap()
     }
 
     class func close() {
@@ -34,13 +32,18 @@ class EmailLogin {
 
     class func logIn(email: String, password: String) {
         enterEmail(enteredValue: email)
-        app.buttons[UID.Button.continueWithPassword].tap()
+        app.buttons[UID.Button.logInWithEmail].tap()
         _ = app.buttons[UID.Button.logIn].waitForExistence(timeout: minLoadTimeout)
         enterPassword(enteredValue: password)
-        app.buttons[UID.Button.logIn].tap()
+        app.buttons[UID.Button.mainAction].tap()
         handleSavePasswordPrompt()
         waitForSpinnerToDisappear()
     }
+    
+    class func enterEmailAndAttemptLogin(email: String) {
+        enterEmail(enteredValue: email)
+        app.buttons[UID.Button.logInWithEmail].tap()
+     }
 
     class func enterEmail(enteredValue: String) {
         let field = app.textFields[UID.TextField.email]
diff --git a/SimplenoteUITests/SimplenoteUITestsLogin.swift b/SimplenoteUITests/SimplenoteUITestsLogin.swift
index 2e1c97511..8874d0d65 100644
--- a/SimplenoteUITests/SimplenoteUITestsLogin.swift
+++ b/SimplenoteUITests/SimplenoteUITestsLogin.swift
@@ -17,24 +17,13 @@ class SimplenoteUISmokeTestsLogin: XCTestCase {
         let _ = attemptLogOut()
     }
 
-    func testLogInWithNoEmailNoPassword() throws {
-        trackTest()
-
-        trackStep()
-        EmailLogin.open()
-        EmailLogin.logIn(email: "", password: "")
-        app.assertLabelExists(withText: Text.loginEmailInvalid)
-        app.assertLabelExists(withText: Text.loginPasswordShort)
-    }
-
     func testLogInWithNoEmail() throws {
         trackTest()
 
         trackStep()
         EmailLogin.open()
-        EmailLogin.logIn(email: "", password: testDataPassword)
+        EmailLogin.enterEmailAndAttemptLogin(email: "")
         Assert.labelExists(labelText: Text.loginEmailInvalid)
-        Assert.labelAbsent(labelText: Text.loginPasswordShort)
     }
 
     func testLogInWithInvalidEmail() throws {
@@ -42,7 +31,7 @@ class SimplenoteUISmokeTestsLogin: XCTestCase {
 
         trackStep()
         EmailLogin.open()
-        EmailLogin.logIn(email: testDataInvalidEmail, password: testDataPassword)
+        EmailLogin.enterEmailAndAttemptLogin(email: testDataInvalidEmail)
         Assert.labelExists(labelText: Text.loginEmailInvalid)
         Assert.labelAbsent(labelText: Text.loginPasswordShort)
     }
diff --git a/SimplenoteUITests/UIDs.swift b/SimplenoteUITests/UIDs.swift
index e47813a04..3e6bece97 100644
--- a/SimplenoteUITests/UIDs.swift
+++ b/SimplenoteUITests/UIDs.swift
@@ -26,7 +26,7 @@ enum UID {
         static let menu = "menu"
         static let signUp = "Sign Up"
         static let logIn = "Log In"
-        static let continueWithPassword = "Continue with Password"
+        static let mainAction = "Main Action"
         static let logInWithEmail = "Log in with email"
         static let allNotes = "All Notes"
         static let trash = "Trash"

From 2d1dccc9c063818c511ecdf43e9c9c1814fe6a57 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 12 Jul 2024 19:01:17 -0300
Subject: [PATCH 271/547] SPAuthViewController: Wires Mail Auth by default

---
 Simplenote/Classes/SPAuthViewController.swift | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index 4dcb9d539..f64bf84b8 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -73,6 +73,7 @@ class SPAuthViewController: UIViewController {
             primaryActionButton.setTitle(mode.primaryActionText, for: .normal)
             primaryActionButton.setTitleColor(.white, for: .normal)
             primaryActionButton.addTarget(self, action: mode.primaryActionSelector, for: .touchUpInside)
+            primaryActionButton.accessibilityIdentifier = "Main Action"
         }
     }
 
@@ -361,19 +362,24 @@ private extension SPAuthViewController {
             return
         }
 
-        lockdownInterface()
-
-        let email = self.email
-        controller.requestLoginEmail(username: email) { error in
-            if let error {
-                self.handleError(error: error)
-            } else {
-                self.presentMagicLinkRequestedView(email: email)
-                SPTracker.trackUserRequestedLoginLink()
-            }
-
-            self.unlockInterface()
-        }
+        presentPasswordInterface()
+        
+// TODO: Restore Mail + Code Auth Flow
+//        lockdownInterface()
+//
+//        let email = self.email
+//        controller.requestLoginEmail(username: email) { error in
+//            // TODO: 429 (Rate Limited)? push PW auth instead
+//            self.presentPasswordInterface()
+//            
+//            if let error {
+//                self.handleError(error: error)
+//            } else {
+//                SPTracker.trackUserRequestedLoginLink()
+//            }
+//            
+//            self.unlockInterface()
+//        }
     }
     
     @IBAction func performLogInWithWPCOM() {

From 5e88edb219941f95714a441fa60ccc1bf17de7cd Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 12 Jul 2024 19:55:59 -0300
Subject: [PATCH 272/547] Fixes UI Tests. Take II

---
 SimplenoteUITests/EmailLogin.swift | 15 ++++++++++++---
 SimplenoteUITests/UIDs.swift       |  1 +
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/SimplenoteUITests/EmailLogin.swift b/SimplenoteUITests/EmailLogin.swift
index c3ea46142..0a5615393 100644
--- a/SimplenoteUITests/EmailLogin.swift
+++ b/SimplenoteUITests/EmailLogin.swift
@@ -8,10 +8,19 @@ class EmailLogin {
     }
 
     class func close() {
-        let backButton = app.navigationBars[UID.NavBar.logIn].buttons[UID.Button.back]
-        guard backButton.isHittable else { return }
+        /// Back from Password > Email UI
+        let backFromPasswordUI = app.navigationBars[UID.NavBar.logInWithPassword].buttons.element(boundBy: 0)
+        if backFromPasswordUI.exists {
+            backFromPasswordUI.tap()
+            _ = app.navigationBars[UID.NavBar.logIn].waitForExistence(timeout: minLoadTimeout)
+        }
+
+        /// Back from Email UI > Onboarding
+        let backButton = app.navigationBars[UID.NavBar.logIn].buttons.element(boundBy: 0)
+        if backButton.isHittable {
+            backButton.tap()
+        }
 
-        backButton.tap()
         handleSavePasswordPrompt()
     }
 
diff --git a/SimplenoteUITests/UIDs.swift b/SimplenoteUITests/UIDs.swift
index 3e6bece97..4075fc887 100644
--- a/SimplenoteUITests/UIDs.swift
+++ b/SimplenoteUITests/UIDs.swift
@@ -11,6 +11,7 @@ enum UID {
     enum NavBar {
         static let allNotes = "All Notes"
         static let logIn = "Log In"
+        static let logInWithPassword = "Log In with Password"
         static let noteEditorPreview = "Preview"
         static let noteEditorOptions = "Options"
         static let trash = "Trash"

From 05869f28ff9e819459f2e25ae4fb79f83ebd8e26 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 15 Jul 2024 09:48:50 -0300
Subject: [PATCH 273/547] Updates Release Notes

---
 RELEASE-NOTES.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index f544d30d6..ed8a89755 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -4,6 +4,7 @@
 - Fixed issue where notes selection was lost when app backgrounded
 - Fixed an issue can activate the faceid switch without a passcode
 - Magic Link Login Support
+- Login UI has been overhauled
 
 4.51
 -----

From c77d3d8cae55d1927da0f361cf73c49bb1ca4c15 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 15 Jul 2024 14:07:28 -0300
Subject: [PATCH 274/547] SPAuthHandler: New loginWithCode API

---
 Simplenote/Classes/SPAuthHandler.swift | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/Simplenote/Classes/SPAuthHandler.swift b/Simplenote/Classes/SPAuthHandler.swift
index 0562286c6..899b30b54 100644
--- a/Simplenote/Classes/SPAuthHandler.swift
+++ b/Simplenote/Classes/SPAuthHandler.swift
@@ -53,7 +53,7 @@ class SPAuthHandler {
         })
     }
 
-    /// Requests an Authentication Magic Link
+    /// Requests an Authentication Email
     ///
     func requestLoginEmail(username: String, onCompletion: @escaping (SPAuthError?) -> Void) {
         let remote = LoginRemote()
@@ -67,6 +67,20 @@ class SPAuthHandler {
         }
     }
 
+    /// Performs LogIn the User with an Authentication Code
+    ///
+    @MainActor
+    func loginWithCode(username: String, code: String) async throws {
+        let remote = LoginRemote()
+        do {
+            let confirmation = try await remote.requestLoginConfirmation(email: username, authCode: code.uppercased())
+            simperiumService.authenticate(withUsername: confirmation.username, token: confirmation.syncToken)
+            
+        } catch let error as RemoteError {
+            throw authenticationError(for: error)
+        }
+    }
+
     /// Registers a new user in the Simperium Backend.
     ///
     /// - Note: Errors are mapped into SPAuthError Instances

From bb77cf543ed68e9f71b65cf07da4142dd4edff6b Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 15 Jul 2024 14:07:59 -0300
Subject: [PATCH 275/547] SPAuthViewController: CodeInputView

---
 Simplenote/Classes/SPAuthViewController.swift | 13 +++
 Simplenote/Classes/SPAuthViewController.xib   | 81 ++++++++++++-------
 2 files changed, 64 insertions(+), 30 deletions(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index f64bf84b8..0ab20b421 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -65,6 +65,19 @@ class SPAuthViewController: UIViewController {
             passwordWarningLabel.isHidden = true
         }
     }
+    
+    /// # Password: Input Field
+    ///
+    @IBOutlet private var codeInputView: SPTextInputView! {
+        didSet {
+            codeInputView.placeholder = AuthenticationStrings.codePlaceholder
+            codeInputView.passwordRules = UITextInputPasswordRules(descriptor: SimplenoteConstants.passwordRules)
+            codeInputView.returnKeyType = .done
+            codeInputView.textColor = .simplenoteGray80Color
+            codeInputView.delegate = self
+            codeInputView.textContentType = .oneTimeCode
+        }
+    }
 
     /// # Primary Action: LogIn / SignUp
     ///
diff --git a/Simplenote/Classes/SPAuthViewController.xib b/Simplenote/Classes/SPAuthViewController.xib
index 92d384f0a..8b0aa0d55 100644
--- a/Simplenote/Classes/SPAuthViewController.xib
+++ b/Simplenote/Classes/SPAuthViewController.xib
@@ -11,19 +11,20 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="SPAuthViewController" customModule="Simplenote" customModuleProvider="target">
             <connections>
+                <outlet property="actionsSeparator" destination="Kpm-3a-0Z7" id="1in-6f-hpi"/>
+                <outlet property="actionsSeparatorLabel" destination="223-DD-dLN" id="GpO-BP-sli"/>
+                <outlet property="codeInputView" destination="OP1-hm-GRS" id="2HQ-Db-x3W"/>
                 <outlet property="emailInputView" destination="hW6-K1-OyV" id="TyC-Uh-Kaf"/>
                 <outlet property="emailWarningLabel" destination="n7T-Gj-plH" id="STx-wz-jKg"/>
                 <outlet property="passwordInputView" destination="pdF-nK-gXE" id="18P-SU-c90"/>
                 <outlet property="passwordWarningLabel" destination="UyC-If-pXj" id="D2M-PR-Tph"/>
                 <outlet property="primaryActionButton" destination="q3p-Ji-dOm" id="l1t-x0-zva"/>
                 <outlet property="primaryActionSpinner" destination="o3M-2A-urw" id="pe9-Bb-Kf7"/>
+                <outlet property="quaternaryActionButton" destination="ILr-Ij-XBq" id="jBw-3a-pKE"/>
                 <outlet property="secondaryActionButton" destination="PfS-vU-7i3" id="zj3-Ly-5X9"/>
                 <outlet property="stackView" destination="CJS-5O-pxK" id="Grg-ZD-DYy"/>
                 <outlet property="stackViewTopConstraint" destination="Cyh-nE-ql7" id="WHM-m6-Cht"/>
                 <outlet property="tertiaryActionButton" destination="Uy8-va-3uF" id="NfE-QO-aLc"/>
-                <outlet property="tertiaryActionContainerView" destination="nxG-8M-wxx" id="FtU-Ac-O5T"/>
-                <outlet property="tertiaryTopSeparator" destination="Kpm-3a-0Z7" id="vyp-IY-5NB"/>
-                <outlet property="tertiaryTopSeparatorLabel" destination="223-DD-dLN" id="4cS-eP-Gg8"/>
                 <outlet property="view" destination="iN0-l3-epB" id="bxN-Zo-xBW"/>
             </connections>
         </placeholder>
@@ -33,9 +34,9 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="CJS-5O-pxK">
-                    <rect key="frame" x="332" y="60" width="360" height="356"/>
+                    <rect key="frame" x="332" y="60" width="360" height="460"/>
                     <subviews>
-                        <view contentMode="center" translatesAutoresizingMaskIntoConstraints="NO" id="hW6-K1-OyV" customClass="SPTextInputView" customModule="Simplenote" customModuleProvider="target">
+                        <view contentMode="center" translatesAutoresizingMaskIntoConstraints="NO" id="hW6-K1-OyV" userLabel="Email Input View" customClass="SPTextInputView" customModule="Simplenote" customModuleProvider="target">
                             <rect key="frame" x="0.0" y="0.0" width="360" height="44"/>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <constraints>
@@ -51,7 +52,7 @@
                             <color key="textColor" systemColor="systemPinkColor"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <view contentMode="center" translatesAutoresizingMaskIntoConstraints="NO" id="pdF-nK-gXE" customClass="SPTextInputView" customModule="Simplenote" customModuleProvider="target">
+                        <view contentMode="center" translatesAutoresizingMaskIntoConstraints="NO" id="pdF-nK-gXE" userLabel="Password Input View" customClass="SPTextInputView" customModule="Simplenote" customModuleProvider="target">
                             <rect key="frame" x="0.0" y="78" width="360" height="44"/>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <constraints>
@@ -67,8 +68,18 @@
                             <color key="textColor" systemColor="systemRedColor"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CGr-O3-MBQ" userLabel="Primary Action View">
+                        <view contentMode="center" translatesAutoresizingMaskIntoConstraints="NO" id="OP1-hm-GRS" userLabel="Code Input View" customClass="SPTextInputView" customModule="Simplenote" customModuleProvider="target">
                             <rect key="frame" x="0.0" y="156" width="360" height="44"/>
+                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="44" id="im0-Ei-pV0"/>
+                            </constraints>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="string" keyPath="placeholder" value="#Password#"/>
+                            </userDefinedRuntimeAttributes>
+                        </view>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CGr-O3-MBQ" userLabel="Primary Action View">
+                            <rect key="frame" x="0.0" y="208" width="360" height="44"/>
                             <subviews>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="q3p-Ji-dOm" customClass="SPSquaredButton" customModule="Simplenote" customModuleProvider="target">
                                     <rect key="frame" x="0.0" y="0.0" width="360" height="44"/>
@@ -91,7 +102,7 @@
                             </constraints>
                         </view>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PfS-vU-7i3">
-                            <rect key="frame" x="0.0" y="208" width="360" height="44"/>
+                            <rect key="frame" x="0.0" y="260" width="360" height="44"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="44" id="u8s-d9-Em4"/>
                             </constraints>
@@ -100,8 +111,8 @@
                                 <color key="titleColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </state>
                         </button>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Kpm-3a-0Z7" userLabel="Tertiary Separator View">
-                            <rect key="frame" x="0.0" y="260" width="360" height="44"/>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Kpm-3a-0Z7" userLabel="Actions Separator View">
+                            <rect key="frame" x="0.0" y="312" width="360" height="44"/>
                             <subviews>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1Ls-SS-l0Q" userLabel="Leading View">
                                     <rect key="frame" x="0.0" y="21.5" width="167" height="1"/>
@@ -137,38 +148,42 @@
                                 <constraint firstItem="zDI-3J-P7n" firstAttribute="leading" secondItem="223-DD-dLN" secondAttribute="trailing" constant="5" id="vE8-Zf-q7V"/>
                             </constraints>
                         </view>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nxG-8M-wxx" userLabel="Tertiary Action View">
-                            <rect key="frame" x="0.0" y="312" width="360" height="44"/>
-                            <subviews>
-                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Uy8-va-3uF" userLabel="#Tertiary#" customClass="SPSquaredButton" customModule="Simplenote" customModuleProvider="target">
-                                    <rect key="frame" x="0.0" y="0.0" width="360" height="44"/>
-                                    <fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
-                                    <state key="normal" title="#Tertiary#"/>
-                                </button>
-                            </subviews>
-                            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Uy8-va-3uF" userLabel="#Tertiary#" customClass="SPSquaredButton" customModule="Simplenote" customModuleProvider="target">
+                            <rect key="frame" x="0.0" y="364" width="360" height="44"/>
                             <constraints>
-                                <constraint firstAttribute="trailing" secondItem="Uy8-va-3uF" secondAttribute="trailing" id="4sz-wJ-Fm5"/>
-                                <constraint firstAttribute="bottom" secondItem="Uy8-va-3uF" secondAttribute="bottom" id="7XH-hU-NF8"/>
-                                <constraint firstItem="Uy8-va-3uF" firstAttribute="leading" secondItem="nxG-8M-wxx" secondAttribute="leading" id="F1T-yV-yFY"/>
-                                <constraint firstAttribute="height" constant="44" id="jJo-79-bms"/>
-                                <constraint firstItem="Uy8-va-3uF" firstAttribute="top" secondItem="nxG-8M-wxx" secondAttribute="top" id="rt4-P1-Ygd"/>
+                                <constraint firstAttribute="height" constant="44" id="lt7-Yn-pzG"/>
                             </constraints>
-                        </view>
+                            <fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
+                            <state key="normal" title="#Tertiary#">
+                                <color key="titleColor" systemColor="systemIndigoColor"/>
+                            </state>
+                        </button>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ILr-Ij-XBq" userLabel="#Quaternary#" customClass="SPSquaredButton" customModule="Simplenote" customModuleProvider="target">
+                            <rect key="frame" x="0.0" y="416" width="360" height="44"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="44" id="cE4-3n-khh"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
+                            <state key="normal" title="#Quaternary#"/>
+                        </button>
                     </subviews>
                     <constraints>
                         <constraint firstAttribute="trailing" secondItem="PfS-vU-7i3" secondAttribute="trailing" id="0QL-Iw-KLz"/>
+                        <constraint firstItem="OP1-hm-GRS" firstAttribute="leading" secondItem="CJS-5O-pxK" secondAttribute="leading" id="22g-Kt-93q"/>
                         <constraint firstItem="PfS-vU-7i3" firstAttribute="leading" secondItem="CJS-5O-pxK" secondAttribute="leading" id="314-fc-3eX"/>
                         <constraint firstAttribute="trailing" secondItem="pdF-nK-gXE" secondAttribute="trailing" id="51g-0D-Oyv"/>
                         <constraint firstAttribute="trailing" secondItem="Kpm-3a-0Z7" secondAttribute="trailing" id="7SY-4J-Rv5"/>
                         <constraint firstItem="CGr-O3-MBQ" firstAttribute="leading" secondItem="CJS-5O-pxK" secondAttribute="leading" id="BIX-Fy-gqY"/>
+                        <constraint firstAttribute="trailing" secondItem="OP1-hm-GRS" secondAttribute="trailing" id="R55-ao-psA"/>
                         <constraint firstAttribute="trailing" secondItem="hW6-K1-OyV" secondAttribute="trailing" id="RSC-Vk-xbB"/>
                         <constraint firstItem="Kpm-3a-0Z7" firstAttribute="leading" secondItem="CJS-5O-pxK" secondAttribute="leading" id="S94-pS-Aza"/>
                         <constraint firstItem="hW6-K1-OyV" firstAttribute="leading" secondItem="CJS-5O-pxK" secondAttribute="leading" id="UoC-hu-yxe"/>
+                        <constraint firstItem="ILr-Ij-XBq" firstAttribute="leading" secondItem="CJS-5O-pxK" secondAttribute="leading" id="Wey-0k-g9U"/>
+                        <constraint firstAttribute="trailing" secondItem="ILr-Ij-XBq" secondAttribute="trailing" id="dxd-sM-fG7"/>
                         <constraint firstAttribute="width" relation="lessThanOrEqual" constant="360" id="nLp-JP-Ott"/>
-                        <constraint firstItem="nxG-8M-wxx" firstAttribute="leading" secondItem="CJS-5O-pxK" secondAttribute="leading" id="sEH-qo-ZdT"/>
+                        <constraint firstItem="Uy8-va-3uF" firstAttribute="leading" secondItem="CJS-5O-pxK" secondAttribute="leading" id="s8W-Vc-jxA"/>
+                        <constraint firstAttribute="trailing" secondItem="Uy8-va-3uF" secondAttribute="trailing" id="sI0-Z8-I2B"/>
                         <constraint firstAttribute="trailing" secondItem="CGr-O3-MBQ" secondAttribute="trailing" id="vUF-qZ-Vmm"/>
-                        <constraint firstAttribute="trailing" secondItem="nxG-8M-wxx" secondAttribute="trailing" id="w8N-O1-2au"/>
                         <constraint firstItem="pdF-nK-gXE" firstAttribute="leading" secondItem="CJS-5O-pxK" secondAttribute="leading" id="xzh-aD-Ag5"/>
                     </constraints>
                 </stackView>
@@ -185,6 +200,9 @@
         </view>
     </objects>
     <designables>
+        <designable name="ILr-Ij-XBq">
+            <size key="intrinsicContentSize" width="112" height="33"/>
+        </designable>
         <designable name="Uy8-va-3uF">
             <size key="intrinsicContentSize" width="83" height="33"/>
         </designable>
@@ -202,11 +220,14 @@
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
+        <systemColor name="systemIndigoColor">
+            <color red="0.34509803919999998" green="0.33725490200000002" blue="0.83921568629999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
         <systemColor name="systemPinkColor">
-            <color red="1" green="0.17647058823529413" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="1" green="0.1764705882" blue="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
         <systemColor name="systemRedColor">
-            <color red="1" green="0.23137254901960785" blue="0.18823529411764706" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="1" green="0.23137254900000001" blue="0.18823529410000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
     </resources>
 </document>

From c6b06aff1efb62b7610d661cda35d357ab58cf8a Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 15 Jul 2024 14:08:43 -0300
Subject: [PATCH 276/547] Updates AuthenticationMode Descriptors

---
 Simplenote/Classes/SPAuthViewController.swift | 141 ++++++++++++------
 1 file changed, 95 insertions(+), 46 deletions(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index 0ab20b421..7b53c61c9 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -752,26 +752,41 @@ extension SPAuthViewController: SPTextInputViewDelegate {
 struct AuthenticationState {
     var username = String()
     var password = String()
+    var code = String()
 }
 
+struct AuthenticationElements: OptionSet {
+    let rawValue: UInt
+    
+    static let username         = AuthenticationElements(rawValue: 1 << 0)
+    static let password         = AuthenticationElements(rawValue: 1 << 1)
+    static let code             = AuthenticationElements(rawValue: 1 << 2)
+    static let actionSeparator  = AuthenticationElements(rawValue: 1 << 7)
+}
+
+enum AuthenticationActionName {
+    case primary
+    case secondary
+    case tertiary
+    case quaternary
+}
+
+struct AuthenticationAction {
+    let name: AuthenticationActionName
+    let selector: Selector
+    let text: String?
+    let attributedText: NSAttributedString?
+}
+
+
 
 // MARK: - AuthenticationMode: Signup / Login
 //
-struct AuthenticationMode: Equatable {
+struct AuthenticationMode {
     let title: String
     let validationStyle: AuthenticationValidator.Style
-    let isUsernameHidden: Bool
-    let isPasswordHidden: Bool
-    
-    let primaryActionSelector: Selector
-    let primaryActionText: String
-
-    let secondaryActionSelector: Selector?
-    let secondaryActionText: String?
-    let secondaryActionAttributedText: NSAttributedString?
-    
-    let tertiaryActionSelector: Selector?
-    let tertiaryActionText: String?
+    let visibleElements: AuthenticationElements
+    let actions: [AuthenticationAction]
 }
 
 // MARK: - Default Operation Modes
@@ -783,31 +798,53 @@ extension AuthenticationMode {
     static var loginWithPassword: AuthenticationMode {
         return .init(title: PasswordStrings.title,
                      validationStyle: .legacy,
-                     isUsernameHidden: true,
-                     isPasswordHidden: false,
-                     primaryActionSelector: #selector(SPAuthViewController.performLogInWithPassword),
-                     primaryActionText: PasswordStrings.login,
-                     secondaryActionSelector: #selector(SPAuthViewController.presentPasswordReset),
-                     secondaryActionText: PasswordStrings.forgotPassword,
-                     secondaryActionAttributedText: nil,
-                     tertiaryActionSelector: nil,
-                     tertiaryActionText: nil)
+                     visibleElements: [.password],
+                     actions: [
+                        AuthenticationAction(name: .primary,
+                                             selector: #selector(SPAuthViewController.performLogInWithPassword),
+                                             text: PasswordStrings.login,
+                                             attributedText: nil),
+                        AuthenticationAction(name: .secondary,
+                                             selector: #selector(SPAuthViewController.presentPasswordReset),
+                                             text: PasswordStrings.forgotPassword,
+                                             attributedText: nil)
+                     ])
+    }
+
+    /// Login Operation Mode: Request Login Code
+    ///
+    static var requestLoginCode: AuthenticationMode {
+        return .init(title: RequestCodeStrings.title,
+                     validationStyle: .legacy,
+                     visibleElements: [.username, .actionSeparator],
+                     actions: [
+                        AuthenticationAction(name: .primary,
+                                            selector: #selector(SPAuthViewController.requestLogInCode),
+                                            text: RequestCodeStrings.loginWithEmail,
+                                            attributedText: nil),
+                        AuthenticationAction(name: .tertiary,
+                                            selector: #selector(SPAuthViewController.performLogInWithWPCOM),
+                                            text: RequestCodeStrings.loginWithWPCOM,
+                                            attributedText: nil),
+                     ])
     }
-
-    /// Login Operation Mode: Authentication is handled via Magic Links!
+    
+    /// Login Operation Mode: Submit Code + Authenticate the user
     ///
-    static var loginWithMagicLink: AuthenticationMode {
-        return .init(title: MagicLinkStrings.title,
+    static var loginWithCode: AuthenticationMode {
+        return .init(title: LoginWithCodeStrings.title,
                      validationStyle: .legacy,
-                     isUsernameHidden: false,
-                     isPasswordHidden: true,
-                     primaryActionSelector: #selector(SPAuthViewController.performLogInWithMagicLink),
-                     primaryActionText: MagicLinkStrings.loginWithEmail,
-                     secondaryActionSelector: nil,
-                     secondaryActionText: nil,
-                     secondaryActionAttributedText: nil,
-                     tertiaryActionSelector: #selector(SPAuthViewController.performLogInWithWPCOM),
-                     tertiaryActionText: MagicLinkStrings.loginWithWPCOM)
+                     visibleElements: [.code, .actionSeparator],
+                     actions: [
+                        AuthenticationAction(name: .primary,
+                                            selector: #selector(SPAuthViewController.performLogInWithCode),
+                                            text: LoginWithCodeStrings.login,
+                                            attributedText: nil),
+                        AuthenticationAction(name: .quaternary,
+                                            selector: #selector(SPAuthViewController.presentPasswordInterface),
+                                            text: LoginWithCodeStrings.enterPassword,
+                                            attributedText: nil),
+                     ])
     }
 
     /// Signup Operation Mode: Contains all of the strings + delegate wirings, so that the AuthUI handles user account creation scenarios.
@@ -815,15 +852,17 @@ extension AuthenticationMode {
     static var signup: AuthenticationMode {
         return .init(title: SignupStrings.title,
                      validationStyle: .strong,
-                     isUsernameHidden: false,
-                     isPasswordHidden: true,
-                     primaryActionSelector: #selector(SPAuthViewController.performSignUp),
-                     primaryActionText: SignupStrings.signup,
-                     secondaryActionSelector: #selector(SPAuthViewController.presentTermsOfService),
-                     secondaryActionText: nil,
-                     secondaryActionAttributedText: SignupStrings.termsOfService,
-                     tertiaryActionSelector: nil,
-                     tertiaryActionText: nil)
+                     visibleElements: [.username],
+                     actions: [
+                        AuthenticationAction(name: .primary,
+                                            selector: #selector(SPAuthViewController.performSignUp),
+                                            text: SignupStrings.signup,
+                                            attributedText: nil),
+                        AuthenticationAction(name: .secondary,
+                                            selector: #selector(SPAuthViewController.presentTermsOfService),
+                                            text: nil,
+                                            attributedText: SignupStrings.termsOfService)
+                     ])
     }
 }
 
@@ -834,6 +873,7 @@ private enum AuthenticationStrings {
     static let separatorText                = NSLocalizedString("Or", comment: "Or, used as a separator between Actions")
     static let emailPlaceholder             = NSLocalizedString("Email", comment: "Email TextField Placeholder")
     static let passwordPlaceholder          = NSLocalizedString("Password", comment: "Password TextField Placeholder")
+    static let codePlaceholder              = NSLocalizedString("Code", comment: "Code TextField Placeholder")
     static let acceptActionText             = NSLocalizedString("Accept", comment: "Accept Action")
     static let cancelActionText             = NSLocalizedString("Cancel", comment: "Cancel Action")
     static let loginActionText              = NSLocalizedString("Log In", comment: "Log In Action")
@@ -872,15 +912,24 @@ private enum PasswordStrings {
 }
 
 
-// MARK: - Mode: .loginWithMagicLink
+// MARK: - Mode: .requestLoginCode
 //
-private enum MagicLinkStrings {
+private enum RequestCodeStrings {
     static let title            = NSLocalizedString("Log In", comment: "LogIn Interface Title")
     static let loginWithEmail   = NSLocalizedString("Log in with email", comment: "Sends the User an email with an Authentication Code")
     static let loginWithWPCOM   = NSLocalizedString("Log in with WordPress.com", comment: "Password fallback Action")
 }
 
 
+// MARK: - Mode: .code
+//
+private enum LoginWithCodeStrings {
+    static let title            = NSLocalizedString("Enter Code", comment: "LogIn Interface Title")
+    static let login            = NSLocalizedString("Log In", comment: "LogIn Interface Title")
+    static let enterPassword    = NSLocalizedString("Enter password", comment: "Enter Password fallback Action")
+}
+
+
 // MARK: - Mode: .signup
 //
 private enum SignupStrings {

From c14736c9834c9e77ff82cbc2d1c609211bc6f537 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 15 Jul 2024 14:09:13 -0300
Subject: [PATCH 277/547] SPAuthViewController: Updates UI Refresh Logic

---
 Simplenote/Classes/SPAuthViewController.swift | 52 +++++++++++++++----
 1 file changed, 43 insertions(+), 9 deletions(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index 7b53c61c9..a0bb76169 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -244,8 +244,9 @@ class SPAuthViewController: UIViewController {
         setupNavigationController()
         startListeningToNotifications()
 
-        refreshActions()
-        refreshInputViews()
+        refreshVisibleElements()
+        refreshActionViews()
+        reloadInputViewsFromState()
 
         // hiding text from back button
         navigationItem.backBarButtonItem = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
@@ -300,17 +301,50 @@ private extension SPAuthViewController {
         navigationController?.setNavigationBarHidden(false, animated: true)
     }
 
-    func refreshActions() {
-        secondaryActionButton.isHidden = mode.secondaryActionSelector == nil
-        tertiaryActionButton.isHidden = mode.tertiaryActionSelector == nil
+    func refreshVisibleElements() {
+        let visibleElements = mode.visibleElements
+        
+        emailInputView.isHidden         = !visibleElements.contains(.username)
+        passwordInputView.isHidden      = !visibleElements.contains(.password)
+        codeInputView.isHidden          = !visibleElements.contains(.code)
+        actionsSeparator.isHidden       = !visibleElements.contains(.actionSeparator)
     }
+    
+    func refreshActionViews() {
+        let viewMap: [AuthenticationActionName: UIButton] = [
+            .primary: primaryActionButton,
+            .secondary: secondaryActionButton,
+            .tertiary: tertiaryActionButton,
+            .quaternary: quaternaryActionButton
+        ]
+        
+        for actionView in allActionViews {
+            actionView.isHidden = true
+        }
+
+        for descriptor in mode.actions {
+            guard let actionView = viewMap[descriptor.name] else {
+                assertionFailure()
+                continue
+            }
+
+            if let title = descriptor.text {
+                actionView.setTitle(title, for: .normal)
+            }
+            
+            if let attributedTitle = descriptor.attributedText {
+                actionView.setAttributedTitle(attributedTitle, for: .normal)
+            }
 
-    func refreshInputViews() {
+            actionView.addTarget(self, action: descriptor.selector, for: .touchUpInside)
+            actionView.isHidden = false
+        }
+    }
+    
+    func reloadInputViewsFromState() {
         emailInputView.text = state.username
         passwordInputView.text = state.password
-        
-        emailInputView.isHidden = mode.isUsernameHidden
-        passwordInputView.isHidden = mode.isPasswordHidden
+        codeInputView.text = state.code
     }
 
     func ensureStylesMatchValidationState() {

From d6965ab8f6c7452602f2ba8f28f5baa6c740821c Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 15 Jul 2024 14:09:26 -0300
Subject: [PATCH 278/547] SPAuthViewController: Fixes Main Action Handler

---
 Simplenote/Classes/SPAuthViewController.swift | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index a0bb76169..4a9513c15 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -387,8 +387,13 @@ private extension SPAuthViewController {
         guard isInputValid else {
             return
         }
+        
+        guard let primaryActionDescriptor = mode.actions.first(where: { $0.name == .primary}) else {
+            assertionFailure()
+            return
+        }
 
-        perform(mode.primaryActionSelector)
+        perform(primaryActionDescriptor.selector)
     }
     
     @IBAction func performLogInWithPassword() {

From 436af4afa1484e50bab0468ece6b9efb6e00ce43 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 15 Jul 2024 14:09:41 -0300
Subject: [PATCH 279/547] SPAuthViewController: Wires requestLoginCode Mode

---
 Simplenote/Classes/SPAuthViewController.swift       | 2 +-
 Simplenote/Classes/SPOnboardingViewController.swift | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index 4a9513c15..14e50a11f 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -230,7 +230,7 @@ class SPAuthViewController: UIViewController {
 
     /// Designated Initializer
     ///
-    init(controller: SPAuthHandler, mode: AuthenticationMode = .loginWithMagicLink, state: AuthenticationState = .init()) {
+    init(controller: SPAuthHandler, mode: AuthenticationMode = .requestLoginCode, state: AuthenticationState = .init()) {
         self.controller = controller
         self.mode = mode
         self.state = state
diff --git a/Simplenote/Classes/SPOnboardingViewController.swift b/Simplenote/Classes/SPOnboardingViewController.swift
index dc5ec7f87..f8d9094e4 100644
--- a/Simplenote/Classes/SPOnboardingViewController.swift
+++ b/Simplenote/Classes/SPOnboardingViewController.swift
@@ -149,7 +149,7 @@ private extension SPOnboardingViewController {
 
     @IBAction
     func loginWasPressed() {
-        presentAuthenticationInterface(mode: .loginWithMagicLink)
+        presentAuthenticationInterface(mode: .requestLoginCode)
     }
 
     @IBAction
@@ -214,7 +214,7 @@ private extension SPOnboardingViewController {
     private func presentMagicLinkInvalidView() {
         var rootView = MagicLinkInvalidView()
         rootView.onPressRequestNewLink = { [weak self] in
-            self?.presentAuthenticationInterfaceIfNeeded(mode: .loginWithMagicLink)
+            self?.presentAuthenticationInterfaceIfNeeded(mode: .requestLoginCode)
         }
 
         let hostingController = UIHostingController(rootView: rootView)

From b085df8ee51b7b2576f6306108f64bedec4dacbb Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 15 Jul 2024 14:10:00 -0300
Subject: [PATCH 280/547] SPAuthViewController: Drops code duplication

---
 Simplenote/Classes/SPAuthViewController.swift | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index 14e50a11f..efebec3d4 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -83,9 +83,7 @@ class SPAuthViewController: UIViewController {
     ///
     @IBOutlet private var primaryActionButton: SPSquaredButton! {
         didSet {
-            primaryActionButton.setTitle(mode.primaryActionText, for: .normal)
             primaryActionButton.setTitleColor(.white, for: .normal)
-            primaryActionButton.addTarget(self, action: mode.primaryActionSelector, for: .touchUpInside)
             primaryActionButton.accessibilityIdentifier = "Main Action"
         }
     }
@@ -103,21 +101,9 @@ class SPAuthViewController: UIViewController {
     ///
     @IBOutlet private var secondaryActionButton: UIButton! {
         didSet {
-            if let title = mode.secondaryActionText {
-                secondaryActionButton.setTitle(title, for: .normal)
-                secondaryActionButton.setTitleColor(.simplenoteBlue60Color, for: .normal)
-            }
-
-            if let attributedTitle = mode.secondaryActionAttributedText {
-                secondaryActionButton.setAttributedTitle(attributedTitle, for: .normal)
-            }
-
+            secondaryActionButton.setTitleColor(.simplenoteBlue60Color, for: .normal)
             secondaryActionButton.titleLabel?.textAlignment = .center
             secondaryActionButton.titleLabel?.numberOfLines = 0
-            
-            if let action = mode.secondaryActionSelector {
-                secondaryActionButton.addTarget(self, action: action, for: .touchUpInside)
-            }
         }
     }
 

From 27e17c5aaf81d5a0d3d9150f49eaa32b4b33a6dc Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 15 Jul 2024 14:10:24 -0300
Subject: [PATCH 281/547] SPAuthViewController: Updates validation

---
 Simplenote/Classes/SPAuthViewController.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index efebec3d4..0aea3ee19 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -672,7 +672,7 @@ private extension SPAuthViewController {
 private extension SPAuthViewController {
 
     func performUsernameValidation() -> AuthenticationValidator.Result {
-        if mode.isUsernameHidden {
+        guard mode.visibleElements.contains(.username) else {
             return .success
         }
 
@@ -683,7 +683,7 @@ private extension SPAuthViewController {
     /// That's where the `validationStyle` comes in.
     ///
     func performPasswordValidation() -> AuthenticationValidator.Result {
-        if mode.isPasswordHidden {
+        guard mode.visibleElements.contains(.password) else {
             return .success
         }
 

From fdd12ab31fe3c8177fff6b1717d18cfd28a0b4aa Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 15 Jul 2024 14:11:07 -0300
Subject: [PATCH 282/547] SPAuthViewController: New calculated properties

---
 Simplenote/Classes/SPAuthViewController.swift | 45 +++++++++++--------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index 0aea3ee19..f501096fc 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -122,44 +122,51 @@ class SPAuthViewController: UIViewController {
         return button
     }()
 
-    /// # Tertiary Separator: COntainer
+    /// # Actions Separator: Container
     ///
-    @IBOutlet private var tertiaryTopSeparator: UIView! {
+    @IBOutlet private var actionsSeparator: UIView!
+
+    /// # Tertiary Separator: Label (Or)
+    ///
+    @IBOutlet private var actionsSeparatorLabel: UILabel! {
         didSet {
-            tertiaryTopSeparator.isHidden = mode.tertiaryActionSelector == nil
+            actionsSeparatorLabel.text = AuthenticationStrings.separatorText
         }
     }
 
-    /// # Tertiary Separator: Label (Or)
+    /// # Tertiary Action: WPCOM SSO
     ///
-    @IBOutlet private var tertiaryTopSeparatorLabel: UILabel! {
+    @IBOutlet private var tertiaryActionButton: SPSquaredButton! {
         didSet {
-            tertiaryTopSeparatorLabel.text = AuthenticationStrings.separatorText
+            tertiaryActionButton.setTitleColor(.white, for: .normal)
+            tertiaryActionButton.backgroundColor = .simplenoteWPBlue50Color
         }
     }
     
-    /// # Tertiary Action: Container View
+    /// # Tertiary Action:
     ///
-    @IBOutlet private var tertiaryActionContainerView: UIView! {
+    @IBOutlet private var quaternaryActionButton: SPSquaredButton! {
         didSet {
-            tertiaryActionContainerView.isHidden = mode.tertiaryActionSelector == nil
+            quaternaryActionButton.setTitleColor(.black, for: .normal)
+            quaternaryActionButton.backgroundColor = .clear
+            quaternaryActionButton.layer.borderWidth = 1
+            quaternaryActionButton.layer.borderColor = UIColor.black.cgColor
         }
     }
 
     /// # Tertiary Action: WPCOM SSO
     ///
-    @IBOutlet private var tertiaryActionButton: SPSquaredButton! {
-        didSet {
-            guard let title = mode.tertiaryActionText, let action = mode.tertiaryActionSelector else {
-                return
-            }
-            
-            tertiaryActionButton.setTitle(title, for: .normal)
-            tertiaryActionButton.setTitleColor(.white, for: .normal)
-            tertiaryActionButton.backgroundColor = .simplenoteWPBlue50Color
-            tertiaryActionButton.addTarget(self, action: action, for: .touchUpInside)
+    private var visibleInputViews: [SPTextInputView] {
+        [emailInputView, passwordInputView, codeInputView].filter { inputView in
+            inputView.isHidden == false
         }
     }
+    
+    /// # All of the Action Views
+    ///
+    private var allActionViews: [UIButton] {
+        [primaryActionButton, secondaryActionButton, tertiaryActionButton, quaternaryActionButton]
+    }
 
     /// # Simperium's Authenticator Instance
     ///

From b5b9aa4651c3ee56d67e2b7b39bc15680a457a86 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 15 Jul 2024 14:11:25 -0300
Subject: [PATCH 283/547] SPAuthViewController: Relocates
 presentPasswordInterface API

---
 Simplenote/Classes/SPAuthViewController.swift | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index f501096fc..1401fb67d 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -466,6 +466,11 @@ private extension SPAuthViewController {
         safariViewController.modalPresentationStyle = .overFullScreen
         present(safariViewController, animated: true, completion: nil)
     }
+    
+    @IBAction func presentPasswordInterface() {
+        let viewController = SPAuthViewController(controller: controller, mode: .loginWithPassword, state: state)
+        navigationController?.pushViewController(viewController, animated: true)
+    }
 }
 
 
@@ -478,9 +483,9 @@ private extension SPAuthViewController {
         viewController.title = title
         navigationController?.pushViewController(viewController, animated: true)
     }
-    
-    func presentPasswordInterface() {
-        let viewController = SPAuthViewController(controller: controller, mode: .loginWithPassword, state: state)
+        
+    func presentCodeInterface() {
+        let viewController = SPAuthViewController(controller: controller, mode: .loginWithCode, state: state)
         navigationController?.pushViewController(viewController, animated: true)
     }
 }
@@ -741,6 +746,8 @@ extension SPAuthViewController: SPTextInputViewDelegate {
             state.username = textInput.text ?? ""
         case passwordInputView:
             state.password = textInput.text ?? ""
+        case codeInputView:
+            state.code = textInput.text ?? ""
         default:
             break
         }
@@ -751,10 +758,10 @@ extension SPAuthViewController: SPTextInputViewDelegate {
         case emailInputView:
             switch performUsernameValidation() {
             case .success:
-                if mode.isPasswordHidden {
-                    performPrimaryActionIfPossible()
-                } else {
+                if mode.visibleElements.contains(.password) {
                     passwordInputView.becomeFirstResponder()
+                } else {
+                    performPrimaryActionIfPossible()
                 }
 
             case let error:

From 6972b66f53b3a85a38f6cc2437039b040959df05 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 15 Jul 2024 14:11:51 -0300
Subject: [PATCH 284/547] SPAuthViewController: Implements loginWithCode

---
 Simplenote/Classes/SPAuthViewController.swift | 54 ++++++++++++-------
 1 file changed, 36 insertions(+), 18 deletions(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index 1401fb67d..c6dc650f5 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -402,29 +402,47 @@ private extension SPAuthViewController {
         performSimperiumAuthentication()
     }
     
-    @IBAction func performLogInWithMagicLink() {
+    @IBAction func requestLogInCode() {
         guard ensureWarningsAreOnScreenWhenNeeded() else {
             return
         }
+        
+        lockdownInterface()
+
+        controller.requestLoginEmail(username: email) { error in
+// TODO: 429 (Rate Limited)? push PW auth instead
 
-        presentPasswordInterface()
+            if let error {
+                self.handleError(error: error)
+            } else {
+                self.presentCodeInterface()
+                SPTracker.trackUserRequestedLoginLink()
+            }
+
+            self.unlockInterface()
+        }
+    }
+    
+    @IBAction func performLogInWithCode() {
+        Task { @MainActor in
+            await performLogInWithCodeInTask()
+        }
+    }
+    
+    @MainActor
+    private func performLogInWithCodeInTask() async {
+        lockdownInterface()
         
-// TODO: Restore Mail + Code Auth Flow
-//        lockdownInterface()
-//
-//        let email = self.email
-//        controller.requestLoginEmail(username: email) { error in
-//            // TODO: 429 (Rate Limited)? push PW auth instead
-//            self.presentPasswordInterface()
-//            
-//            if let error {
-//                self.handleError(error: error)
-//            } else {
-//                SPTracker.trackUserRequestedLoginLink()
-//            }
-//            
-//            self.unlockInterface()
-//        }
+        do {
+            try await controller.loginWithCode(username: state.username, code: state.code)
+            SPTracker.trackUserConfirmedLoginLink()
+        } catch let error as SPAuthError {
+            self.handleError(error: error)
+        } catch {
+// TODO: Fixme
+        }
+        
+        unlockInterface()
     }
     
     @IBAction func performLogInWithWPCOM() {

From 0b4ef0c8e2f31abbf86475ed03158ee0cbb54685 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 15 Jul 2024 14:12:01 -0300
Subject: [PATCH 285/547] SPAuthViewController: Fixes firstResponder Mechanism

---
 Simplenote/Classes/SPAuthViewController.swift | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index c6dc650f5..1abc091b2 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -258,8 +258,7 @@ class SPAuthViewController: UIViewController {
         // repositioning in the Text Field. Seriously.
         // Ref. https://github.com/Automattic/simplenote-ios/issues/453
         //
-        let initialFirstResponder = mode.isPasswordHidden ? emailInputView : passwordInputView
-        initialFirstResponder?.becomeFirstResponder()
+        visibleInputViews.first?.becomeFirstResponder()
     }
 }
 

From d2c187e57b7611da7d2911ed9a3f4bd5202d2895 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 15 Jul 2024 14:12:10 -0300
Subject: [PATCH 286/547] SPAuthViewController: Updates Comment

---
 Simplenote/Classes/SPAuthViewController.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index 1abc091b2..a11490ff3 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -154,7 +154,7 @@ class SPAuthViewController: UIViewController {
         }
     }
 
-    /// # Tertiary Action: WPCOM SSO
+    /// # All of the Visible InputView(s)
     ///
     private var visibleInputViews: [SPTextInputView] {
         [emailInputView, passwordInputView, codeInputView].filter { inputView in

From ca0c764b937b20412c5b00267ce28d1d16056fed Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 15 Jul 2024 14:54:31 -0300
Subject: [PATCH 287/547] SPAuthViewController: Implements Code Validation

---
 Simplenote/AuthenticationValidator.swift      | 15 +++++
 Simplenote/Classes/SPAuthViewController.swift | 56 ++++++++++++++++++-
 Simplenote/Classes/SPAuthViewController.xib   | 22 ++++++--
 3 files changed, 84 insertions(+), 9 deletions(-)

diff --git a/Simplenote/AuthenticationValidator.swift b/Simplenote/AuthenticationValidator.swift
index b922fd899..c9466bc93 100644
--- a/Simplenote/AuthenticationValidator.swift
+++ b/Simplenote/AuthenticationValidator.swift
@@ -11,6 +11,10 @@ struct AuthenticationValidator {
     /// Minimum Password Length: SignUp
     ///
     private let strongPasswordLength = UInt(8)
+    
+    /// Login Code Length
+    ///
+    private let loginCodeLength = UInt(6)
 
     /// Returns the Validation Result for a given Username
     ///
@@ -48,6 +52,14 @@ struct AuthenticationValidator {
     private func minimumPasswordLength(for style: Style) -> UInt {
         return (style == .legacy) ? legacyPasswordLength : strongPasswordLength
     }
+    
+    func performCodeValidation(code: String) -> Result {
+        if code.count >= loginCodeLength {
+            return .success
+        }
+        
+        return .codeTooShort
+    }
 }
 
 // MARK: - Nested Types
@@ -65,6 +77,7 @@ extension AuthenticationValidator {
         case passwordMatchesUsername
         case passwordTooShort(length: UInt)
         case passwordContainsInvalidCharacter
+        case codeTooShort
     }
 }
 
@@ -91,6 +104,8 @@ extension AuthenticationValidator.Result: CustomStringConvertible {
         case .passwordContainsInvalidCharacter:
             return NSLocalizedString("Password must not contain tabs nor newlines", comment: "Message displayed when a password contains a disallowed character")
 
+        case .codeTooShort:
+            return NSLocalizedString("Login Code is too short", comment: "Message displayed when a login code is too short")
         }
     }
 }
diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index a11490ff3..e7f78fd91 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -66,7 +66,7 @@ class SPAuthViewController: UIViewController {
         }
     }
     
-    /// # Password: Input Field
+    /// # Code: Input Field
     ///
     @IBOutlet private var codeInputView: SPTextInputView! {
         didSet {
@@ -78,6 +78,16 @@ class SPAuthViewController: UIViewController {
             codeInputView.textContentType = .oneTimeCode
         }
     }
+    
+    /// # Code: Warning Label
+    ///
+    @IBOutlet private var codeWarningLabel: SPLabel! {
+        didSet {
+            codeWarningLabel.textInsets = AuthenticationConstants.warningInsets
+            codeWarningLabel.textColor = .simplenoteRed60Color
+            codeWarningLabel.isHidden = true
+        }
+    }
 
     /// # Primary Action: LogIn / SignUp
     ///
@@ -179,7 +189,7 @@ class SPAuthViewController: UIViewController {
     /// # Indicates if we've got valid Credentials. Doesn't display any validation warnings onscreen
     ///
     private var isInputValid: Bool {
-        return performUsernameValidation() == .success && performPasswordValidation() == .success
+        return performUsernameValidation() == .success && performPasswordValidation() == .success && performCodeValidation() == .success
     }
 
     /// # Returns the EmailInputView's Text: When empty this getter returns an empty string, instead of nil
@@ -671,6 +681,11 @@ private extension SPAuthViewController {
         passwordWarningLabel.text = string
         refreshPasswordInput(inErrorState: true)
     }
+    
+    func displayCodeValidationWarning(_ string: String) {
+        codeWarningLabel.text = string
+        refreshCodeInput(inErrorState: true)
+    }
 
     func dismissAllValidationWarnings() {
         refreshEmailInput(inErrorState: false)
@@ -684,6 +699,10 @@ private extension SPAuthViewController {
     func dismissPasswordValidationWarning() {
         refreshPasswordInput(inErrorState: false)
     }
+    
+    func dismissCodeValidationWarning() {
+        refreshCodeInput(inErrorState: false)
+    }
 
     func refreshEmailInput(inErrorState: Bool) {
         emailWarningLabel.animateVisibility(isHidden: !inErrorState)
@@ -694,6 +713,11 @@ private extension SPAuthViewController {
         passwordWarningLabel.animateVisibility(isHidden: !inErrorState)
         passwordInputView.inErrorState = inErrorState
     }
+    
+    func refreshCodeInput(inErrorState: Bool) {
+        codeWarningLabel.animateVisibility(isHidden: !inErrorState)
+        codeInputView.inErrorState = inErrorState
+    }
 }
 
 // MARK: - Validation
@@ -718,6 +742,14 @@ private extension SPAuthViewController {
 
         return validator.performPasswordValidation(username: email, password: password, style: mode.validationStyle)
     }
+    
+    func performCodeValidation() -> AuthenticationValidator.Result {
+        guard mode.visibleElements.contains(.code) else {
+            return .success
+        }
+        
+        return validator.performCodeValidation(code: state.code)
+    }
 
     /// Whenever we're in `.login` mode, and the password is valid in `.legacy` terms (but invalid in `.strong` mode), we must request the
     /// user to reset the password associated to his/her account.
@@ -729,6 +761,7 @@ private extension SPAuthViewController {
     func ensureWarningsAreOnScreenWhenNeeded() -> Bool {
         let usernameValidationResult = performUsernameValidation()
         let passwordValidationResult = performPasswordValidation()
+        let codeValidationResult = performCodeValidation()
 
         if usernameValidationResult != .success {
             displayEmailValidationWarning(usernameValidationResult.description)
@@ -737,8 +770,12 @@ private extension SPAuthViewController {
         if passwordValidationResult != .success {
             displayPasswordValidationWarning(passwordValidationResult.description)
         }
+        
+        if codeValidationResult != .success {
+            displayCodeValidationWarning(codeValidationResult.description)
+        }
 
-        return usernameValidationResult == .success && passwordValidationResult == .success
+        return usernameValidationResult == .success && passwordValidationResult == .success && codeValidationResult == .success
     }
 
     func ensureWarningsAreDismissedWhenNeeded() {
@@ -749,6 +786,10 @@ private extension SPAuthViewController {
         if performPasswordValidation() == .success {
             dismissPasswordValidationWarning()
         }
+        
+        if performCodeValidation() == .success {
+            dismissCodeValidationWarning()
+        }
     }
 }
 
@@ -794,6 +835,15 @@ extension SPAuthViewController: SPTextInputViewDelegate {
                 displayPasswordValidationWarning(error.description)
             }
 
+        case codeInputView:
+            switch performCodeValidation() {
+            case .success:
+                performPrimaryActionIfPossible()
+                
+            case let error:
+                displayCodeValidationWarning(error.description)
+            }
+            
         default:
             break
         }
diff --git a/Simplenote/Classes/SPAuthViewController.xib b/Simplenote/Classes/SPAuthViewController.xib
index 8b0aa0d55..4febb6038 100644
--- a/Simplenote/Classes/SPAuthViewController.xib
+++ b/Simplenote/Classes/SPAuthViewController.xib
@@ -14,6 +14,7 @@
                 <outlet property="actionsSeparator" destination="Kpm-3a-0Z7" id="1in-6f-hpi"/>
                 <outlet property="actionsSeparatorLabel" destination="223-DD-dLN" id="GpO-BP-sli"/>
                 <outlet property="codeInputView" destination="OP1-hm-GRS" id="2HQ-Db-x3W"/>
+                <outlet property="codeWarningLabel" destination="Jbg-WU-heV" id="Qjt-NJ-s8f"/>
                 <outlet property="emailInputView" destination="hW6-K1-OyV" id="TyC-Uh-Kaf"/>
                 <outlet property="emailWarningLabel" destination="n7T-Gj-plH" id="STx-wz-jKg"/>
                 <outlet property="passwordInputView" destination="pdF-nK-gXE" id="18P-SU-c90"/>
@@ -34,7 +35,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="CJS-5O-pxK">
-                    <rect key="frame" x="332" y="60" width="360" height="460"/>
+                    <rect key="frame" x="332" y="60" width="360" height="486"/>
                     <subviews>
                         <view contentMode="center" translatesAutoresizingMaskIntoConstraints="NO" id="hW6-K1-OyV" userLabel="Email Input View" customClass="SPTextInputView" customModule="Simplenote" customModuleProvider="target">
                             <rect key="frame" x="0.0" y="0.0" width="360" height="44"/>
@@ -78,8 +79,14 @@
                                 <userDefinedRuntimeAttribute type="string" keyPath="placeholder" value="#Password#"/>
                             </userDefinedRuntimeAttributes>
                         </view>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="#Invalid code#" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Jbg-WU-heV" userLabel="#Invalid code#" customClass="SPLabel" customModule="Simplenote" customModuleProvider="target">
+                            <rect key="frame" x="0.0" y="208" width="100.5" height="18"/>
+                            <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
+                            <color key="textColor" systemColor="systemRedColor"/>
+                            <nil key="highlightedColor"/>
+                        </label>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CGr-O3-MBQ" userLabel="Primary Action View">
-                            <rect key="frame" x="0.0" y="208" width="360" height="44"/>
+                            <rect key="frame" x="0.0" y="234" width="360" height="44"/>
                             <subviews>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="q3p-Ji-dOm" customClass="SPSquaredButton" customModule="Simplenote" customModuleProvider="target">
                                     <rect key="frame" x="0.0" y="0.0" width="360" height="44"/>
@@ -102,7 +109,7 @@
                             </constraints>
                         </view>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PfS-vU-7i3">
-                            <rect key="frame" x="0.0" y="260" width="360" height="44"/>
+                            <rect key="frame" x="0.0" y="286" width="360" height="44"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="44" id="u8s-d9-Em4"/>
                             </constraints>
@@ -112,7 +119,7 @@
                             </state>
                         </button>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Kpm-3a-0Z7" userLabel="Actions Separator View">
-                            <rect key="frame" x="0.0" y="312" width="360" height="44"/>
+                            <rect key="frame" x="0.0" y="338" width="360" height="44"/>
                             <subviews>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1Ls-SS-l0Q" userLabel="Leading View">
                                     <rect key="frame" x="0.0" y="21.5" width="167" height="1"/>
@@ -149,7 +156,7 @@
                             </constraints>
                         </view>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Uy8-va-3uF" userLabel="#Tertiary#" customClass="SPSquaredButton" customModule="Simplenote" customModuleProvider="target">
-                            <rect key="frame" x="0.0" y="364" width="360" height="44"/>
+                            <rect key="frame" x="0.0" y="390" width="360" height="44"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="44" id="lt7-Yn-pzG"/>
                             </constraints>
@@ -159,7 +166,7 @@
                             </state>
                         </button>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ILr-Ij-XBq" userLabel="#Quaternary#" customClass="SPSquaredButton" customModule="Simplenote" customModuleProvider="target">
-                            <rect key="frame" x="0.0" y="416" width="360" height="44"/>
+                            <rect key="frame" x="0.0" y="442" width="360" height="44"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="44" id="cE4-3n-khh"/>
                             </constraints>
@@ -203,6 +210,9 @@
         <designable name="ILr-Ij-XBq">
             <size key="intrinsicContentSize" width="112" height="33"/>
         </designable>
+        <designable name="Jbg-WU-heV">
+            <size key="intrinsicContentSize" width="100.5" height="18"/>
+        </designable>
         <designable name="Uy8-va-3uF">
             <size key="intrinsicContentSize" width="83" height="33"/>
         </designable>

From f13984277e5ee93ff1989743409518646381c982 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 15 Jul 2024 14:59:29 -0300
Subject: [PATCH 288/547] SPAuthViewController: Drops unused code

---
 Simplenote/Classes/SPAuthViewController.swift | 77 +++++++++----------
 1 file changed, 37 insertions(+), 40 deletions(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index e7f78fd91..cc5efb993 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -686,11 +686,6 @@ private extension SPAuthViewController {
         codeWarningLabel.text = string
         refreshCodeInput(inErrorState: true)
     }
-
-    func dismissAllValidationWarnings() {
-        refreshEmailInput(inErrorState: false)
-        refreshPasswordInput(inErrorState: false)
-    }
     
     func dismissEmailValidationWarning() {
         refreshEmailInput(inErrorState: false)
@@ -870,6 +865,9 @@ struct AuthenticationElements: OptionSet {
     static let actionSeparator  = AuthenticationElements(rawValue: 1 << 7)
 }
 
+
+// MARK: - Authentication Actions
+//
 enum AuthenticationActionName {
     case primary
     case secondary
@@ -877,7 +875,7 @@ enum AuthenticationActionName {
     case quaternary
 }
 
-struct AuthenticationAction {
+struct AuthenticationActionDescriptor {
     let name: AuthenticationActionName
     let selector: Selector
     let text: String?
@@ -885,14 +883,13 @@ struct AuthenticationAction {
 }
 
 
-
 // MARK: - AuthenticationMode: Signup / Login
 //
 struct AuthenticationMode {
     let title: String
     let validationStyle: AuthenticationValidator.Style
     let visibleElements: AuthenticationElements
-    let actions: [AuthenticationAction]
+    let actions: [AuthenticationActionDescriptor]
 }
 
 // MARK: - Default Operation Modes
@@ -906,14 +903,14 @@ extension AuthenticationMode {
                      validationStyle: .legacy,
                      visibleElements: [.password],
                      actions: [
-                        AuthenticationAction(name: .primary,
-                                             selector: #selector(SPAuthViewController.performLogInWithPassword),
-                                             text: PasswordStrings.login,
-                                             attributedText: nil),
-                        AuthenticationAction(name: .secondary,
-                                             selector: #selector(SPAuthViewController.presentPasswordReset),
-                                             text: PasswordStrings.forgotPassword,
-                                             attributedText: nil)
+                        AuthenticationActionDescriptor(name: .primary,
+                                                       selector: #selector(SPAuthViewController.performLogInWithPassword),
+                                                       text: PasswordStrings.login,
+                                                       attributedText: nil),
+                        AuthenticationActionDescriptor(name: .secondary,
+                                                       selector: #selector(SPAuthViewController.presentPasswordReset),
+                                                       text: PasswordStrings.forgotPassword,
+                                                       attributedText: nil)
                      ])
     }
 
@@ -924,14 +921,14 @@ extension AuthenticationMode {
                      validationStyle: .legacy,
                      visibleElements: [.username, .actionSeparator],
                      actions: [
-                        AuthenticationAction(name: .primary,
-                                            selector: #selector(SPAuthViewController.requestLogInCode),
-                                            text: RequestCodeStrings.loginWithEmail,
-                                            attributedText: nil),
-                        AuthenticationAction(name: .tertiary,
-                                            selector: #selector(SPAuthViewController.performLogInWithWPCOM),
-                                            text: RequestCodeStrings.loginWithWPCOM,
-                                            attributedText: nil),
+                        AuthenticationActionDescriptor(name: .primary,
+                                                       selector: #selector(SPAuthViewController.requestLogInCode),
+                                                       text: RequestCodeStrings.loginWithEmail,
+                                                       attributedText: nil),
+                        AuthenticationActionDescriptor(name: .tertiary,
+                                                       selector: #selector(SPAuthViewController.performLogInWithWPCOM),
+                                                       text: RequestCodeStrings.loginWithWPCOM,
+                                                       attributedText: nil),
                      ])
     }
     
@@ -942,14 +939,14 @@ extension AuthenticationMode {
                      validationStyle: .legacy,
                      visibleElements: [.code, .actionSeparator],
                      actions: [
-                        AuthenticationAction(name: .primary,
-                                            selector: #selector(SPAuthViewController.performLogInWithCode),
-                                            text: LoginWithCodeStrings.login,
-                                            attributedText: nil),
-                        AuthenticationAction(name: .quaternary,
-                                            selector: #selector(SPAuthViewController.presentPasswordInterface),
-                                            text: LoginWithCodeStrings.enterPassword,
-                                            attributedText: nil),
+                        AuthenticationActionDescriptor(name: .primary,
+                                                       selector: #selector(SPAuthViewController.performLogInWithCode),
+                                                       text: LoginWithCodeStrings.login,
+                                                       attributedText: nil),
+                        AuthenticationActionDescriptor(name: .quaternary,
+                                                       selector: #selector(SPAuthViewController.presentPasswordInterface),
+                                                       text: LoginWithCodeStrings.enterPassword,
+                                                       attributedText: nil),
                      ])
     }
 
@@ -960,14 +957,14 @@ extension AuthenticationMode {
                      validationStyle: .strong,
                      visibleElements: [.username],
                      actions: [
-                        AuthenticationAction(name: .primary,
-                                            selector: #selector(SPAuthViewController.performSignUp),
-                                            text: SignupStrings.signup,
-                                            attributedText: nil),
-                        AuthenticationAction(name: .secondary,
-                                            selector: #selector(SPAuthViewController.presentTermsOfService),
-                                            text: nil,
-                                            attributedText: SignupStrings.termsOfService)
+                        AuthenticationActionDescriptor(name: .primary,
+                                                       selector: #selector(SPAuthViewController.performSignUp),
+                                                       text: SignupStrings.signup,
+                                                       attributedText: nil),
+                        AuthenticationActionDescriptor(name: .secondary,
+                                                       selector: #selector(SPAuthViewController.presentTermsOfService),
+                                                       text: nil,
+                                                       attributedText: SignupStrings.termsOfService)
                      ])
     }
 }

From 6c9a6272919e697282966da501cba417a03b019c Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 15 Jul 2024 15:01:41 -0300
Subject: [PATCH 289/547] SPAuthViewController: Drops unneeded API

---
 Simplenote/Classes/SPAuthViewController.swift | 27 ++++++++-----------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index cc5efb993..34dcaa32e 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -434,24 +434,19 @@ private extension SPAuthViewController {
     
     @IBAction func performLogInWithCode() {
         Task { @MainActor in
-            await performLogInWithCodeInTask()
-        }
-    }
-    
-    @MainActor
-    private func performLogInWithCodeInTask() async {
-        lockdownInterface()
-        
-        do {
-            try await controller.loginWithCode(username: state.username, code: state.code)
-            SPTracker.trackUserConfirmedLoginLink()
-        } catch let error as SPAuthError {
-            self.handleError(error: error)
-        } catch {
+            lockdownInterface()
+            
+            do {
+                try await controller.loginWithCode(username: state.username, code: state.code)
+                SPTracker.trackUserConfirmedLoginLink()
+            } catch let error as SPAuthError {
+                self.handleError(error: error)
+            } catch {
 // TODO: Fixme
+            }
+            
+            unlockInterface()
         }
-        
-        unlockInterface()
     }
     
     @IBAction func performLogInWithWPCOM() {

From 950773117eb8efcecea7713b4607ec72b7b05ed6 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 15 Jul 2024 16:45:26 -0300
Subject: [PATCH 290/547] Drops testing URL

---
 Simplenote/Classes/SimplenoteConstants.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Simplenote/Classes/SimplenoteConstants.swift b/Simplenote/Classes/SimplenoteConstants.swift
index 63cca619e..7d1c734fd 100644
--- a/Simplenote/Classes/SimplenoteConstants.swift
+++ b/Simplenote/Classes/SimplenoteConstants.swift
@@ -45,8 +45,8 @@ class SimplenoteConstants: NSObject {
     ///
     static let resetPasswordURL     = currentEngineBaseURL.appendingPathComponent("/reset/?redirect=simplenote://launch&email=")
     static let settingsURL          = currentEngineBaseURL.appendingPathComponent("/settings")
-    static let loginRequestURL      = "https://magic-code-dot-simple-note-hrd.appspot.com/account/request-login" //googleAppEngineBaseURL.appendingPathComponent("/account/request-login")
-    static let loginCompletionURL   = "https://magic-code-dot-simple-note-hrd.appspot.com/account/complete-login" //googleAppEngineBaseURL.appendingPathComponent("/account/complete-login")
+    static let loginRequestURL      = currentEngineBaseURL.appendingPathComponent("/account/request-login")
+    static let loginCompletionURL   = currentEngineBaseURL.appendingPathComponent("/account/complete-login")
     static let signupURL            = currentEngineBaseURL.appendingPathComponent("/account/request-signup")
     static let verificationURL      = currentEngineBaseURL.appendingPathComponent("/account/verify-email/")
     static let accountDeletionURL   = currentEngineBaseURL.appendingPathComponent("/account/request-delete/")

From 93660041f00604eaa7314259138612883594fc6e Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 15 Jul 2024 17:10:49 -0300
Subject: [PATCH 291/547] Extracts AuthenticationMode Descriptor

---
 Simplenote.xcodeproj/project.pbxproj          |   4 +
 Simplenote/AuthenticationMode.swift           | 185 ++++++++++++++++++
 Simplenote/Classes/SPAuthViewController.swift | 183 +----------------
 3 files changed, 194 insertions(+), 178 deletions(-)
 create mode 100644 Simplenote/AuthenticationMode.swift

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index 030b259ec..6a0958985 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -383,6 +383,7 @@
 		B5C2EDD4255ACB4900C09B32 /* InterlinkViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C2EDD1255ACB4800C09B32 /* InterlinkViewController.swift */; };
 		B5C2EDF0255AFB6C00C09B32 /* PassthruView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C2EDEF255AFB6C00C09B32 /* PassthruView.swift */; };
 		B5C2EDFE255B19D300C09B32 /* NSAttributedString+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C2EDFD255B19D300C09B32 /* NSAttributedString+Simplenote.swift */; };
+		B5C99A512C45B94600728813 /* AuthenticationMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C99A502C45B94600728813 /* AuthenticationMode.swift */; };
 		B5C9F71E193E75FE00FD2491 /* SPDebugViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B5C9F71C193E75FE00FD2491 /* SPDebugViewController.m */; };
 		B5CBEF4022D3AD92009DBE67 /* MigrationsHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5CBEF3F22D3AD92009DBE67 /* MigrationsHandler.swift */; };
 		B5CBEF4222D3B419009DBE67 /* Bundle+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5CBEF4122D3B419009DBE67 /* Bundle+Simplenote.swift */; };
@@ -1103,6 +1104,7 @@
 		B5C2EDD1255ACB4800C09B32 /* InterlinkViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = InterlinkViewController.swift; path = Classes/InterlinkViewController.swift; sourceTree = "<group>"; };
 		B5C2EDEF255AFB6C00C09B32 /* PassthruView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = PassthruView.swift; path = Classes/PassthruView.swift; sourceTree = "<group>"; };
 		B5C2EDFD255B19D300C09B32 /* NSAttributedString+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "NSAttributedString+Simplenote.swift"; path = "Classes/NSAttributedString+Simplenote.swift"; sourceTree = "<group>"; };
+		B5C99A502C45B94600728813 /* AuthenticationMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationMode.swift; sourceTree = "<group>"; };
 		B5C9F71B193E75FE00FD2491 /* SPDebugViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SPDebugViewController.h; path = Classes/SPDebugViewController.h; sourceTree = "<group>"; };
 		B5C9F71C193E75FE00FD2491 /* SPDebugViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SPDebugViewController.m; path = Classes/SPDebugViewController.m; sourceTree = "<group>"; };
 		B5CA3E0D22B1503700AC0D47 /* RELEASE-NOTES.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "RELEASE-NOTES.txt"; sourceTree = "<group>"; };
@@ -2078,6 +2080,7 @@
 				B56A695622F9CD1500B90398 /* SPOnboardingViewController.xib */,
 				B56A695D22F9D53300B90398 /* SPAuthError.swift */,
 				B56A695C22F9D53300B90398 /* SPAuthHandler.swift */,
+				B5C99A502C45B94600728813 /* AuthenticationMode.swift */,
 				B56A695F22F9D53400B90398 /* SPAuthViewController.swift */,
 				B56A695E22F9D53300B90398 /* SPAuthViewController.xib */,
 				B5AB169722FA124F00B4EBA5 /* SPSheetController.swift */,
@@ -3735,6 +3738,7 @@
 				A6BF0E352567B29B008DE8E0 /* RoundedCrossButton.swift in Sources */,
 				375D24B121E01131007AB25A /* html5_blocks.c in Sources */,
 				B504D4DE23D2014200AEED27 /* IndexPath+Simplenote.swift in Sources */,
+				B5C99A512C45B94600728813 /* AuthenticationMode.swift in Sources */,
 				A6CC0B0725B8287F00F12A85 /* AccountRemote.swift in Sources */,
 				A61471B925D70C190065D849 /* PopoverViewController.swift in Sources */,
 				B536988D25646C9400817E30 /* CGRect+Simplenote.swift in Sources */,
diff --git a/Simplenote/AuthenticationMode.swift b/Simplenote/AuthenticationMode.swift
new file mode 100644
index 000000000..76fd9adca
--- /dev/null
+++ b/Simplenote/AuthenticationMode.swift
@@ -0,0 +1,185 @@
+//
+//  AuthenticationMode.swift
+//  Simplenote
+//
+//  Created by Jorge Leandro Perez on 7/15/24.
+//  Copyright © 2024 Automattic. All rights reserved.
+//
+
+import Foundation
+
+
+// MARK: - State
+//
+struct AuthenticationState {
+    var username = String()
+    var password = String()
+    var code = String()
+}
+
+struct AuthenticationElements: OptionSet {
+    let rawValue: UInt
+    
+    static let username         = AuthenticationElements(rawValue: 1 << 0)
+    static let password         = AuthenticationElements(rawValue: 1 << 1)
+    static let code             = AuthenticationElements(rawValue: 1 << 2)
+    static let actionSeparator  = AuthenticationElements(rawValue: 1 << 7)
+}
+
+
+// MARK: - Authentication Actions
+//
+enum AuthenticationActionName {
+    case primary
+    case secondary
+    case tertiary
+    case quaternary
+}
+
+struct AuthenticationActionDescriptor {
+    let name: AuthenticationActionName
+    let selector: Selector
+    let text: String?
+    let attributedText: NSAttributedString?
+}
+
+
+// MARK: - AuthenticationMode: Signup / Login
+//
+struct AuthenticationMode {
+    let title: String
+    let validationStyle: AuthenticationValidator.Style
+    let visibleElements: AuthenticationElements
+    let actions: [AuthenticationActionDescriptor]
+}
+
+// MARK: - Default Operation Modes
+//
+extension AuthenticationMode {
+
+    /// Login Operation Mode: Contains all of the strings + delegate wirings, so that the AuthUI handles authentication scenarios.
+    ///
+    static var loginWithPassword: AuthenticationMode {
+        return .init(title: PasswordStrings.title,
+                     validationStyle: .legacy,
+                     visibleElements: [.password],
+                     actions: [
+                        AuthenticationActionDescriptor(name: .primary,
+                                                       selector: #selector(SPAuthViewController.performLogInWithPassword),
+                                                       text: PasswordStrings.login,
+                                                       attributedText: nil),
+                        AuthenticationActionDescriptor(name: .secondary,
+                                                       selector: #selector(SPAuthViewController.presentPasswordReset),
+                                                       text: PasswordStrings.forgotPassword,
+                                                       attributedText: nil)
+                     ])
+    }
+
+    /// Login Operation Mode: Request Login Code
+    ///
+    static var requestLoginCode: AuthenticationMode {
+        return .init(title: RequestCodeStrings.title,
+                     validationStyle: .legacy,
+                     visibleElements: [.username, .actionSeparator],
+                     actions: [
+                        AuthenticationActionDescriptor(name: .primary,
+                                                       selector: #selector(SPAuthViewController.requestLogInCode),
+                                                       text: RequestCodeStrings.loginWithEmail,
+                                                       attributedText: nil),
+                        AuthenticationActionDescriptor(name: .tertiary,
+                                                       selector: #selector(SPAuthViewController.performLogInWithWPCOM),
+                                                       text: RequestCodeStrings.loginWithWPCOM,
+                                                       attributedText: nil),
+                     ])
+    }
+    
+    /// Login Operation Mode: Submit Code + Authenticate the user
+    ///
+    static var loginWithCode: AuthenticationMode {
+        return .init(title: LoginWithCodeStrings.title,
+                     validationStyle: .legacy,
+                     visibleElements: [.code, .actionSeparator],
+                     actions: [
+                        AuthenticationActionDescriptor(name: .primary,
+                                                       selector: #selector(SPAuthViewController.performLogInWithCode),
+                                                       text: LoginWithCodeStrings.login,
+                                                       attributedText: nil),
+                        AuthenticationActionDescriptor(name: .quaternary,
+                                                       selector: #selector(SPAuthViewController.presentPasswordInterface),
+                                                       text: LoginWithCodeStrings.enterPassword,
+                                                       attributedText: nil),
+                     ])
+    }
+
+    /// Signup Operation Mode: Contains all of the strings + delegate wirings, so that the AuthUI handles user account creation scenarios.
+    ///
+    static var signup: AuthenticationMode {
+        return .init(title: SignupStrings.title,
+                     validationStyle: .strong,
+                     visibleElements: [.username],
+                     actions: [
+                        AuthenticationActionDescriptor(name: .primary,
+                                                       selector: #selector(SPAuthViewController.performSignUp),
+                                                       text: SignupStrings.signup,
+                                                       attributedText: nil),
+                        AuthenticationActionDescriptor(name: .secondary,
+                                                       selector: #selector(SPAuthViewController.presentTermsOfService),
+                                                       text: nil,
+                                                       attributedText: SignupStrings.termsOfService)
+                     ])
+    }
+}
+
+
+// MARK: - Mode: .loginWithPassword
+//
+private enum PasswordStrings {
+    static let title            = NSLocalizedString("Log In with Password", comment: "LogIn Interface Title")
+    static let login            = NSLocalizedString("Log In", comment: "LogIn Action")
+    static let forgotPassword   = NSLocalizedString("Forgot your password?", comment: "Password Reset Action")
+}
+
+
+// MARK: - Mode: .requestLoginCode
+//
+private enum RequestCodeStrings {
+    static let title            = NSLocalizedString("Log In", comment: "LogIn Interface Title")
+    static let loginWithEmail   = NSLocalizedString("Log in with email", comment: "Sends the User an email with an Authentication Code")
+    static let loginWithWPCOM   = NSLocalizedString("Log in with WordPress.com", comment: "Password fallback Action")
+}
+
+
+// MARK: - Mode: .code
+//
+private enum LoginWithCodeStrings {
+    static let title            = NSLocalizedString("Enter Code", comment: "LogIn Interface Title")
+    static let login            = NSLocalizedString("Log In", comment: "LogIn Interface Title")
+    static let enterPassword    = NSLocalizedString("Enter password", comment: "Enter Password fallback Action")
+}
+
+
+// MARK: - Mode: .signup
+//
+private enum SignupStrings {
+    static let title                = NSLocalizedString("Sign Up", comment: "SignUp Interface Title")
+    static let signup               = NSLocalizedString("Sign Up", comment: "SignUp Action")
+    static let termsOfServicePrefix = NSLocalizedString("By creating an account you agree to our", comment: "Terms of Service Legend *PREFIX*: printed in dark color")
+    static let termsOfServiceSuffix = NSLocalizedString("Terms and Conditions", comment: "Terms of Service Legend *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue")
+}
+
+private extension SignupStrings {
+
+    /// Returns a properly formatted Secondary Action String for Signup
+    ///
+    static var termsOfService: NSAttributedString {
+        let output = NSMutableAttributedString(string: String(), attributes: [
+            .font: UIFont.preferredFont(forTextStyle: .subheadline)
+        ])
+
+        output.append(string: termsOfServicePrefix, foregroundColor: .simplenoteGray60Color)
+        output.append(string: " ")
+        output.append(string: termsOfServiceSuffix, foregroundColor: .simplenoteBlue60Color)
+
+        return output
+    }
+}
diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index 34dcaa32e..d87f65172 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -381,7 +381,7 @@ private extension SPAuthViewController {
 
 // MARK: - Actions
 //
-private extension SPAuthViewController {
+extension SPAuthViewController {
 
     /// Whenever the input is Valid, we'll perform the Primary Action
     ///
@@ -425,7 +425,7 @@ private extension SPAuthViewController {
                 self.handleError(error: error)
             } else {
                 self.presentCodeInterface()
-                SPTracker.trackUserRequestedLoginLink()
+                SPTracker.trackLoginLinkRequested()
             }
 
             self.unlockInterface()
@@ -438,8 +438,9 @@ private extension SPAuthViewController {
             
             do {
                 try await controller.loginWithCode(username: state.username, code: state.code)
-                SPTracker.trackUserConfirmedLoginLink()
+                SPTracker.trackLoginLinkConfirmationSuccess()
             } catch let error as SPAuthError {
+                SPTracker.trackLoginLinkConfirmationFailure()
                 self.handleError(error: error)
             } catch {
 // TODO: Fixme
@@ -843,128 +844,6 @@ extension SPAuthViewController: SPTextInputViewDelegate {
 }
 
 
-// MARK: - State
-//
-struct AuthenticationState {
-    var username = String()
-    var password = String()
-    var code = String()
-}
-
-struct AuthenticationElements: OptionSet {
-    let rawValue: UInt
-    
-    static let username         = AuthenticationElements(rawValue: 1 << 0)
-    static let password         = AuthenticationElements(rawValue: 1 << 1)
-    static let code             = AuthenticationElements(rawValue: 1 << 2)
-    static let actionSeparator  = AuthenticationElements(rawValue: 1 << 7)
-}
-
-
-// MARK: - Authentication Actions
-//
-enum AuthenticationActionName {
-    case primary
-    case secondary
-    case tertiary
-    case quaternary
-}
-
-struct AuthenticationActionDescriptor {
-    let name: AuthenticationActionName
-    let selector: Selector
-    let text: String?
-    let attributedText: NSAttributedString?
-}
-
-
-// MARK: - AuthenticationMode: Signup / Login
-//
-struct AuthenticationMode {
-    let title: String
-    let validationStyle: AuthenticationValidator.Style
-    let visibleElements: AuthenticationElements
-    let actions: [AuthenticationActionDescriptor]
-}
-
-// MARK: - Default Operation Modes
-//
-extension AuthenticationMode {
-
-    /// Login Operation Mode: Contains all of the strings + delegate wirings, so that the AuthUI handles authentication scenarios.
-    ///
-    static var loginWithPassword: AuthenticationMode {
-        return .init(title: PasswordStrings.title,
-                     validationStyle: .legacy,
-                     visibleElements: [.password],
-                     actions: [
-                        AuthenticationActionDescriptor(name: .primary,
-                                                       selector: #selector(SPAuthViewController.performLogInWithPassword),
-                                                       text: PasswordStrings.login,
-                                                       attributedText: nil),
-                        AuthenticationActionDescriptor(name: .secondary,
-                                                       selector: #selector(SPAuthViewController.presentPasswordReset),
-                                                       text: PasswordStrings.forgotPassword,
-                                                       attributedText: nil)
-                     ])
-    }
-
-    /// Login Operation Mode: Request Login Code
-    ///
-    static var requestLoginCode: AuthenticationMode {
-        return .init(title: RequestCodeStrings.title,
-                     validationStyle: .legacy,
-                     visibleElements: [.username, .actionSeparator],
-                     actions: [
-                        AuthenticationActionDescriptor(name: .primary,
-                                                       selector: #selector(SPAuthViewController.requestLogInCode),
-                                                       text: RequestCodeStrings.loginWithEmail,
-                                                       attributedText: nil),
-                        AuthenticationActionDescriptor(name: .tertiary,
-                                                       selector: #selector(SPAuthViewController.performLogInWithWPCOM),
-                                                       text: RequestCodeStrings.loginWithWPCOM,
-                                                       attributedText: nil),
-                     ])
-    }
-    
-    /// Login Operation Mode: Submit Code + Authenticate the user
-    ///
-    static var loginWithCode: AuthenticationMode {
-        return .init(title: LoginWithCodeStrings.title,
-                     validationStyle: .legacy,
-                     visibleElements: [.code, .actionSeparator],
-                     actions: [
-                        AuthenticationActionDescriptor(name: .primary,
-                                                       selector: #selector(SPAuthViewController.performLogInWithCode),
-                                                       text: LoginWithCodeStrings.login,
-                                                       attributedText: nil),
-                        AuthenticationActionDescriptor(name: .quaternary,
-                                                       selector: #selector(SPAuthViewController.presentPasswordInterface),
-                                                       text: LoginWithCodeStrings.enterPassword,
-                                                       attributedText: nil),
-                     ])
-    }
-
-    /// Signup Operation Mode: Contains all of the strings + delegate wirings, so that the AuthUI handles user account creation scenarios.
-    ///
-    static var signup: AuthenticationMode {
-        return .init(title: SignupStrings.title,
-                     validationStyle: .strong,
-                     visibleElements: [.username],
-                     actions: [
-                        AuthenticationActionDescriptor(name: .primary,
-                                                       selector: #selector(SPAuthViewController.performSignUp),
-                                                       text: SignupStrings.signup,
-                                                       attributedText: nil),
-                        AuthenticationActionDescriptor(name: .secondary,
-                                                       selector: #selector(SPAuthViewController.presentTermsOfService),
-                                                       text: nil,
-                                                       attributedText: SignupStrings.termsOfService)
-                     ])
-    }
-}
-
-
 // MARK: - Authentication Strings
 //
 private enum AuthenticationStrings {
@@ -985,6 +864,7 @@ private enum AuthenticationStrings {
     static let verificationSentTemplate     = NSLocalizedString("We’ve sent a verification email to %1$@. Please check your inbox and follow the instructions.", comment: "Confirmation that an email has been sent")
 }
 
+
 // MARK: - PasswordInsecure Alert Strings
 //
 private enum PasswordInsecureString {
@@ -1001,59 +881,6 @@ private enum PasswordInsecureString {
 }
 
 
-// MARK: - Mode: .loginWithPassword
-//
-private enum PasswordStrings {
-    static let title            = NSLocalizedString("Log In with Password", comment: "LogIn Interface Title")
-    static let login            = NSLocalizedString("Log In", comment: "LogIn Action")
-    static let forgotPassword   = NSLocalizedString("Forgot your password?", comment: "Password Reset Action")
-}
-
-
-// MARK: - Mode: .requestLoginCode
-//
-private enum RequestCodeStrings {
-    static let title            = NSLocalizedString("Log In", comment: "LogIn Interface Title")
-    static let loginWithEmail   = NSLocalizedString("Log in with email", comment: "Sends the User an email with an Authentication Code")
-    static let loginWithWPCOM   = NSLocalizedString("Log in with WordPress.com", comment: "Password fallback Action")
-}
-
-
-// MARK: - Mode: .code
-//
-private enum LoginWithCodeStrings {
-    static let title            = NSLocalizedString("Enter Code", comment: "LogIn Interface Title")
-    static let login            = NSLocalizedString("Log In", comment: "LogIn Interface Title")
-    static let enterPassword    = NSLocalizedString("Enter password", comment: "Enter Password fallback Action")
-}
-
-
-// MARK: - Mode: .signup
-//
-private enum SignupStrings {
-    static let title                = NSLocalizedString("Sign Up", comment: "SignUp Interface Title")
-    static let signup               = NSLocalizedString("Sign Up", comment: "SignUp Action")
-    static let termsOfServicePrefix = NSLocalizedString("By creating an account you agree to our", comment: "Terms of Service Legend *PREFIX*: printed in dark color")
-    static let termsOfServiceSuffix = NSLocalizedString("Terms and Conditions", comment: "Terms of Service Legend *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue")
-}
-
-private extension SignupStrings {
-
-    /// Returns a properly formatted Secondary Action String for Signup
-    ///
-    static var termsOfService: NSAttributedString {
-        let output = NSMutableAttributedString(string: String(), attributes: [
-            .font: UIFont.preferredFont(forTextStyle: .subheadline)
-        ])
-
-        output.append(string: termsOfServicePrefix, foregroundColor: .simplenoteGray60Color)
-        output.append(string: " ")
-        output.append(string: termsOfServiceSuffix, foregroundColor: .simplenoteBlue60Color)
-
-        return output
-    }
-}
-
 // MARK: - Authentication Constants
 //
 private enum AuthenticationConstants {

From d01c9daa1bf9428ae5609ce47b696bc42e375811 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 15 Jul 2024 17:20:44 -0300
Subject: [PATCH 292/547] AuthenticationMode: Simplifies initialization

---
 Simplenote/AuthenticationMode.swift           | 110 +++++++-----------
 Simplenote/Classes/SPAuthViewController.swift |  22 ++--
 2 files changed, 52 insertions(+), 80 deletions(-)

diff --git a/Simplenote/AuthenticationMode.swift b/Simplenote/AuthenticationMode.swift
index 76fd9adca..d7bef71d0 100644
--- a/Simplenote/AuthenticationMode.swift
+++ b/Simplenote/AuthenticationMode.swift
@@ -17,13 +17,16 @@ struct AuthenticationState {
     var code = String()
 }
 
-struct AuthenticationElements: OptionSet {
+
+// MARK: - Authentication Elements
+//
+struct AuthenticationInputElements: OptionSet {
     let rawValue: UInt
     
-    static let username         = AuthenticationElements(rawValue: 1 << 0)
-    static let password         = AuthenticationElements(rawValue: 1 << 1)
-    static let code             = AuthenticationElements(rawValue: 1 << 2)
-    static let actionSeparator  = AuthenticationElements(rawValue: 1 << 7)
+    static let username         = AuthenticationInputElements(rawValue: 1 << 0)
+    static let password         = AuthenticationInputElements(rawValue: 1 << 1)
+    static let code             = AuthenticationInputElements(rawValue: 1 << 2)
+    static let actionSeparator  = AuthenticationInputElements(rawValue: 1 << 3)
 }
 
 
@@ -41,6 +44,13 @@ struct AuthenticationActionDescriptor {
     let selector: Selector
     let text: String?
     let attributedText: NSAttributedString?
+        
+    init(name: AuthenticationActionName, selector: Selector, text: String?, attributedText: NSAttributedString? = nil) {
+        self.name = name
+        self.selector = selector
+        self.text = text
+        self.attributedText = attributedText
+    }
 }
 
 
@@ -48,8 +58,8 @@ struct AuthenticationActionDescriptor {
 //
 struct AuthenticationMode {
     let title: String
+    let inputElements: AuthenticationInputElements
     let validationStyle: AuthenticationValidator.Style
-    let visibleElements: AuthenticationElements
     let actions: [AuthenticationActionDescriptor]
 }
 
@@ -57,71 +67,64 @@ struct AuthenticationMode {
 //
 extension AuthenticationMode {
 
-    /// Login Operation Mode: Contains all of the strings + delegate wirings, so that the AuthUI handles authentication scenarios.
+    /// Login with Password
     ///
     static var loginWithPassword: AuthenticationMode {
-        return .init(title: PasswordStrings.title,
+        return .init(title: NSLocalizedString("Log In with Password", comment: "LogIn Interface Title"),
+                     inputElements: [.password],
                      validationStyle: .legacy,
-                     visibleElements: [.password],
                      actions: [
                         AuthenticationActionDescriptor(name: .primary,
                                                        selector: #selector(SPAuthViewController.performLogInWithPassword),
-                                                       text: PasswordStrings.login,
-                                                       attributedText: nil),
+                                                       text: NSLocalizedString("Log In", comment: "LogIn Action")),
                         AuthenticationActionDescriptor(name: .secondary,
                                                        selector: #selector(SPAuthViewController.presentPasswordReset),
-                                                       text: PasswordStrings.forgotPassword,
-                                                       attributedText: nil)
+                                                       text: NSLocalizedString("Forgot your password?", comment: "Password Reset Action"))
                      ])
     }
 
-    /// Login Operation Mode: Request Login Code
+    /// Requests a Login Code
     ///
     static var requestLoginCode: AuthenticationMode {
-        return .init(title: RequestCodeStrings.title,
+        return .init(title: NSLocalizedString("Log In", comment: "LogIn Interface Title"),
+                     inputElements: [.username, .actionSeparator],
                      validationStyle: .legacy,
-                     visibleElements: [.username, .actionSeparator],
                      actions: [
                         AuthenticationActionDescriptor(name: .primary,
                                                        selector: #selector(SPAuthViewController.requestLogInCode),
-                                                       text: RequestCodeStrings.loginWithEmail,
-                                                       attributedText: nil),
+                                                       text: NSLocalizedString("Log in with email", comment: "Sends the User an email with an Authentication Code")),
                         AuthenticationActionDescriptor(name: .tertiary,
                                                        selector: #selector(SPAuthViewController.performLogInWithWPCOM),
-                                                       text: RequestCodeStrings.loginWithWPCOM,
-                                                       attributedText: nil),
+                                                       text: NSLocalizedString("Log in with WordPress.com", comment: "Password fallback Action"))
                      ])
     }
     
-    /// Login Operation Mode: Submit Code + Authenticate the user
+    /// Login with Code: Submit Code + Authenticate the user
     ///
     static var loginWithCode: AuthenticationMode {
-        return .init(title: LoginWithCodeStrings.title,
+        return .init(title: NSLocalizedString("Enter Code", comment: "LogIn Interface Title"),
+                     inputElements: [.code, .actionSeparator],
                      validationStyle: .legacy,
-                     visibleElements: [.code, .actionSeparator],
                      actions: [
                         AuthenticationActionDescriptor(name: .primary,
                                                        selector: #selector(SPAuthViewController.performLogInWithCode),
-                                                       text: LoginWithCodeStrings.login,
-                                                       attributedText: nil),
+                                                       text: NSLocalizedString("Log In", comment: "LogIn Interface Title")),
                         AuthenticationActionDescriptor(name: .quaternary,
                                                        selector: #selector(SPAuthViewController.presentPasswordInterface),
-                                                       text: LoginWithCodeStrings.enterPassword,
-                                                       attributedText: nil),
+                                                       text: NSLocalizedString("Enter password", comment: "Enter Password fallback Action")),
                      ])
     }
 
-    /// Signup Operation Mode: Contains all of the strings + delegate wirings, so that the AuthUI handles user account creation scenarios.
+    /// Signup: Contains all of the strings + delegate wirings, so that the AuthUI handles user account creation scenarios.
     ///
     static var signup: AuthenticationMode {
-        return .init(title: SignupStrings.title,
+        return .init(title: NSLocalizedString("Sign Up", comment: "SignUp Interface Title"),
+                     inputElements: [.username],
                      validationStyle: .strong,
-                     visibleElements: [.username],
                      actions: [
                         AuthenticationActionDescriptor(name: .primary,
                                                        selector: #selector(SPAuthViewController.performSignUp),
-                                                       text: SignupStrings.signup,
-                                                       attributedText: nil),
+                                                       text: NSLocalizedString("Sign Up", comment: "SignUp Action")),
                         AuthenticationActionDescriptor(name: .secondary,
                                                        selector: #selector(SPAuthViewController.presentTermsOfService),
                                                        text: nil,
@@ -131,54 +134,23 @@ extension AuthenticationMode {
 }
 
 
-// MARK: - Mode: .loginWithPassword
-//
-private enum PasswordStrings {
-    static let title            = NSLocalizedString("Log In with Password", comment: "LogIn Interface Title")
-    static let login            = NSLocalizedString("Log In", comment: "LogIn Action")
-    static let forgotPassword   = NSLocalizedString("Forgot your password?", comment: "Password Reset Action")
-}
-
-
-// MARK: - Mode: .requestLoginCode
-//
-private enum RequestCodeStrings {
-    static let title            = NSLocalizedString("Log In", comment: "LogIn Interface Title")
-    static let loginWithEmail   = NSLocalizedString("Log in with email", comment: "Sends the User an email with an Authentication Code")
-    static let loginWithWPCOM   = NSLocalizedString("Log in with WordPress.com", comment: "Password fallback Action")
-}
-
-
-// MARK: - Mode: .code
-//
-private enum LoginWithCodeStrings {
-    static let title            = NSLocalizedString("Enter Code", comment: "LogIn Interface Title")
-    static let login            = NSLocalizedString("Log In", comment: "LogIn Interface Title")
-    static let enterPassword    = NSLocalizedString("Enter password", comment: "Enter Password fallback Action")
-}
-
-
 // MARK: - Mode: .signup
 //
 private enum SignupStrings {
-    static let title                = NSLocalizedString("Sign Up", comment: "SignUp Interface Title")
-    static let signup               = NSLocalizedString("Sign Up", comment: "SignUp Action")
-    static let termsOfServicePrefix = NSLocalizedString("By creating an account you agree to our", comment: "Terms of Service Legend *PREFIX*: printed in dark color")
-    static let termsOfServiceSuffix = NSLocalizedString("Terms and Conditions", comment: "Terms of Service Legend *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue")
-}
 
-private extension SignupStrings {
-
-    /// Returns a properly formatted Secondary Action String for Signup
+    /// Returns a formatted Secondary Action String for Signup
     ///
     static var termsOfService: NSAttributedString {
         let output = NSMutableAttributedString(string: String(), attributes: [
             .font: UIFont.preferredFont(forTextStyle: .subheadline)
         ])
 
-        output.append(string: termsOfServicePrefix, foregroundColor: .simplenoteGray60Color)
+        let prefix = NSLocalizedString("By creating an account you agree to our", comment: "Terms of Service Legend *PREFIX*: printed in dark color")
+        let suffix = NSLocalizedString("Terms and Conditions", comment: "Terms of Service Legend *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue")
+
+        output.append(string: prefix, foregroundColor: .simplenoteGray60Color)
         output.append(string: " ")
-        output.append(string: termsOfServiceSuffix, foregroundColor: .simplenoteBlue60Color)
+        output.append(string: suffix, foregroundColor: .simplenoteBlue60Color)
 
         return output
     }
diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index d87f65172..473408d8a 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -247,7 +247,7 @@ class SPAuthViewController: UIViewController {
         setupNavigationController()
         startListeningToNotifications()
 
-        refreshVisibleElements()
+        refreshInputViews()
         refreshActionViews()
         reloadInputViewsFromState()
 
@@ -303,13 +303,13 @@ private extension SPAuthViewController {
         navigationController?.setNavigationBarHidden(false, animated: true)
     }
 
-    func refreshVisibleElements() {
-        let visibleElements = mode.visibleElements
+    func refreshInputViews() {
+        let inputElements = mode.inputElements
         
-        emailInputView.isHidden         = !visibleElements.contains(.username)
-        passwordInputView.isHidden      = !visibleElements.contains(.password)
-        codeInputView.isHidden          = !visibleElements.contains(.code)
-        actionsSeparator.isHidden       = !visibleElements.contains(.actionSeparator)
+        emailInputView.isHidden     = !inputElements.contains(.username)
+        passwordInputView.isHidden  = !inputElements.contains(.password)
+        codeInputView.isHidden      = !inputElements.contains(.code)
+        actionsSeparator.isHidden   = !inputElements.contains(.actionSeparator)
     }
     
     func refreshActionViews() {
@@ -716,7 +716,7 @@ private extension SPAuthViewController {
 private extension SPAuthViewController {
 
     func performUsernameValidation() -> AuthenticationValidator.Result {
-        guard mode.visibleElements.contains(.username) else {
+        guard mode.inputElements.contains(.username) else {
             return .success
         }
 
@@ -727,7 +727,7 @@ private extension SPAuthViewController {
     /// That's where the `validationStyle` comes in.
     ///
     func performPasswordValidation() -> AuthenticationValidator.Result {
-        guard mode.visibleElements.contains(.password) else {
+        guard mode.inputElements.contains(.password) else {
             return .success
         }
 
@@ -735,7 +735,7 @@ private extension SPAuthViewController {
     }
     
     func performCodeValidation() -> AuthenticationValidator.Result {
-        guard mode.visibleElements.contains(.code) else {
+        guard mode.inputElements.contains(.code) else {
             return .success
         }
         
@@ -807,7 +807,7 @@ extension SPAuthViewController: SPTextInputViewDelegate {
         case emailInputView:
             switch performUsernameValidation() {
             case .success:
-                if mode.visibleElements.contains(.password) {
+                if mode.inputElements.contains(.password) {
                     passwordInputView.becomeFirstResponder()
                 } else {
                     performPrimaryActionIfPossible()

From 46a759910c4d9c19ada920a2829ff04829fe1f4e Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 15 Jul 2024 17:31:55 -0300
Subject: [PATCH 293/547] AuthenticationMode: Drops header

---
 Simplenote/AuthenticationMode.swift | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Simplenote/AuthenticationMode.swift b/Simplenote/AuthenticationMode.swift
index d7bef71d0..50a72d0ab 100644
--- a/Simplenote/AuthenticationMode.swift
+++ b/Simplenote/AuthenticationMode.swift
@@ -1,11 +1,3 @@
-//
-//  AuthenticationMode.swift
-//  Simplenote
-//
-//  Created by Jorge Leandro Perez on 7/15/24.
-//  Copyright © 2024 Automattic. All rights reserved.
-//
-
 import Foundation
 
 

From 7f59dfe9e9dce2e81d94694f5371901f44d8599e Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 15 Jul 2024 17:32:52 -0300
Subject: [PATCH 294/547] SPAuthViewController: Simplifies Logic

---
 Simplenote/Classes/SPAuthViewController.swift | 45 +++----------------
 1 file changed, 7 insertions(+), 38 deletions(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index 473408d8a..c78d81f9a 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -386,10 +386,10 @@ extension SPAuthViewController {
     /// Whenever the input is Valid, we'll perform the Primary Action
     ///
     func performPrimaryActionIfPossible() {
-        guard isInputValid else {
+        guard ensureWarningsAreOnScreenWhenNeeded() else {
             return
         }
-        
+
         guard let primaryActionDescriptor = mode.actions.first(where: { $0.name == .primary}) else {
             assertionFailure()
             return
@@ -433,6 +433,10 @@ extension SPAuthViewController {
     }
     
     @IBAction func performLogInWithCode() {
+        guard ensureWarningsAreOnScreenWhenNeeded() else {
+            return
+        }
+
         Task { @MainActor in
             lockdownInterface()
             
@@ -803,42 +807,7 @@ extension SPAuthViewController: SPTextInputViewDelegate {
     }
 
     func textInputShouldReturn(_ textInput: SPTextInputView) -> Bool {
-        switch textInput {
-        case emailInputView:
-            switch performUsernameValidation() {
-            case .success:
-                if mode.inputElements.contains(.password) {
-                    passwordInputView.becomeFirstResponder()
-                } else {
-                    performPrimaryActionIfPossible()
-                }
-
-            case let error:
-                displayEmailValidationWarning(error.description)
-            }
-
-        case passwordInputView:
-            switch performPasswordValidation() {
-            case .success:
-                performPrimaryActionIfPossible()
-
-            case let error:
-                displayPasswordValidationWarning(error.description)
-            }
-
-        case codeInputView:
-            switch performCodeValidation() {
-            case .success:
-                performPrimaryActionIfPossible()
-                
-            case let error:
-                displayCodeValidationWarning(error.description)
-            }
-            
-        default:
-            break
-        }
-
+        performPrimaryActionIfPossible()
         return false
     }
 }

From f95242f1f420138c6756bba48e6e82a5dbaadef9 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 15 Jul 2024 19:53:10 -0300
Subject: [PATCH 295/547] SPAuthViewController: Implements Header

---
 Simplenote/AuthenticationMode.swift           | 29 +++++++++++
 Simplenote/Classes/SPAuthViewController.swift | 16 ++++++
 Simplenote/Classes/SPAuthViewController.xib   | 51 ++++++++++++++-----
 3 files changed, 84 insertions(+), 12 deletions(-)

diff --git a/Simplenote/AuthenticationMode.swift b/Simplenote/AuthenticationMode.swift
index 50a72d0ab..4d9e437ef 100644
--- a/Simplenote/AuthenticationMode.swift
+++ b/Simplenote/AuthenticationMode.swift
@@ -50,11 +50,39 @@ struct AuthenticationActionDescriptor {
 //
 struct AuthenticationMode {
     let title: String
+    let header: String?
     let inputElements: AuthenticationInputElements
     let validationStyle: AuthenticationValidator.Style
     let actions: [AuthenticationActionDescriptor]
+    
+    init(title: String, header: String? = nil, inputElements: AuthenticationInputElements, validationStyle: AuthenticationValidator.Style, actions: [AuthenticationActionDescriptor]) {
+        self.title = title
+        self.header = header
+        self.inputElements = inputElements
+        self.validationStyle = validationStyle
+        self.actions = actions
+    }
 }
 
+
+// MARK: - Public Properties
+//
+extension AuthenticationMode {
+    
+    func buildHeaderText(email: String) -> NSAttributedString? {
+        guard let header = header?.replacingOccurrences(of: "{{EMAIL}}", with: email) else {
+            return nil
+        }
+                
+        return NSMutableAttributedString(string: header, attributes: [
+            .font: UIFont.preferredFont(for: .headline, weight: .regular)
+        ], highlighting: email, highlightAttributes: [
+            .font: UIFont.preferredFont(for: .headline, weight: .bold)
+        ])
+    }
+}
+
+
 // MARK: - Default Operation Modes
 //
 extension AuthenticationMode {
@@ -95,6 +123,7 @@ extension AuthenticationMode {
     ///
     static var loginWithCode: AuthenticationMode {
         return .init(title: NSLocalizedString("Enter Code", comment: "LogIn Interface Title"),
+                     header: NSLocalizedString("We've sent a code to {{EMAIL}}. The code will be valid for a few minutes.", comment: "Header for the Login with Code UI. Please preserve the {{EMAIL}} string as is!"),
                      inputElements: [.code, .actionSeparator],
                      validationStyle: .legacy,
                      actions: [
diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index c78d81f9a..9029dee60 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -15,6 +15,14 @@ class SPAuthViewController: UIViewController {
     ///
     @IBOutlet private var stackView: UIStackView!
 
+    /// # Header: Container View
+    ///
+    @IBOutlet private var headerContainerView: UIView!
+    
+    /// # Header: Title Label
+    ///
+    @IBOutlet private var headerLabel: SPLabel!
+
     /// # Email: Input Field
     ///
     @IBOutlet private var emailInputView: SPTextInputView! {
@@ -247,6 +255,7 @@ class SPAuthViewController: UIViewController {
         setupNavigationController()
         startListeningToNotifications()
 
+        refreshHeaderView()
         refreshInputViews()
         refreshActionViews()
         reloadInputViewsFromState()
@@ -303,6 +312,13 @@ private extension SPAuthViewController {
         navigationController?.setNavigationBarHidden(false, animated: true)
     }
 
+    func refreshHeaderView() {
+        let headerText = mode.buildHeaderText(email: email)
+
+        headerLabel.attributedText = headerText
+        headerContainerView.isHidden = headerText == nil
+    }
+    
     func refreshInputViews() {
         let inputElements = mode.inputElements
         
diff --git a/Simplenote/Classes/SPAuthViewController.xib b/Simplenote/Classes/SPAuthViewController.xib
index 4febb6038..347f23d54 100644
--- a/Simplenote/Classes/SPAuthViewController.xib
+++ b/Simplenote/Classes/SPAuthViewController.xib
@@ -17,6 +17,8 @@
                 <outlet property="codeWarningLabel" destination="Jbg-WU-heV" id="Qjt-NJ-s8f"/>
                 <outlet property="emailInputView" destination="hW6-K1-OyV" id="TyC-Uh-Kaf"/>
                 <outlet property="emailWarningLabel" destination="n7T-Gj-plH" id="STx-wz-jKg"/>
+                <outlet property="headerContainerView" destination="21r-m3-SHF" id="Xq3-9q-6S5"/>
+                <outlet property="headerLabel" destination="dyz-Qu-NbA" id="NTY-Hk-4TL"/>
                 <outlet property="passwordInputView" destination="pdF-nK-gXE" id="18P-SU-c90"/>
                 <outlet property="passwordWarningLabel" destination="UyC-If-pXj" id="D2M-PR-Tph"/>
                 <outlet property="primaryActionButton" destination="q3p-Ji-dOm" id="l1t-x0-zva"/>
@@ -35,10 +37,30 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="CJS-5O-pxK">
-                    <rect key="frame" x="332" y="60" width="360" height="486"/>
+                    <rect key="frame" x="332" y="60" width="360" height="544"/>
                     <subviews>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="21r-m3-SHF" userLabel="Header View">
+                            <rect key="frame" x="0.0" y="0.0" width="360" height="50"/>
+                            <subviews>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="#Invalid email#" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dyz-Qu-NbA" userLabel="#Header#" customClass="SPLabel" customModule="Simplenote" customModuleProvider="target">
+                                    <rect key="frame" x="0.0" y="0.0" width="360" height="22"/>
+                                    <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
+                                    <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                            </subviews>
+                            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                            <constraints>
+                                <constraint firstItem="dyz-Qu-NbA" firstAttribute="leading" secondItem="21r-m3-SHF" secondAttribute="leading" id="b5f-gA-Nwm"/>
+                                <constraint firstItem="dyz-Qu-NbA" firstAttribute="top" secondItem="21r-m3-SHF" secondAttribute="top" id="c6e-bm-SCF"/>
+                                <constraint firstAttribute="bottom" secondItem="dyz-Qu-NbA" secondAttribute="bottom" constant="28" id="cXX-Ay-fX0"/>
+                                <constraint firstAttribute="trailing" secondItem="dyz-Qu-NbA" secondAttribute="trailing" id="cXw-PW-hT0"/>
+                                <constraint firstAttribute="trailing" secondItem="dyz-Qu-NbA" secondAttribute="trailing" id="fo5-rG-yNP"/>
+                                <constraint firstItem="dyz-Qu-NbA" firstAttribute="leading" secondItem="21r-m3-SHF" secondAttribute="leading" id="mLJ-h5-MHz"/>
+                            </constraints>
+                        </view>
                         <view contentMode="center" translatesAutoresizingMaskIntoConstraints="NO" id="hW6-K1-OyV" userLabel="Email Input View" customClass="SPTextInputView" customModule="Simplenote" customModuleProvider="target">
-                            <rect key="frame" x="0.0" y="0.0" width="360" height="44"/>
+                            <rect key="frame" x="0.0" y="58" width="360" height="44"/>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="44" id="fUk-5j-zZS"/>
@@ -48,13 +70,13 @@
                             </userDefinedRuntimeAttributes>
                         </view>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="#Invalid email#" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="n7T-Gj-plH" customClass="SPLabel" customModule="Simplenote" customModuleProvider="target">
-                            <rect key="frame" x="0.0" y="52" width="102.5" height="18"/>
+                            <rect key="frame" x="0.0" y="110" width="102.5" height="18"/>
                             <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
                             <color key="textColor" systemColor="systemPinkColor"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <view contentMode="center" translatesAutoresizingMaskIntoConstraints="NO" id="pdF-nK-gXE" userLabel="Password Input View" customClass="SPTextInputView" customModule="Simplenote" customModuleProvider="target">
-                            <rect key="frame" x="0.0" y="78" width="360" height="44"/>
+                            <rect key="frame" x="0.0" y="136" width="360" height="44"/>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="44" id="uss-fG-PtW"/>
@@ -64,13 +86,13 @@
                             </userDefinedRuntimeAttributes>
                         </view>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="#Invalid password#" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UyC-If-pXj" customClass="SPLabel" customModule="Simplenote" customModuleProvider="target">
-                            <rect key="frame" x="0.0" y="130" width="132" height="18"/>
+                            <rect key="frame" x="0.0" y="188" width="132" height="18"/>
                             <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
                             <color key="textColor" systemColor="systemRedColor"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <view contentMode="center" translatesAutoresizingMaskIntoConstraints="NO" id="OP1-hm-GRS" userLabel="Code Input View" customClass="SPTextInputView" customModule="Simplenote" customModuleProvider="target">
-                            <rect key="frame" x="0.0" y="156" width="360" height="44"/>
+                            <rect key="frame" x="0.0" y="214" width="360" height="44"/>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="44" id="im0-Ei-pV0"/>
@@ -80,13 +102,13 @@
                             </userDefinedRuntimeAttributes>
                         </view>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="#Invalid code#" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Jbg-WU-heV" userLabel="#Invalid code#" customClass="SPLabel" customModule="Simplenote" customModuleProvider="target">
-                            <rect key="frame" x="0.0" y="208" width="100.5" height="18"/>
+                            <rect key="frame" x="0.0" y="266" width="100.5" height="18"/>
                             <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
                             <color key="textColor" systemColor="systemRedColor"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CGr-O3-MBQ" userLabel="Primary Action View">
-                            <rect key="frame" x="0.0" y="234" width="360" height="44"/>
+                            <rect key="frame" x="0.0" y="292" width="360" height="44"/>
                             <subviews>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="q3p-Ji-dOm" customClass="SPSquaredButton" customModule="Simplenote" customModuleProvider="target">
                                     <rect key="frame" x="0.0" y="0.0" width="360" height="44"/>
@@ -109,7 +131,7 @@
                             </constraints>
                         </view>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PfS-vU-7i3">
-                            <rect key="frame" x="0.0" y="286" width="360" height="44"/>
+                            <rect key="frame" x="0.0" y="344" width="360" height="44"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="44" id="u8s-d9-Em4"/>
                             </constraints>
@@ -119,7 +141,7 @@
                             </state>
                         </button>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Kpm-3a-0Z7" userLabel="Actions Separator View">
-                            <rect key="frame" x="0.0" y="338" width="360" height="44"/>
+                            <rect key="frame" x="0.0" y="396" width="360" height="44"/>
                             <subviews>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1Ls-SS-l0Q" userLabel="Leading View">
                                     <rect key="frame" x="0.0" y="21.5" width="167" height="1"/>
@@ -156,7 +178,7 @@
                             </constraints>
                         </view>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Uy8-va-3uF" userLabel="#Tertiary#" customClass="SPSquaredButton" customModule="Simplenote" customModuleProvider="target">
-                            <rect key="frame" x="0.0" y="390" width="360" height="44"/>
+                            <rect key="frame" x="0.0" y="448" width="360" height="44"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="44" id="lt7-Yn-pzG"/>
                             </constraints>
@@ -166,7 +188,7 @@
                             </state>
                         </button>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ILr-Ij-XBq" userLabel="#Quaternary#" customClass="SPSquaredButton" customModule="Simplenote" customModuleProvider="target">
-                            <rect key="frame" x="0.0" y="442" width="360" height="44"/>
+                            <rect key="frame" x="0.0" y="500" width="360" height="44"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="44" id="cE4-3n-khh"/>
                             </constraints>
@@ -184,9 +206,11 @@
                         <constraint firstAttribute="trailing" secondItem="OP1-hm-GRS" secondAttribute="trailing" id="R55-ao-psA"/>
                         <constraint firstAttribute="trailing" secondItem="hW6-K1-OyV" secondAttribute="trailing" id="RSC-Vk-xbB"/>
                         <constraint firstItem="Kpm-3a-0Z7" firstAttribute="leading" secondItem="CJS-5O-pxK" secondAttribute="leading" id="S94-pS-Aza"/>
+                        <constraint firstAttribute="trailing" secondItem="21r-m3-SHF" secondAttribute="trailing" id="TYA-Ld-6r8"/>
                         <constraint firstItem="hW6-K1-OyV" firstAttribute="leading" secondItem="CJS-5O-pxK" secondAttribute="leading" id="UoC-hu-yxe"/>
                         <constraint firstItem="ILr-Ij-XBq" firstAttribute="leading" secondItem="CJS-5O-pxK" secondAttribute="leading" id="Wey-0k-g9U"/>
                         <constraint firstAttribute="trailing" secondItem="ILr-Ij-XBq" secondAttribute="trailing" id="dxd-sM-fG7"/>
+                        <constraint firstItem="21r-m3-SHF" firstAttribute="leading" secondItem="CJS-5O-pxK" secondAttribute="leading" id="gL3-JZ-h7b"/>
                         <constraint firstAttribute="width" relation="lessThanOrEqual" constant="360" id="nLp-JP-Ott"/>
                         <constraint firstItem="Uy8-va-3uF" firstAttribute="leading" secondItem="CJS-5O-pxK" secondAttribute="leading" id="s8W-Vc-jxA"/>
                         <constraint firstAttribute="trailing" secondItem="Uy8-va-3uF" secondAttribute="trailing" id="sI0-Z8-I2B"/>
@@ -219,6 +243,9 @@
         <designable name="UyC-If-pXj">
             <size key="intrinsicContentSize" width="132" height="18"/>
         </designable>
+        <designable name="dyz-Qu-NbA">
+            <size key="intrinsicContentSize" width="102.5" height="18"/>
+        </designable>
         <designable name="n7T-Gj-plH">
             <size key="intrinsicContentSize" width="102.5" height="18"/>
         </designable>

From 1420a798c0f5569bfa7f9d4275445e5357e45440 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 15 Jul 2024 20:03:59 -0300
Subject: [PATCH 296/547] MagicLinkAuthenticator: Fixes threading issue

---
 Simplenote/Classes/MagicLinkAuthenticator.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Simplenote/Classes/MagicLinkAuthenticator.swift b/Simplenote/Classes/MagicLinkAuthenticator.swift
index cc8cbcee4..b5ba213f2 100644
--- a/Simplenote/Classes/MagicLinkAuthenticator.swift
+++ b/Simplenote/Classes/MagicLinkAuthenticator.swift
@@ -60,7 +60,7 @@ private extension MagicLinkAuthenticator {
         NSLog("[MagicLinkAuthenticator] Requesting SyncToken for \(email) and \(authCode)")
         NotificationCenter.default.post(name: .magicLinkAuthWillStart, object: nil)
 
-        Task {
+        Task { @MainActor in
             do {
                 let remote = LoginRemote()
                 let confirmation = try await remote.requestLoginConfirmation(email: email, authCode: authCode)

From 17cef6b900f51d7e6522ce817184a3db0435f31a Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 15 Jul 2024 20:04:12 -0300
Subject: [PATCH 297/547] SPOnboardingViewController: Fixes Invalid Link
 Handling

---
 Simplenote/Classes/SPOnboardingViewController.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Simplenote/Classes/SPOnboardingViewController.swift b/Simplenote/Classes/SPOnboardingViewController.swift
index f8d9094e4..c7c453ed2 100644
--- a/Simplenote/Classes/SPOnboardingViewController.swift
+++ b/Simplenote/Classes/SPOnboardingViewController.swift
@@ -221,7 +221,7 @@ private extension SPOnboardingViewController {
         hostingController.modalPresentationStyle = .formSheet
         hostingController.sheetPresentationController?.detents = [.medium()]
 
-        let presenter = presentedViewController ?? self
+        let presenter = navigationController?.visibleViewController ?? self
         presenter.present(hostingController, animated: true)
     }
     

From 79ca0872218a4a55042a942c60965a51722f190b Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Tue, 16 Jul 2024 17:09:51 -0300
Subject: [PATCH 298/547] New UIAlertController Extension

---
 Simplenote.xcodeproj/project.pbxproj    |  4 ++++
 Simplenote/UIAlertController+Auth.swift | 27 +++++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 Simplenote/UIAlertController+Auth.swift

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index 6a0958985..484f5cb70 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -241,6 +241,7 @@
 		B518899E1E0D5EF800E71B83 /* SPContactsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B518899D1E0D5EF800E71B83 /* SPContactsManager.swift */; };
 		B51889A01E0D5F2200E71B83 /* Contacts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B518899F1E0D5F2200E71B83 /* Contacts.framework */; };
 		B51889A41E0DB01E00E71B83 /* ContactsUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B51889A31E0DB01E00E71B83 /* ContactsUI.framework */; };
+		B51C71B12C47011A0065F610 /* UIAlertController+Auth.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51C71B02C47011A0065F610 /* UIAlertController+Auth.swift */; };
 		B51F6DD12460C3EE0074DDD9 /* AuthenticationValidator.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51F6DD02460C3EE0074DDD9 /* AuthenticationValidator.swift */; };
 		B51F6DD32460D12B0074DDD9 /* AuthenticationValidatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51F6DD22460D12B0074DDD9 /* AuthenticationValidatorTests.swift */; };
 		B51F6DD52460D7540074DDD9 /* NSPredicate+Email.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51F6DD42460D7540074DDD9 /* NSPredicate+Email.swift */; };
@@ -943,6 +944,7 @@
 		B518899D1E0D5EF800E71B83 /* SPContactsManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SPContactsManager.swift; path = Classes/SPContactsManager.swift; sourceTree = "<group>"; };
 		B518899F1E0D5F2200E71B83 /* Contacts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Contacts.framework; path = System/Library/Frameworks/Contacts.framework; sourceTree = SDKROOT; };
 		B51889A31E0DB01E00E71B83 /* ContactsUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ContactsUI.framework; path = System/Library/Frameworks/ContactsUI.framework; sourceTree = SDKROOT; };
+		B51C71B02C47011A0065F610 /* UIAlertController+Auth.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIAlertController+Auth.swift"; sourceTree = "<group>"; };
 		B51F6DD02460C3EE0074DDD9 /* AuthenticationValidator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationValidator.swift; sourceTree = "<group>"; };
 		B51F6DD22460D12B0074DDD9 /* AuthenticationValidatorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationValidatorTests.swift; sourceTree = "<group>"; };
 		B51F6DD42460D7540074DDD9 /* NSPredicate+Email.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSPredicate+Email.swift"; sourceTree = "<group>"; };
@@ -2083,6 +2085,7 @@
 				B5C99A502C45B94600728813 /* AuthenticationMode.swift */,
 				B56A695F22F9D53400B90398 /* SPAuthViewController.swift */,
 				B56A695E22F9D53300B90398 /* SPAuthViewController.xib */,
+				B51C71B02C47011A0065F610 /* UIAlertController+Auth.swift */,
 				B5AB169722FA124F00B4EBA5 /* SPSheetController.swift */,
 				B5AB169922FA128000B4EBA5 /* SPSheetController.xib */,
 				A6CDD9C725F0163D00E0BC4D /* MagicLinkAuthenticator.swift */,
@@ -3643,6 +3646,7 @@
 				46A3C98F17DFA81A002865AE /* SPNoteListViewController.m in Sources */,
 				B5BD6AF51BF66093004ECE33 /* SPMarkdownPreviewViewController.m in Sources */,
 				B5F3FFFF23F44679007A7C59 /* SPSortBar.swift in Sources */,
+				B51C71B12C47011A0065F610 /* UIAlertController+Auth.swift in Sources */,
 				BA4499C525ED95E5000C563E /* NoticeAction.swift in Sources */,
 				A6E02778256E9487002054DF /* PinLockSetupController.swift in Sources */,
 				B513F2B42319A8D50021CFA4 /* SPNoteTableViewCell.swift in Sources */,
diff --git a/Simplenote/UIAlertController+Auth.swift b/Simplenote/UIAlertController+Auth.swift
new file mode 100644
index 000000000..c25a13f57
--- /dev/null
+++ b/Simplenote/UIAlertController+Auth.swift
@@ -0,0 +1,27 @@
+import Foundation
+
+
+// MARK: - Rate Limiting Alert
+//
+extension UIAlertController {
+    
+    static func buildExcessiveLoginCodesRequestedAlert(onDisplayLogin: @escaping () -> Void) -> UIAlertController {
+        let alertController = UIAlertController(title: RateLimitStrings.title, message: RateLimitStrings.message, preferredStyle: .alert)
+        alertController.addCancelActionWithTitle(RateLimitStrings.cancel)
+        alertController.addDefaultActionWithTitle(RateLimitStrings.login) { _ in
+            onDisplayLogin()
+        }
+
+        return alertController
+    }
+}
+
+
+// MARK: - Shared Strings
+//
+private enum RateLimitStrings {
+    static let title = NSLocalizedString("Too Many Requests", comment: "Too Many Requests Alert Title")
+    static let message = NSLocalizedString("Please proceed with password authentication", comment: "Too Many Requests Alert Message")
+    static let cancel = NSLocalizedString("Cancel", comment: "Cancel Action")
+    static let login  = NSLocalizedString("Accept", comment: "Log In Action")
+}

From a1a23791eeeeb3cc82d7c4415fc6607a469d1639 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Tue, 16 Jul 2024 17:10:00 -0300
Subject: [PATCH 299/547] SPAuthError: New generic error

---
 Simplenote/Classes/SPAuthError.swift | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Simplenote/Classes/SPAuthError.swift b/Simplenote/Classes/SPAuthError.swift
index 21d3e61a3..dbea55c53 100644
--- a/Simplenote/Classes/SPAuthError.swift
+++ b/Simplenote/Classes/SPAuthError.swift
@@ -10,6 +10,7 @@ enum SPAuthError: Error {
     case compromisedPassword
     case unverifiedEmail
     case tooManyAttempts
+    case generic
     case unknown(statusCode: Int, response: String?, error: Error?)
 }
 
@@ -89,7 +90,7 @@ extension SPAuthError {
             return NSLocalizedString("You must verify your email before being able to login.", comment: "Error for un verified email")
         case .tooManyAttempts:
             return NSLocalizedString("Too many login attempts. Try again later.", comment: "Error message for too many login attempts")
-        case .unknown:
+        default:
             return NSLocalizedString("We're having problems. Please try again soon.", comment: "Generic error")
         }
     }

From 3f5f530f5d9739e4cd48cf10d1ecdf0f97346a2a Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Tue, 16 Jul 2024 17:10:16 -0300
Subject: [PATCH 300/547] AuthViewController: Handling tooManyAttempts

---
 Simplenote/Classes/SPAuthViewController.swift | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index 9029dee60..4f8bde1c6 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -435,13 +435,16 @@ extension SPAuthViewController {
         lockdownInterface()
 
         controller.requestLoginEmail(username: email) { error in
-// TODO: 429 (Rate Limited)? push PW auth instead
-
-            if let error {
-                self.handleError(error: error)
-            } else {
+            switch error {
+            case .none:
                 self.presentCodeInterface()
                 SPTracker.trackLoginLinkRequested()
+                
+            case .tooManyAttempts:
+                self.presentExcessiveCodesRequestedAlert()
+                
+            case .some(let error):
+                self.handleError(error: error)
             }
 
             self.unlockInterface()
@@ -662,6 +665,14 @@ private extension SPAuthViewController {
         present(navigationController, animated: true, completion: nil)
     }
 
+    func presentExcessiveCodesRequestedAlert() {
+        let alertController = UIAlertController.buildExcessiveLoginCodesRequestedAlert { [weak self] in
+            self?.presentPasswordInterface()
+        }
+        
+        present(alertController, animated: true)
+    }
+
     func presentGenericError(error: SPAuthError) {
         let alertController = UIAlertController(title: error.title, message: error.message, preferredStyle: .alert)
         alertController.addDefaultActionWithTitle(AuthenticationStrings.acceptActionText)

From 6e2c23e9ab7e9e6a676082c761e2e7a66a9ad73a Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Tue, 16 Jul 2024 17:10:31 -0300
Subject: [PATCH 301/547] AuthViewController: Fixing missing error handler

---
 Simplenote/Classes/SPAuthViewController.swift | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index 4f8bde1c6..0f7653f26 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -462,11 +462,12 @@ extension SPAuthViewController {
             do {
                 try await controller.loginWithCode(username: state.username, code: state.code)
                 SPTracker.trackLoginLinkConfirmationSuccess()
-            } catch let error as SPAuthError {
-                SPTracker.trackLoginLinkConfirmationFailure()
-                self.handleError(error: error)
             } catch {
-// TODO: Fixme
+                /// Errors will always be of the `SPAuthError` type. Let's switch to Typed Errors, as soon as we migrate over to Xcode 16
+                let error = error as? SPAuthError ?? .generic
+                self.handleError(error: error)
+
+                SPTracker.trackLoginLinkConfirmationFailure()
             }
             
             unlockInterface()

From e03b833697cacb21927f4d52cb3b6d83eed8c838 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Tue, 16 Jul 2024 17:43:20 -0300
Subject: [PATCH 302/547] AuthViewController: Pushing Login UI on Rate Limit

---
 Simplenote/AuthenticationMode.swift           |  3 ++-
 Simplenote/Classes/SPAuthViewController.swift | 13 +++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Simplenote/AuthenticationMode.swift b/Simplenote/AuthenticationMode.swift
index 4d9e437ef..0b5e88a7a 100644
--- a/Simplenote/AuthenticationMode.swift
+++ b/Simplenote/AuthenticationMode.swift
@@ -89,8 +89,9 @@ extension AuthenticationMode {
 
     /// Login with Password
     ///
-    static var loginWithPassword: AuthenticationMode {
+    static func loginWithPassword(header: String? = nil) -> AuthenticationMode {
         return .init(title: NSLocalizedString("Log In with Password", comment: "LogIn Interface Title"),
+                     header: header,
                      inputElements: [.password],
                      validationStyle: .legacy,
                      actions: [
diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index 0f7653f26..6a85d1f68 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -441,7 +441,7 @@ extension SPAuthViewController {
                 SPTracker.trackLoginLinkRequested()
                 
             case .tooManyAttempts:
-                self.presentExcessiveCodesRequestedAlert()
+                self.presentPasswordInterfaceWithRateLimitingHeader()
                 
             case .some(let error):
                 self.handleError(error: error)
@@ -514,10 +514,14 @@ extension SPAuthViewController {
         present(safariViewController, animated: true, completion: nil)
     }
     
-    @IBAction func presentPasswordInterface() {
-        let viewController = SPAuthViewController(controller: controller, mode: .loginWithPassword, state: state)
+    @IBAction func presentPasswordInterface(header: String? = nil) {
+        let viewController = SPAuthViewController(controller: controller, mode: .loginWithPassword(header: header), state: state)
         navigationController?.pushViewController(viewController, animated: true)
     }
+    
+    @IBAction func presentPasswordInterfaceWithRateLimitingHeader() {
+        presentPasswordInterface(header: AuthenticationStrings.loginWithEmailLimitHeader)
+    }
 }
 
 
@@ -686,7 +690,7 @@ private extension SPAuthViewController {
         }
 
         // Prefill the LoginViewController
-        let loginViewController = SPAuthViewController(controller: controller, mode: .loginWithPassword, state: state)
+        let loginViewController = SPAuthViewController(controller: controller, mode: .loginWithPassword(), state: state)
         loginViewController.loadViewIfNeeded()
 
         // Swap the current VC
@@ -851,6 +855,7 @@ private enum AuthenticationStrings {
     static let acceptActionText             = NSLocalizedString("Accept", comment: "Accept Action")
     static let cancelActionText             = NSLocalizedString("Cancel", comment: "Cancel Action")
     static let loginActionText              = NSLocalizedString("Log In", comment: "Log In Action")
+    static let loginWithEmailLimitHeader    = NSLocalizedString("Log in with email failed, please enter your password", comment: "Header for Enter Password UI, when the user performed too many requests")
     static let compromisedAlertCancel       = NSLocalizedString("Cancel", comment: "Cancel action for password alert")
     static let compromisedAlertReset        = NSLocalizedString("Change Password", comment: "Change password action")
     static let unverifiedCancelText         = NSLocalizedString("Ok", comment: "Email unverified alert dismiss")

From 6dd795f08eb5802b142fe44b377dae20664ecc31 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Tue, 16 Jul 2024 17:43:44 -0300
Subject: [PATCH 303/547] Drops UIAlertController+Auth

---
 Simplenote.xcodeproj/project.pbxproj    |  4 ----
 Simplenote/UIAlertController+Auth.swift | 27 -------------------------
 2 files changed, 31 deletions(-)
 delete mode 100644 Simplenote/UIAlertController+Auth.swift

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index 484f5cb70..6a0958985 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -241,7 +241,6 @@
 		B518899E1E0D5EF800E71B83 /* SPContactsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B518899D1E0D5EF800E71B83 /* SPContactsManager.swift */; };
 		B51889A01E0D5F2200E71B83 /* Contacts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B518899F1E0D5F2200E71B83 /* Contacts.framework */; };
 		B51889A41E0DB01E00E71B83 /* ContactsUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B51889A31E0DB01E00E71B83 /* ContactsUI.framework */; };
-		B51C71B12C47011A0065F610 /* UIAlertController+Auth.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51C71B02C47011A0065F610 /* UIAlertController+Auth.swift */; };
 		B51F6DD12460C3EE0074DDD9 /* AuthenticationValidator.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51F6DD02460C3EE0074DDD9 /* AuthenticationValidator.swift */; };
 		B51F6DD32460D12B0074DDD9 /* AuthenticationValidatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51F6DD22460D12B0074DDD9 /* AuthenticationValidatorTests.swift */; };
 		B51F6DD52460D7540074DDD9 /* NSPredicate+Email.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51F6DD42460D7540074DDD9 /* NSPredicate+Email.swift */; };
@@ -944,7 +943,6 @@
 		B518899D1E0D5EF800E71B83 /* SPContactsManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SPContactsManager.swift; path = Classes/SPContactsManager.swift; sourceTree = "<group>"; };
 		B518899F1E0D5F2200E71B83 /* Contacts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Contacts.framework; path = System/Library/Frameworks/Contacts.framework; sourceTree = SDKROOT; };
 		B51889A31E0DB01E00E71B83 /* ContactsUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ContactsUI.framework; path = System/Library/Frameworks/ContactsUI.framework; sourceTree = SDKROOT; };
-		B51C71B02C47011A0065F610 /* UIAlertController+Auth.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIAlertController+Auth.swift"; sourceTree = "<group>"; };
 		B51F6DD02460C3EE0074DDD9 /* AuthenticationValidator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationValidator.swift; sourceTree = "<group>"; };
 		B51F6DD22460D12B0074DDD9 /* AuthenticationValidatorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationValidatorTests.swift; sourceTree = "<group>"; };
 		B51F6DD42460D7540074DDD9 /* NSPredicate+Email.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSPredicate+Email.swift"; sourceTree = "<group>"; };
@@ -2085,7 +2083,6 @@
 				B5C99A502C45B94600728813 /* AuthenticationMode.swift */,
 				B56A695F22F9D53400B90398 /* SPAuthViewController.swift */,
 				B56A695E22F9D53300B90398 /* SPAuthViewController.xib */,
-				B51C71B02C47011A0065F610 /* UIAlertController+Auth.swift */,
 				B5AB169722FA124F00B4EBA5 /* SPSheetController.swift */,
 				B5AB169922FA128000B4EBA5 /* SPSheetController.xib */,
 				A6CDD9C725F0163D00E0BC4D /* MagicLinkAuthenticator.swift */,
@@ -3646,7 +3643,6 @@
 				46A3C98F17DFA81A002865AE /* SPNoteListViewController.m in Sources */,
 				B5BD6AF51BF66093004ECE33 /* SPMarkdownPreviewViewController.m in Sources */,
 				B5F3FFFF23F44679007A7C59 /* SPSortBar.swift in Sources */,
-				B51C71B12C47011A0065F610 /* UIAlertController+Auth.swift in Sources */,
 				BA4499C525ED95E5000C563E /* NoticeAction.swift in Sources */,
 				A6E02778256E9487002054DF /* PinLockSetupController.swift in Sources */,
 				B513F2B42319A8D50021CFA4 /* SPNoteTableViewCell.swift in Sources */,
diff --git a/Simplenote/UIAlertController+Auth.swift b/Simplenote/UIAlertController+Auth.swift
deleted file mode 100644
index c25a13f57..000000000
--- a/Simplenote/UIAlertController+Auth.swift
+++ /dev/null
@@ -1,27 +0,0 @@
-import Foundation
-
-
-// MARK: - Rate Limiting Alert
-//
-extension UIAlertController {
-    
-    static func buildExcessiveLoginCodesRequestedAlert(onDisplayLogin: @escaping () -> Void) -> UIAlertController {
-        let alertController = UIAlertController(title: RateLimitStrings.title, message: RateLimitStrings.message, preferredStyle: .alert)
-        alertController.addCancelActionWithTitle(RateLimitStrings.cancel)
-        alertController.addDefaultActionWithTitle(RateLimitStrings.login) { _ in
-            onDisplayLogin()
-        }
-
-        return alertController
-    }
-}
-
-
-// MARK: - Shared Strings
-//
-private enum RateLimitStrings {
-    static let title = NSLocalizedString("Too Many Requests", comment: "Too Many Requests Alert Title")
-    static let message = NSLocalizedString("Please proceed with password authentication", comment: "Too Many Requests Alert Message")
-    static let cancel = NSLocalizedString("Cancel", comment: "Cancel Action")
-    static let login  = NSLocalizedString("Accept", comment: "Log In Action")
-}

From 0e9763cb119407f18bf1d7e2497f5aa92662661c Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Tue, 16 Jul 2024 17:44:45 -0300
Subject: [PATCH 304/547] SPAuthViewController: Drops dead API

---
 Simplenote/Classes/SPAuthViewController.swift | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index 6a85d1f68..1ce91f23d 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -670,14 +670,6 @@ private extension SPAuthViewController {
         present(navigationController, animated: true, completion: nil)
     }
 
-    func presentExcessiveCodesRequestedAlert() {
-        let alertController = UIAlertController.buildExcessiveLoginCodesRequestedAlert { [weak self] in
-            self?.presentPasswordInterface()
-        }
-        
-        present(alertController, animated: true)
-    }
-
     func presentGenericError(error: SPAuthError) {
         let alertController = UIAlertController(title: error.title, message: error.message, preferredStyle: .alert)
         alertController.addDefaultActionWithTitle(AuthenticationStrings.acceptActionText)

From 38177c6f7f7589f79233c2b9beb75f28e9eaff24 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Tue, 16 Jul 2024 18:01:25 -0300
Subject: [PATCH 305/547] Fix UI Tests

---
 SimplenoteUITests/EmailLogin.swift | 36 +++++++++++++++++++++++++-----
 SimplenoteUITests/UIDs.swift       |  2 ++
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/SimplenoteUITests/EmailLogin.swift b/SimplenoteUITests/EmailLogin.swift
index 0a5615393..0fd5de27f 100644
--- a/SimplenoteUITests/EmailLogin.swift
+++ b/SimplenoteUITests/EmailLogin.swift
@@ -8,17 +8,30 @@ class EmailLogin {
     }
 
     class func close() {
-        /// Back from Password > Email UI
+        /// Back from Password > Code UI
+        ///
         let backFromPasswordUI = app.navigationBars[UID.NavBar.logInWithPassword].buttons.element(boundBy: 0)
         if backFromPasswordUI.exists {
             backFromPasswordUI.tap()
-            _ = app.navigationBars[UID.NavBar.logIn].waitForExistence(timeout: minLoadTimeout)
+        }
+        
+        /// Back from Code UI > Email UI
+        /// Important: When rate-limited, the Code UI is skipped
+        ///
+        let codeNavigationBar = app.navigationBars[UID.NavBar.enterCode]
+        _ = codeNavigationBar.waitForExistence(timeout: minLoadTimeout)
+        
+        if codeNavigationBar.exists {
+            codeNavigationBar.buttons.element(boundBy: 0).tap()
         }
 
         /// Back from Email UI > Onboarding
-        let backButton = app.navigationBars[UID.NavBar.logIn].buttons.element(boundBy: 0)
-        if backButton.isHittable {
-            backButton.tap()
+        ///
+        let emailNavigationBar = app.navigationBars[UID.NavBar.logIn]
+        _ = emailNavigationBar.waitForExistence(timeout: minLoadTimeout)
+
+        if emailNavigationBar.exists {
+            emailNavigationBar.buttons.element(boundBy: 0).tap()
         }
 
         handleSavePasswordPrompt()
@@ -42,6 +55,19 @@ class EmailLogin {
     class func logIn(email: String, password: String) {
         enterEmail(enteredValue: email)
         app.buttons[UID.Button.logInWithEmail].tap()
+        
+        /// Code UI > Password UI
+        /// Important: When rate-limited, the Code UI is skipped
+        ///
+        let codeNavigationBar = app.navigationBars[UID.NavBar.enterCode]
+        _ = codeNavigationBar.waitForExistence(timeout: minLoadTimeout)
+        
+        if codeNavigationBar.exists {
+            app.buttons[UID.Button.enterPassword].tap()
+        }
+        
+        /// Password UI
+        ///
         _ = app.buttons[UID.Button.logIn].waitForExistence(timeout: minLoadTimeout)
         enterPassword(enteredValue: password)
         app.buttons[UID.Button.mainAction].tap()
diff --git a/SimplenoteUITests/UIDs.swift b/SimplenoteUITests/UIDs.swift
index 4075fc887..2a964cbf4 100644
--- a/SimplenoteUITests/UIDs.swift
+++ b/SimplenoteUITests/UIDs.swift
@@ -12,6 +12,7 @@ enum UID {
         static let allNotes = "All Notes"
         static let logIn = "Log In"
         static let logInWithPassword = "Log In with Password"
+        static let enterCode = "Enter Code"
         static let noteEditorPreview = "Preview"
         static let noteEditorOptions = "Options"
         static let trash = "Trash"
@@ -27,6 +28,7 @@ enum UID {
         static let menu = "menu"
         static let signUp = "Sign Up"
         static let logIn = "Log In"
+        static let enterPassword = "Enter password"
         static let mainAction = "Main Action"
         static let logInWithEmail = "Log in with email"
         static let allNotes = "All Notes"

From 1fb735832c8a4ee7b47bf2035179f7571f866b98 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Tue, 16 Jul 2024 18:51:38 -0300
Subject: [PATCH 306/547] AuthViewController: Fixes enter password crasher

---
 Simplenote/Classes/SPAuthViewController.swift | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index 1ce91f23d..f9fe2519a 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -514,14 +514,18 @@ extension SPAuthViewController {
         present(safariViewController, animated: true, completion: nil)
     }
     
-    @IBAction func presentPasswordInterface(header: String? = nil) {
-        let viewController = SPAuthViewController(controller: controller, mode: .loginWithPassword(header: header), state: state)
-        navigationController?.pushViewController(viewController, animated: true)
+    @IBAction func presentPasswordInterface() {
+        presentPasswordInterface(header: nil)
     }
     
     @IBAction func presentPasswordInterfaceWithRateLimitingHeader() {
         presentPasswordInterface(header: AuthenticationStrings.loginWithEmailLimitHeader)
     }
+
+    @IBAction func presentPasswordInterface(header: String?) {
+        let viewController = SPAuthViewController(controller: controller, mode: .loginWithPassword(header: header), state: state)
+        navigationController?.pushViewController(viewController, animated: true)
+    }
 }
 
 

From 01ec74fbdb5d8d96d5e610f56a89eaa5a55e3d3a Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Tue, 16 Jul 2024 18:52:09 -0300
Subject: [PATCH 307/547] SPAuthViewController: Renames API

---
 Simplenote/Classes/SPAuthViewController.swift | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index f9fe2519a..3ca27de1e 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -515,14 +515,14 @@ extension SPAuthViewController {
     }
     
     @IBAction func presentPasswordInterface() {
-        presentPasswordInterface(header: nil)
+        presentPasswordInterfaceWithHeader(header: nil)
     }
     
     @IBAction func presentPasswordInterfaceWithRateLimitingHeader() {
-        presentPasswordInterface(header: AuthenticationStrings.loginWithEmailLimitHeader)
+        presentPasswordInterfaceWithHeader(header: AuthenticationStrings.loginWithEmailLimitHeader)
     }
 
-    @IBAction func presentPasswordInterface(header: String?) {
+    @IBAction func presentPasswordInterfaceWithHeader(header: String?) {
         let viewController = SPAuthViewController(controller: controller, mode: .loginWithPassword(header: header), state: state)
         navigationController?.pushViewController(viewController, animated: true)
     }

From 5e30ab03512724082a04d8779af133b319fca2bc Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Tue, 16 Jul 2024 18:58:05 -0300
Subject: [PATCH 308/547] AuthViewController: Addressing tech debt

---
 Simplenote/AuthenticationMode.swift           |  2 +-
 Simplenote/Classes/SPAuthViewController.swift | 69 ++++++++++---------
 2 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/Simplenote/AuthenticationMode.swift b/Simplenote/AuthenticationMode.swift
index 0b5e88a7a..3d9fc3fa9 100644
--- a/Simplenote/AuthenticationMode.swift
+++ b/Simplenote/AuthenticationMode.swift
@@ -12,7 +12,7 @@ struct AuthenticationState {
 
 // MARK: - Authentication Elements
 //
-struct AuthenticationInputElements: OptionSet {
+struct AuthenticationInputElements: OptionSet, Hashable {
     let rawValue: UInt
     
     static let username         = AuthenticationInputElements(rawValue: 1 << 0)
diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index 3ca27de1e..c3f50f191 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -197,7 +197,9 @@ class SPAuthViewController: UIViewController {
     /// # Indicates if we've got valid Credentials. Doesn't display any validation warnings onscreen
     ///
     private var isInputValid: Bool {
-        return performUsernameValidation() == .success && performPasswordValidation() == .success && performCodeValidation() == .success
+        performInputElementsValidation().values.allSatisfy { result in
+            result == .success
+        }
     }
 
     /// # Returns the EmailInputView's Text: When empty this getter returns an empty string, instead of nil
@@ -747,31 +749,25 @@ private extension SPAuthViewController {
 //
 private extension SPAuthViewController {
 
-    func performUsernameValidation() -> AuthenticationValidator.Result {
-        guard mode.inputElements.contains(.username) else {
-            return .success
-        }
-
-        return validator.performUsernameValidation(username: email)
-    }
-
     /// When we're in `.login` mode, password requirements are relaxed (since we must allow users with old passwords to sign in).
     /// That's where the `validationStyle` comes in.
     ///
-    func performPasswordValidation() -> AuthenticationValidator.Result {
-        guard mode.inputElements.contains(.password) else {
-            return .success
+    func performInputElementsValidation() -> [AuthenticationInputElements: AuthenticationValidator.Result] {
+        var result = [AuthenticationInputElements: AuthenticationValidator.Result]()
+        
+        if mode.inputElements.contains(.username) {
+            result[.username] = validator.performUsernameValidation(username: email)
         }
-
-        return validator.performPasswordValidation(username: email, password: password, style: mode.validationStyle)
-    }
-    
-    func performCodeValidation() -> AuthenticationValidator.Result {
-        guard mode.inputElements.contains(.code) else {
-            return .success
+        
+        if mode.inputElements.contains(.password) {
+            result[.password] = validator.performPasswordValidation(username: email, password: password, style: mode.validationStyle)
+        }
+        
+        if mode.inputElements.contains(.code) {
+            result[.code] = validator.performCodeValidation(code: state.code)
         }
         
-        return validator.performCodeValidation(code: state.code)
+        return result
     }
 
     /// Whenever we're in `.login` mode, and the password is valid in `.legacy` terms (but invalid in `.strong` mode), we must request the
@@ -781,36 +777,43 @@ private extension SPAuthViewController {
         validator.performPasswordValidation(username: email, password: password, style: .strong) != .success
     }
 
+    /// Validates all of the Input Fields, and presents warnings accordingly.
+    /// - Returns true: When all validations are passed
+    ///
     func ensureWarningsAreOnScreenWhenNeeded() -> Bool {
-        let usernameValidationResult = performUsernameValidation()
-        let passwordValidationResult = performPasswordValidation()
-        let codeValidationResult = performCodeValidation()
+        let validationMap = performInputElementsValidation()
 
-        if usernameValidationResult != .success {
-            displayEmailValidationWarning(usernameValidationResult.description)
+        if let result = validationMap[.username], result != .success {
+            displayEmailValidationWarning(result.description)
         }
 
-        if passwordValidationResult != .success {
-            displayPasswordValidationWarning(passwordValidationResult.description)
+        if let result = validationMap[.password], result != .success {
+            displayPasswordValidationWarning(result.description)
         }
         
-        if codeValidationResult != .success {
-            displayCodeValidationWarning(codeValidationResult.description)
+        if let result = validationMap[.code], result != .success {
+            displayCodeValidationWarning(result.description)
         }
 
-        return usernameValidationResult == .success && passwordValidationResult == .success && codeValidationResult == .success
+        return validationMap.values.allSatisfy { result in
+            result == .success
+        }
     }
 
+    /// Validates all of the Input Fields, and dismisses validation warnings, when possible
+    ///
     func ensureWarningsAreDismissedWhenNeeded() {
-        if performUsernameValidation() == .success {
+        let validationMap = performInputElementsValidation()
+
+        if validationMap[.username] == .success {
             dismissEmailValidationWarning()
         }
 
-        if performPasswordValidation() == .success {
+        if validationMap[.password] == .success {
             dismissPasswordValidationWarning()
         }
         
-        if performCodeValidation() == .success {
+        if validationMap[.code] == .success {
             dismissCodeValidationWarning()
         }
     }

From 35f624206beb5acdb6c6e39b521dd6a9ffb74305 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Tue, 16 Jul 2024 19:10:59 -0300
Subject: [PATCH 309/547] EmailLogin: Early Exit

---
 SimplenoteUITests/EmailLogin.swift | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/SimplenoteUITests/EmailLogin.swift b/SimplenoteUITests/EmailLogin.swift
index 0fd5de27f..333185872 100644
--- a/SimplenoteUITests/EmailLogin.swift
+++ b/SimplenoteUITests/EmailLogin.swift
@@ -8,6 +8,12 @@ class EmailLogin {
     }
 
     class func close() {
+        /// Exit: We're already in the Onboarding UI
+        ///
+        if app.buttons[UID.Button.logIn].exists, app.buttons[UID.Button.signUp].exists {
+            return
+        }
+        
         /// Back from Password > Code UI
         ///
         let backFromPasswordUI = app.navigationBars[UID.NavBar.logInWithPassword].buttons.element(boundBy: 0)

From 5b84e8ed761403ae17b9bd787ec9a3c74f8617ca Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Tue, 16 Jul 2024 19:35:44 -0300
Subject: [PATCH 310/547] EmailLogin: Optimizes UI Tests

---
 SimplenoteUITests/EmailLogin.swift | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/SimplenoteUITests/EmailLogin.swift b/SimplenoteUITests/EmailLogin.swift
index 333185872..fd7c55152 100644
--- a/SimplenoteUITests/EmailLogin.swift
+++ b/SimplenoteUITests/EmailLogin.swift
@@ -19,23 +19,21 @@ class EmailLogin {
         let backFromPasswordUI = app.navigationBars[UID.NavBar.logInWithPassword].buttons.element(boundBy: 0)
         if backFromPasswordUI.exists {
             backFromPasswordUI.tap()
+            _ = app.navigationBars[UID.NavBar.enterCode].waitForExistence(timeout: minLoadTimeout)
         }
         
         /// Back from Code UI > Email UI
         /// Important: When rate-limited, the Code UI is skipped
         ///
         let codeNavigationBar = app.navigationBars[UID.NavBar.enterCode]
-        _ = codeNavigationBar.waitForExistence(timeout: minLoadTimeout)
-        
         if codeNavigationBar.exists {
             codeNavigationBar.buttons.element(boundBy: 0).tap()
+            _ = app.navigationBars[UID.NavBar.logIn].waitForExistence(timeout: minLoadTimeout)
         }
 
         /// Back from Email UI > Onboarding
         ///
         let emailNavigationBar = app.navigationBars[UID.NavBar.logIn]
-        _ = emailNavigationBar.waitForExistence(timeout: minLoadTimeout)
-
         if emailNavigationBar.exists {
             emailNavigationBar.buttons.element(boundBy: 0).tap()
         }

From a774214e2eec8faaf26a4e367d7757d7616268c2 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 22 Jul 2024 10:42:53 +1000
Subject: [PATCH 311/547] Update `release-toolkit` to latest version 11.0.3

---
 Gemfile      |  2 +-
 Gemfile.lock | 64 +++++++++++++++++++++++++++-------------------------
 2 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/Gemfile b/Gemfile
index a2653bc3a..afbcb9832 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,7 @@ gem 'danger-dangermattic', '~> 1.0'
 gem 'fastlane', '~> 2'
 gem 'fastlane-plugin-appcenter', '~> 2.1.2'
 gem 'fastlane-plugin-sentry', '~> 1.6'
-gem 'fastlane-plugin-wpmreleasetoolkit', '~> 11.0.1'
+gem 'fastlane-plugin-wpmreleasetoolkit', '~> 11.0', '>= 11.0.1'
 
 group :screenshots, optional: true do
   gem 'rmagick', '~> 3.2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5f2447ee7..5e891f661 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,7 +5,7 @@ GEM
       base64
       nkf
       rexml
-    activesupport (7.1.3.2)
+    activesupport (7.1.3.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -15,8 +15,8 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
@@ -24,24 +24,24 @@ GEM
     ast (2.4.2)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.921.0)
-    aws-sdk-core (3.193.0)
+    aws-partitions (1.957.0)
+    aws-sdk-core (3.201.2)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.80.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.148.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
+    aws-sdk-kms (1.88.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.156.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.8)
+      aws-sigv4 (~> 1.5)
     aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.2.0)
-    bigdecimal (3.1.7)
+    bigdecimal (3.1.8)
     buildkit (1.6.0)
       sawyer (>= 0.6)
     chroma (0.2.0)
@@ -91,7 +91,7 @@ GEM
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
     cork (0.3.0)
       colored2 (~> 3.1)
@@ -129,7 +129,7 @@ GEM
     escape (0.0.4)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    excon (0.110.0)
+    excon (0.111.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -161,7 +161,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.3.1)
-    fastlane (2.220.0)
+    fastlane (2.221.1)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -205,7 +205,7 @@ GEM
     fastlane-plugin-appcenter (2.1.2)
     fastlane-plugin-sentry (1.22.0)
       os (~> 1.1, >= 1.1.4)
-    fastlane-plugin-wpmreleasetoolkit (11.0.1)
+    fastlane-plugin-wpmreleasetoolkit (11.0.3)
       activesupport (>= 6.1.7.1)
       buildkit (~> 1.5)
       chroma (= 0.2.0)
@@ -266,27 +266,27 @@ GEM
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.5)
+    http-cookie (1.0.6)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.14.4)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     java-properties (0.3.0)
     jmespath (1.6.2)
     json (2.7.2)
-    jwt (2.8.1)
+    jwt (2.8.2)
       base64
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     language_server-protocol (3.17.0.3)
-    mini_magick (4.12.0)
+    mini_magick (4.13.2)
     mini_mime (1.1.5)
-    minitest (5.22.3)
+    minitest (5.24.1)
     molinillo (0.8.0)
     multi_json (1.15.0)
-    multipart-post (2.4.0)
+    multipart-post (2.4.1)
     mutex_m (0.2.0)
     nanaimo (0.3.0)
     nap (1.1.0)
@@ -294,9 +294,9 @@ GEM
     netrc (0.11.0)
     nkf (0.2.0)
     no_proxy_fix (0.1.2)
-    nokogiri (1.16.4-arm64-darwin)
+    nokogiri (1.16.6-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.4-x86_64-linux)
+    nokogiri (1.16.6-x86_64-linux)
       racc (~> 1.4)
     octokit (6.1.1)
       faraday (>= 1, < 3)
@@ -305,16 +305,16 @@ GEM
     options (2.3.2)
     optparse (0.5.0)
     os (1.1.4)
-    parallel (1.24.0)
+    parallel (1.25.1)
     parser (3.3.1.0)
       ast (~> 2.4.1)
       racc
     plist (3.7.1)
-    progress_bar (1.3.3)
-      highline (>= 1.6, < 3)
+    progress_bar (1.3.4)
+      highline (>= 1.6)
       options (~> 2.3.0)
     public_suffix (4.0.7)
-    racc (1.7.3)
+    racc (1.8.0)
     rainbow (3.1.1)
     rake (13.2.1)
     rake-compiler (1.2.7)
@@ -326,7 +326,8 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.6)
+    rexml (3.2.9)
+      strscan
     rmagick (3.2.0)
     rouge (2.0.7)
     rubocop (1.63.4)
@@ -358,6 +359,7 @@ GEM
     simctl (1.6.10)
       CFPropertyList
       naturally
+    strscan (3.1.0)
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -397,8 +399,8 @@ DEPENDENCIES
   fastlane (~> 2)
   fastlane-plugin-appcenter (~> 2.1.2)
   fastlane-plugin-sentry (~> 1.6)
-  fastlane-plugin-wpmreleasetoolkit (~> 11.0.1)
+  fastlane-plugin-wpmreleasetoolkit (~> 11.0, >= 11.0.1)
   rmagick (~> 3.2.0)
 
 BUNDLED WITH
-   2.5.4
+   2.4.21

From bfc2fc0c3ae11d892a624dc049862f1888a1285d Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 22 Jul 2024 10:48:12 +1000
Subject: [PATCH 312/547] Remove unused `Pluginfile` import from `Gemfile`

---
 Gemfile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index afbcb9832..085001d07 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,6 +13,3 @@ gem 'fastlane-plugin-wpmreleasetoolkit', '~> 11.0', '>= 11.0.1'
 group :screenshots, optional: true do
   gem 'rmagick', '~> 3.2.0'
 end
-
-plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
-eval_gemfile(plugins_path) if File.exist?(plugins_path)

From bf9adfd820a69518884371d9bb0c81b841d8e8dc Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 22 Jul 2024 13:19:03 -0300
Subject: [PATCH 313/547] AuthViewController: Adds missing Header

---
 Simplenote/Classes/SPAuthViewController.swift | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index c3f50f191..ea238e232 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -517,7 +517,7 @@ extension SPAuthViewController {
     }
     
     @IBAction func presentPasswordInterface() {
-        presentPasswordInterfaceWithHeader(header: nil)
+        presentPasswordInterfaceWithHeader(header: AuthenticationStrings.loginWithEmailEmailHeader)
     }
     
     @IBAction func presentPasswordInterfaceWithRateLimitingHeader() {
@@ -854,6 +854,7 @@ private enum AuthenticationStrings {
     static let acceptActionText             = NSLocalizedString("Accept", comment: "Accept Action")
     static let cancelActionText             = NSLocalizedString("Cancel", comment: "Cancel Action")
     static let loginActionText              = NSLocalizedString("Log In", comment: "Log In Action")
+    static let loginWithEmailEmailHeader    = NSLocalizedString("Enter the password for the account {{EMAIL}}", comment: "Header for Login With Password. Please preserve the {{EMAIL}} substring")
     static let loginWithEmailLimitHeader    = NSLocalizedString("Log in with email failed, please enter your password", comment: "Header for Enter Password UI, when the user performed too many requests")
     static let compromisedAlertCancel       = NSLocalizedString("Cancel", comment: "Cancel action for password alert")
     static let compromisedAlertReset        = NSLocalizedString("Change Password", comment: "Change password action")

From 2404911d39d3a62526a36535a7210d8e6d49accd Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 22 Jul 2024 15:38:25 -0300
Subject: [PATCH 314/547] RemoteError is now a struct

---
 Simplenote/RemoteError.swift | 50 ++++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 19 deletions(-)

diff --git a/Simplenote/RemoteError.swift b/Simplenote/RemoteError.swift
index 4366d98e1..ebf276aba 100644
--- a/Simplenote/RemoteError.swift
+++ b/Simplenote/RemoteError.swift
@@ -1,38 +1,50 @@
 import Foundation
 
-enum RemoteError: Error {
-    case network
-    case tooManyAttempts
-    case requestError(Int, Error?)
+
+// MARK: - RemoteError
+//
+struct RemoteError: Error {
+    let statusCode: Int
+    let response: String?
+    let networkError: Error?
 }
 
 
+// MARK: - RemoteError
+//
 extension RemoteError {
     
-    init?(statusCode: Int, error: Error? = nil) {
-        if statusCode / 100 == 2 {
+    init?(statusCode: Int?, responseData: Data? = nil, networkError: Error? = nil) {
+        if let statusCode, statusCode / 100 == 2 {
             return nil
         }
+
+        let response = ReponseErrorContainer(body: responseData)
         
-        switch statusCode {
-        case 429:
-            self = .tooManyAttempts
-        default:
-            self = statusCode > 0 ? .requestError(statusCode, error) : .network
-        }
+        self.statusCode = statusCode ?? .zero
+        self.response = response?.error
+        self.networkError = networkError
     }
 }
 
 
 extension RemoteError: Equatable {
     static func == (lhs: RemoteError, rhs: RemoteError) -> Bool {
-        switch (lhs, rhs) {
-        case (.network, .network):
-            return true
-        case (.requestError(let lhsStatus, let lhsError), .requestError(let rhsStatus, let rhsError)):
-            return lhsStatus == rhsStatus && lhsError?.localizedDescription == rhsError?.localizedDescription
-        default:
-            return false
+        lhs.statusCode == rhs.statusCode && lhs.response == rhs.response && lhs.networkError?.localizedDescription == rhs.networkError?.localizedDescription
+    }
+}
+
+
+// MARK: - ReponseErrorContainer
+//
+private struct ReponseErrorContainer: Decodable, Equatable {
+    let error: String
+
+    init?(body: Data?) {
+        guard let body, let decoded = try? JSONDecoder().decode(ReponseErrorContainer.self, from: body) else {
+            return nil
         }
+        
+        self = decoded
     }
 }

From 576cabe669e6f02c26845a8a8ccdace4146209f3 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 22 Jul 2024 15:38:43 -0300
Subject: [PATCH 315/547] Remote: Wiring the new RemoteError Initializer

---
 Simplenote/Remote.swift | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Simplenote/Remote.swift b/Simplenote/Remote.swift
index 5c32883ea..ba5c8c6e7 100644
--- a/Simplenote/Remote.swift
+++ b/Simplenote/Remote.swift
@@ -11,10 +11,10 @@ class Remote {
     /// Sublcassing Notes: To be able to send a task it is required to first setup the URL request for the task to use
     ///
     func performDataTask(with request: URLRequest, completion: @escaping (_ result: Result<Data?, RemoteError>) -> Void) {
-        let dataTask = urlSession.dataTask(with: request) { (data, response, dataTaskError) in
+        let dataTask = urlSession.dataTask(with: request) { (data, response, networkError) in
             DispatchQueue.main.async {
                 
-                if let error = RemoteError(statusCode: response?.responseStatusCode ?? .zero, error: dataTaskError) {
+                if let error = RemoteError(statusCode: response?.responseStatusCode, responseData: data, networkError: networkError) {
                     completion(.failure(error))
                     return
                 }
@@ -30,8 +30,7 @@ class Remote {
     ///
     func performDataTask(with request: URLRequest) async throws -> Data {
         let (data, response) = try await urlSession.data(for: request)
-
-        if let error = RemoteError(statusCode: response.responseStatusCode) {
+        if let error = RemoteError(statusCode: response.responseStatusCode, responseData: data) {
             throw error
         }
         

From f1a5c1e407aea25660e620fc7bc64044c19223ad Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 22 Jul 2024 15:54:34 -0300
Subject: [PATCH 316/547] SPSettingsViewController+Extensions: Fixes build
 error

---
 .../Classes/SPSettingsViewController+Extensions.swift      | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Simplenote/Classes/SPSettingsViewController+Extensions.swift b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
index fb9bcead3..289af3fb8 100644
--- a/Simplenote/Classes/SPSettingsViewController+Extensions.swift
+++ b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
@@ -188,12 +188,7 @@ extension SPSettingsViewController {
     }
 
     private func handleError(_ error: RemoteError) {
-        switch error {
-        case .network:
-            NoticeController.shared.present(NoticeFactory.networkError())
-        default:
-            presentRequestErrorAlert()
-        }
+        presentRequestErrorAlert()
     }
 
     private func presentSuccessAlert(for user: SPUser) {

From 7981f24a07d1e30c6ff2d6faf203f585daf44d09 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 22 Jul 2024 15:57:17 -0300
Subject: [PATCH 317/547] AuthError: New Initializer

---
 Simplenote/Classes/SPAuthError.swift | 30 ++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/Simplenote/Classes/SPAuthError.swift b/Simplenote/Classes/SPAuthError.swift
index dbea55c53..12384b10a 100644
--- a/Simplenote/Classes/SPAuthError.swift
+++ b/Simplenote/Classes/SPAuthError.swift
@@ -11,17 +11,38 @@ enum SPAuthError: Error {
     case unverifiedEmail
     case tooManyAttempts
     case generic
+    case requestNotFound
+    case invalidCode
     case unknown(statusCode: Int, response: String?, error: Error?)
 }
 
+
 // MARK: - SPAuthError Convenience Initializers
 //
 extension SPAuthError {
 
-    /// Returns the SPAuthError matching a given Simperium Login Error Code
+    /// Returns an AuthError matching a RemoteError (Login) Counterpart
+    ///
+    init(loginRemoteError: RemoteError) {
+        self = SPAuthError(loginErrorCode: loginRemoteError.statusCode, response: loginRemoteError.response, error: loginRemoteError.networkError)
+    }
+
+    /// Returns an AuthError matching a RemoteError (Signup) Counterpart
+    ///
+    init(signupRemoteError: RemoteError) {
+        self = SPAuthError(signupErrorCode: signupRemoteError.statusCode, response: signupRemoteError.response, error: signupRemoteError.networkError)
+    }
+
+    /// Returns the AuthError matching a given Simperium Login Error Code
     ///
     init(loginErrorCode: Int, response: String?, error: Error?) {
         switch loginErrorCode {
+        case .zero:
+            self = .network
+        case 400 where response == Constants.requestNotFound:
+            self = .requestNotFound
+        case 400 where response == Constants.invalidCode:
+            self = .invalidCode
         case 401 where response == Constants.compromisedPassword:
             self = .compromisedPassword
         case 401:
@@ -35,10 +56,12 @@ extension SPAuthError {
         }
     }
 
-    /// Returns the SPAuthError matching a given Simperium Signup Error Code
+    /// Returns the AuthError matching a given a Signup Error Code
     ///
     init(signupErrorCode: Int, response: String?, error: Error?) {
         switch signupErrorCode {
+        case .zero:
+            self = .network
         case 401:
             self = .signupBadCredentials
         case 409:
@@ -51,6 +74,7 @@ extension SPAuthError {
     }
 }
 
+
 // MARK: - SPAuthError Public Methods
 //
 extension SPAuthError {
@@ -99,4 +123,6 @@ extension SPAuthError {
 private struct Constants {
     static let compromisedPassword = "compromised password"
     static let requiresVerification = "verification required"
+    static let requestNotFound = "request-not-found"
+    static let invalidCode = "invalid-code"
 }

From 944d83990b7822e85eabdaf05bb30a2cb699b955 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 22 Jul 2024 15:57:31 -0300
Subject: [PATCH 318/547] AuthHandler: Drops error initialization

---
 Simplenote/Classes/SPAuthHandler.swift | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/Simplenote/Classes/SPAuthHandler.swift b/Simplenote/Classes/SPAuthHandler.swift
index 899b30b54..2eba54752 100644
--- a/Simplenote/Classes/SPAuthHandler.swift
+++ b/Simplenote/Classes/SPAuthHandler.swift
@@ -61,8 +61,9 @@ class SPAuthHandler {
             switch result {
             case .success:
                 onCompletion(nil)
-            case .failure(let error):
-                onCompletion(self.authenticationError(for: error))
+            case .failure(let remoteError):
+                let error = SPAuthError(loginRemoteError: remoteError)
+                onCompletion(error)
             }
         }
     }
@@ -76,8 +77,8 @@ class SPAuthHandler {
             let confirmation = try await remote.requestLoginConfirmation(email: username, authCode: code.uppercased())
             simperiumService.authenticate(withUsername: confirmation.username, token: confirmation.syncToken)
             
-        } catch let error as RemoteError {
-            throw authenticationError(for: error)
+        } catch let remoteError as RemoteError {
+            throw SPAuthError(loginRemoteError: remoteError)
         }
     }
 
@@ -94,23 +95,13 @@ class SPAuthHandler {
             switch result {
             case .success:
                 onCompletion(nil)
-            case .failure(let error):
-                onCompletion(self.authenticationError(for: error))
+            case .failure(let remoteError):
+                let error = SPAuthError(signupRemoteError: remoteError)
+                onCompletion(error)
             }
         }
     }
 
-    private func authenticationError(for remoteError: RemoteError) -> SPAuthError {
-        switch remoteError {
-        case .network:
-            return .network
-        case .tooManyAttempts:
-            return .tooManyAttempts
-        case .requestError(let statusCode, let error):
-            return SPAuthError(signupErrorCode: statusCode, response: error?.localizedDescription, error: error)
-        }
-    }
-
     /// Presents the Password Reset (Web) Interface
     ///
     func presentPasswordReset(from sourceViewController: UIViewController, username: String) {

From af37fbecda2fc3e5d05b7b4966679abf0c3addb3 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 22 Jul 2024 16:33:37 -0300
Subject: [PATCH 319/547] AuthViewController: Wiring code expired alert

---
 Simplenote.xcodeproj/project.pbxproj          |  4 ++++
 Simplenote/Classes/SPAuthError.swift          |  4 ++++
 Simplenote/Classes/SPAuthViewController.swift | 23 ++++++++++++++++++
 Simplenote/UIAlertController+Auth.swift       | 24 +++++++++++++++++++
 4 files changed, 55 insertions(+)
 create mode 100644 Simplenote/UIAlertController+Auth.swift

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index 6a0958985..e880d726c 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -298,6 +298,7 @@
 		B54A11C22C135EA2002AC8AA /* UIButton+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54A11C12C135EA2002AC8AA /* UIButton+Simplenote.swift */; };
 		B54A11C42C136225002AC8AA /* MagicLinkRequestedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54A11C32C136225002AC8AA /* MagicLinkRequestedView.swift */; };
 		B54B04D82407169500401FBB /* SPAppDelegate+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54B04D72407169500401FBB /* SPAppDelegate+Extensions.swift */; };
+		B54C1B552C4EE350001E9E18 /* UIAlertController+Auth.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54C1B542C4EE350001E9E18 /* UIAlertController+Auth.swift */; };
 		B54D9C572909BA2600D0E0EC /* StoreManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54D9C562909BA2600D0E0EC /* StoreManager.swift */; };
 		B54D9C592909CC4400D0E0EC /* StoreProduct.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54D9C582909CC4400D0E0EC /* StoreProduct.swift */; };
 		B55051821A4328B9002A1093 /* LocalAuthentication.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B55051811A4328B9002A1093 /* LocalAuthentication.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
@@ -998,6 +999,7 @@
 		B54A11C12C135EA2002AC8AA /* UIButton+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIButton+Simplenote.swift"; sourceTree = "<group>"; };
 		B54A11C32C136225002AC8AA /* MagicLinkRequestedView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MagicLinkRequestedView.swift; sourceTree = "<group>"; };
 		B54B04D72407169500401FBB /* SPAppDelegate+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SPAppDelegate+Extensions.swift"; sourceTree = "<group>"; };
+		B54C1B542C4EE350001E9E18 /* UIAlertController+Auth.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIAlertController+Auth.swift"; sourceTree = "<group>"; };
 		B54D9C542909B21700D0E0EC /* Simplenote 6.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Simplenote 6.xcdatamodel"; sourceTree = "<group>"; };
 		B54D9C562909BA2600D0E0EC /* StoreManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoreManager.swift; sourceTree = "<group>"; };
 		B54D9C582909CC4400D0E0EC /* StoreProduct.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoreProduct.swift; sourceTree = "<group>"; };
@@ -2081,6 +2083,7 @@
 				B56A695D22F9D53300B90398 /* SPAuthError.swift */,
 				B56A695C22F9D53300B90398 /* SPAuthHandler.swift */,
 				B5C99A502C45B94600728813 /* AuthenticationMode.swift */,
+				B54C1B542C4EE350001E9E18 /* UIAlertController+Auth.swift */,
 				B56A695F22F9D53400B90398 /* SPAuthViewController.swift */,
 				B56A695E22F9D53300B90398 /* SPAuthViewController.xib */,
 				B5AB169722FA124F00B4EBA5 /* SPSheetController.swift */,
@@ -3643,6 +3646,7 @@
 				46A3C98F17DFA81A002865AE /* SPNoteListViewController.m in Sources */,
 				B5BD6AF51BF66093004ECE33 /* SPMarkdownPreviewViewController.m in Sources */,
 				B5F3FFFF23F44679007A7C59 /* SPSortBar.swift in Sources */,
+				B54C1B552C4EE350001E9E18 /* UIAlertController+Auth.swift in Sources */,
 				BA4499C525ED95E5000C563E /* NoticeAction.swift in Sources */,
 				A6E02778256E9487002054DF /* PinLockSetupController.swift in Sources */,
 				B513F2B42319A8D50021CFA4 /* SPNoteTableViewCell.swift in Sources */,
diff --git a/Simplenote/Classes/SPAuthError.swift b/Simplenote/Classes/SPAuthError.swift
index 12384b10a..0f5edccf1 100644
--- a/Simplenote/Classes/SPAuthError.swift
+++ b/Simplenote/Classes/SPAuthError.swift
@@ -114,6 +114,10 @@ extension SPAuthError {
             return NSLocalizedString("You must verify your email before being able to login.", comment: "Error for un verified email")
         case .tooManyAttempts:
             return NSLocalizedString("Too many login attempts. Try again later.", comment: "Error message for too many login attempts")
+        case .requestNotFound:
+            return NSLocalizedString("Your authentication code has expired. Please request a new one", comment: "Error message for Invalid Login Code")
+        case .invalidCode:
+            return NSLocalizedString("The code you've entered is not correct. Please try again", comment: "Error message for Invalid Login Code")
         default:
             return NSLocalizedString("We're having problems. Please try again soon.", comment: "Generic error")
         }
diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index ea238e232..ed2079566 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -452,6 +452,19 @@ extension SPAuthViewController {
             self.unlockInterface()
         }
     }
+
+    /// Requests a new Login Code, without pushing any secondary UI on success
+    ///
+    @IBAction func requestLogInCodeAndDontPush() {
+        controller.requestLoginEmail(username: email) { error in
+            if let error {
+                self.handleError(error: error)
+                return
+            }
+            
+            SPTracker.trackLoginLinkRequested()
+        }
+    }
     
     @IBAction func performLogInWithCode() {
         guard ensureWarningsAreOnScreenWhenNeeded() else {
@@ -613,6 +626,8 @@ private extension SPAuthViewController {
             presentPasswordCompromisedError(error: error)
         case .unverifiedEmail:
             presentUserUnverifiedError(error: error, email: email)
+        case .requestNotFound:
+            presentLoginCodeExpiredError()
         case .unknown(let statusCode, let response, let error) where debugEnabled:
             let details = NSAttributedString.stringFromNetworkError(statusCode: statusCode, response: response, error: error)
             presentDebugDetails(details: details)
@@ -640,6 +655,14 @@ private extension SPAuthViewController {
 
         present(alertController, animated: true, completion: nil)
     }
+    
+    func presentLoginCodeExpiredError() {
+        let alertController = UIAlertController.buildLoginCodeNotFoundAlert {
+            self.requestLogInCodeAndDontPush()
+        }
+        
+        present(alertController, animated: true, completion: nil)
+    }
 
     func presentUserUnverifiedError(error: SPAuthError, email: String) {
         let alertController = UIAlertController(title: error.title, message: error.message, preferredStyle: .alert)
diff --git a/Simplenote/UIAlertController+Auth.swift b/Simplenote/UIAlertController+Auth.swift
new file mode 100644
index 000000000..bc33c370e
--- /dev/null
+++ b/Simplenote/UIAlertController+Auth.swift
@@ -0,0 +1,24 @@
+import Foundation
+
+
+// MARK: - UIAlertController Helpers
+//
+extension UIAlertController {
+    
+    /// Builds an alert indicating that the Login Code has Expired
+    ///
+    static func buildLoginCodeNotFoundAlert(onRequestCode: @escaping () -> Void) -> UIAlertController {
+        let title = NSLocalizedString("Sorry!", comment: "Email TextField Placeholder")
+        let message = NSLocalizedString("The authentication code you've requested has expired. Please request a new one", comment: "Email TextField Placeholder")
+        let dismissAction = NSLocalizedString("Dismiss", comment: "Email TextField Placeholder")
+        let requestAction = NSLocalizedString("Request a New Code", comment: "Email TextField Placeholder")
+        
+        let alertController = UIAlertController(title: title, message: message, preferredStyle: .alert)
+        alertController.addCancelActionWithTitle(dismissAction)
+        alertController.addDefaultActionWithTitle(requestAction) { _ in
+            onRequestCode()
+        }
+        
+        return alertController
+    }
+}

From bd9754af391c96ff2fd6355f42ce14d337b902f4 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Mon, 22 Jul 2024 16:57:57 -0300
Subject: [PATCH 320/547] Fixes Unit Tests

---
 SimplenoteTests/RemoteResult+TestHelpers.swift                | 2 +-
 SimplenoteTests/SignupRemoteTests.swift                       | 2 +-
 .../Verification/AccountVerificationRemoteTests.swift         | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/SimplenoteTests/RemoteResult+TestHelpers.swift b/SimplenoteTests/RemoteResult+TestHelpers.swift
index 585b9ae16..79738afe0 100644
--- a/SimplenoteTests/RemoteResult+TestHelpers.swift
+++ b/SimplenoteTests/RemoteResult+TestHelpers.swift
@@ -7,6 +7,6 @@ extension Remote {
             return .success(nil)
         }
 
-        return .failure(RemoteError.requestError(0, nil))
+        return .failure(RemoteError(statusCode: 0, response: nil, networkError: nil))
     }
 }
diff --git a/SimplenoteTests/SignupRemoteTests.swift b/SimplenoteTests/SignupRemoteTests.swift
index 239dbb818..e96d19379 100644
--- a/SimplenoteTests/SignupRemoteTests.swift
+++ b/SimplenoteTests/SignupRemoteTests.swift
@@ -14,7 +14,7 @@ class SignupRemoteTests: XCTestCase {
     func testFailureWhenStatusCodeIs4xxOr5xx() {
         for _ in 0..<5 {
             let statusCode = Int.random(in: 400..<600)
-            test(withStatusCode: statusCode, email: "email@gmail.com", expectedResult: .failure(RemoteError.requestError(statusCode, nil)))
+            test(withStatusCode: statusCode, email: "email@gmail.com", expectedResult: .failure(RemoteError(statusCode: statusCode, response: nil, networkError: nil)))
         }
     }
 
diff --git a/SimplenoteTests/Verification/AccountVerificationRemoteTests.swift b/SimplenoteTests/Verification/AccountVerificationRemoteTests.swift
index 6443b0d14..ec2b6397b 100644
--- a/SimplenoteTests/Verification/AccountVerificationRemoteTests.swift
+++ b/SimplenoteTests/Verification/AccountVerificationRemoteTests.swift
@@ -16,12 +16,12 @@ class AccountVerificationRemoteTests: XCTestCase {
     func testFailureWhenStatusCodeIs4xxOr5xx() {
         for _ in 0..<5 {
             let statusCode = Int.random(in: 400..<600)
-            test(withStatusCode: statusCode, expectedResult: .failure(RemoteError.requestError(statusCode, nil)))
+            test(withStatusCode: statusCode, expectedResult: .failure(RemoteError(statusCode: statusCode, response: nil, networkError: nil)))
         }
     }
 
     func testFailureWhenNoResponse() {
-        test(withStatusCode: nil, expectedResult: .failure(RemoteError.network))
+        test(withStatusCode: nil, expectedResult: .failure(RemoteError(statusCode: .zero, response: nil, networkError: nil)))
     }
 
     private func test(withStatusCode statusCode: Int?, expectedResult: Result<Data?, RemoteError>) {

From a04bdb17ad9d88a35eee64fb87b2b6a181a3a9f5 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Thu, 25 Jul 2024 15:19:10 -0300
Subject: [PATCH 321/547] Wires SimplenoteEndpoints SPM

---
 .../xcshareddata/swiftpm/Package.resolved     | 12 +++-
 .../Classes/MagicLinkAuthenticator.swift      |  1 +
 Simplenote/Classes/SPAuthError.swift          |  2 +
 Simplenote/Classes/SPAuthHandler.swift        | 18 +++---
 Simplenote/Classes/SPAuthViewController.swift | 59 ++++++++++++-------
 .../SPSettingsViewController+Extensions.swift |  2 +
 .../AccountDeletionController.swift           |  1 +
 Simplenote/SPUser+UserProtocol.swift          |  8 +++
 .../AccountVerificationController.swift       |  1 +
 .../RemoteResult+TestHelpers.swift            |  1 +
 .../AccountVerificationControllerTests.swift  |  1 +
 .../MockAccountVerificationRemote.swift       |  1 +
 12 files changed, 75 insertions(+), 32 deletions(-)
 create mode 100644 Simplenote/SPUser+UserProtocol.swift

diff --git a/Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved
index cd06d10ef..7cb132dca 100644
--- a/Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,4 +1,5 @@
 {
+  "originHash" : "f6a7610fd9e0ddbd97380e25a842046d3c6a6b02bac538637af84160717aaa8f",
   "pins" : [
     {
       "identity" : "automattic-tracks-ios",
@@ -27,6 +28,15 @@
         "version" : "8.18.0"
       }
     },
+    {
+      "identity" : "simplenoteendpoints-swift",
+      "kind" : "remoteSourceControl",
+      "location" : "git@github.com:Automattic/SimplenoteEndpoints-Swift.git",
+      "state" : {
+        "branch" : "trunk",
+        "revision" : "3d1c0a5db39ca798a7de10e7faeef8ae66e941e6"
+      }
+    },
     {
       "identity" : "simplenotefoundation-swift",
       "kind" : "remoteSourceControl",
@@ -82,5 +92,5 @@
       }
     }
   ],
-  "version" : 2
+  "version" : 3
 }
diff --git a/Simplenote/Classes/MagicLinkAuthenticator.swift b/Simplenote/Classes/MagicLinkAuthenticator.swift
index b5ba213f2..50046956e 100644
--- a/Simplenote/Classes/MagicLinkAuthenticator.swift
+++ b/Simplenote/Classes/MagicLinkAuthenticator.swift
@@ -1,4 +1,5 @@
 import Foundation
+import SimplenoteEndpoints
 
 
 // MARK: - Notifications
diff --git a/Simplenote/Classes/SPAuthError.swift b/Simplenote/Classes/SPAuthError.swift
index 0f5edccf1..66c80ef8b 100644
--- a/Simplenote/Classes/SPAuthError.swift
+++ b/Simplenote/Classes/SPAuthError.swift
@@ -1,4 +1,6 @@
 import Foundation
+import SimplenoteEndpoints
+
 
 // MARK: - SPAuthError
 //
diff --git a/Simplenote/Classes/SPAuthHandler.swift b/Simplenote/Classes/SPAuthHandler.swift
index 2eba54752..5d0fcdd9c 100644
--- a/Simplenote/Classes/SPAuthHandler.swift
+++ b/Simplenote/Classes/SPAuthHandler.swift
@@ -1,5 +1,6 @@
 import Foundation
 import SafariServices
+import SimplenoteEndpoints
 
 // MARK: - SPAuthHandler
 //
@@ -55,16 +56,13 @@ class SPAuthHandler {
 
     /// Requests an Authentication Email
     ///
-    func requestLoginEmail(username: String, onCompletion: @escaping (SPAuthError?) -> Void) {
+    @MainActor
+    func requestLoginEmail(username: String) async throws {
         let remote = LoginRemote()
-        remote.requestLoginEmail(email: username) { (result) in
-            switch result {
-            case .success:
-                onCompletion(nil)
-            case .failure(let remoteError):
-                let error = SPAuthError(loginRemoteError: remoteError)
-                onCompletion(error)
-            }
+        do {
+            try await remote.requestLoginEmail(email: username)
+        } catch let remoteError as RemoteError {
+            throw SPAuthError(loginRemoteError: remoteError)
         }
     }
 
@@ -91,7 +89,7 @@ class SPAuthHandler {
     ///     - onCompletion: Closure to be executed on completion
     ///
     func signupWithCredentials(username: String, onCompletion: @escaping (SPAuthError?) -> Void) {
-        SignupRemote().signup(with: username) { (result) in
+        SignupRemote().requestSignup(email: username) { (result) in
             switch result {
             case .success:
                 onCompletion(nil)
diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index ed2079566..9e3e49bea 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -2,6 +2,8 @@ import Foundation
 import UIKit
 import SafariServices
 import SwiftUI
+import SimplenoteEndpoints
+
 
 // MARK: - SPAuthViewController
 //
@@ -433,37 +435,52 @@ extension SPAuthViewController {
         guard ensureWarningsAreOnScreenWhenNeeded() else {
             return
         }
-        
+
+        Task { @MainActor in
+            await requestLogInCodeAsync()
+        }
+    }
+    
+    @MainActor
+    private func requestLogInCodeAsync() async {
         lockdownInterface()
 
-        controller.requestLoginEmail(username: email) { error in
-            switch error {
-            case .none:
-                self.presentCodeInterface()
-                SPTracker.trackLoginLinkRequested()
-                
-            case .tooManyAttempts:
-                self.presentPasswordInterfaceWithRateLimitingHeader()
-                
-            case .some(let error):
-                self.handleError(error: error)
-            }
+        do {
+            try await controller.requestLoginEmail(username: email)
+            self.presentCodeInterface()
+            SPTracker.trackLoginLinkRequested()
+            
+        } catch SPAuthError.tooManyAttempts {
+            self.presentPasswordInterfaceWithRateLimitingHeader()
 
-            self.unlockInterface()
+        } catch {
+            let error = error as? SPAuthError ?? .generic
+            self.handleError(error: error)
         }
+        
+        self.unlockInterface()
     }
 
     /// Requests a new Login Code, without pushing any secondary UI on success
     ///
     @IBAction func requestLogInCodeAndDontPush() {
-        controller.requestLoginEmail(username: email) { error in
-            if let error {
-                self.handleError(error: error)
-                return
-            }
-            
-            SPTracker.trackLoginLinkRequested()
+        Task { @MainActor in
+            await self.requestLogInCodeAndDontPushAsync()
+        }
+    }
+
+    /// Requests a new Login Code, without pushing any secondary UI on success. Asynchronous API!
+    ///
+    @MainActor
+    private func requestLogInCodeAndDontPushAsync() async {
+        do {
+            try await controller.requestLoginEmail(username: email)
+        } catch {
+            let error = error as? SPAuthError ?? .generic
+            self.handleError(error: error)
         }
+        
+        SPTracker.trackLoginLinkRequested()
     }
     
     @IBAction func performLogInWithCode() {
diff --git a/Simplenote/Classes/SPSettingsViewController+Extensions.swift b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
index 289af3fb8..7c0bb73a9 100644
--- a/Simplenote/Classes/SPSettingsViewController+Extensions.swift
+++ b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
@@ -1,4 +1,6 @@
 import UIKit
+import SimplenoteEndpoints
+
 
 // MARK: - Subscriber UI
 //
diff --git a/Simplenote/Controllers/AccountDeletionController.swift b/Simplenote/Controllers/AccountDeletionController.swift
index c5251a05d..ac248de09 100644
--- a/Simplenote/Controllers/AccountDeletionController.swift
+++ b/Simplenote/Controllers/AccountDeletionController.swift
@@ -1,4 +1,5 @@
 import Foundation
+import SimplenoteEndpoints
 
 @objc
 class AccountDeletionController: NSObject {
diff --git a/Simplenote/SPUser+UserProtocol.swift b/Simplenote/SPUser+UserProtocol.swift
new file mode 100644
index 000000000..b555a4e96
--- /dev/null
+++ b/Simplenote/SPUser+UserProtocol.swift
@@ -0,0 +1,8 @@
+import Foundation
+import SimplenoteEndpoints
+import Simperium
+
+
+// MARK: - Simperium's SPUser Conformance
+//
+extension SPUser: UserProtocol { }
diff --git a/Simplenote/Verification/AccountVerificationController.swift b/Simplenote/Verification/AccountVerificationController.swift
index 4bab434a6..3f11cc042 100644
--- a/Simplenote/Verification/AccountVerificationController.swift
+++ b/Simplenote/Verification/AccountVerificationController.swift
@@ -1,4 +1,5 @@
 import Foundation
+import SimplenoteEndpoints
 
 // MARK: - AccountVerificationController
 //
diff --git a/SimplenoteTests/RemoteResult+TestHelpers.swift b/SimplenoteTests/RemoteResult+TestHelpers.swift
index 79738afe0..ba37ff02f 100644
--- a/SimplenoteTests/RemoteResult+TestHelpers.swift
+++ b/SimplenoteTests/RemoteResult+TestHelpers.swift
@@ -1,4 +1,5 @@
 import Foundation
+import SimplenoteEndpoints
 @testable import Simplenote
 
 extension Remote {
diff --git a/SimplenoteTests/Verification/AccountVerificationControllerTests.swift b/SimplenoteTests/Verification/AccountVerificationControllerTests.swift
index 39790a9ef..fe5b29921 100644
--- a/SimplenoteTests/Verification/AccountVerificationControllerTests.swift
+++ b/SimplenoteTests/Verification/AccountVerificationControllerTests.swift
@@ -1,4 +1,5 @@
 import XCTest
+import SimplenoteEndpoints
 @testable import Simplenote
 
 // MARK: - AccountVerificationControllerTests
diff --git a/SimplenoteTests/Verification/Helpers/MockAccountVerificationRemote.swift b/SimplenoteTests/Verification/Helpers/MockAccountVerificationRemote.swift
index f09f4f411..d4add1b4e 100644
--- a/SimplenoteTests/Verification/Helpers/MockAccountVerificationRemote.swift
+++ b/SimplenoteTests/Verification/Helpers/MockAccountVerificationRemote.swift
@@ -1,4 +1,5 @@
 import XCTest
+@testable import SimplenoteEndpoints
 @testable import Simplenote
 
 class MockAccountVerificationRemote: AccountRemote {

From 03fb79260df966435d922aca81c7b2d5ed85c9c6 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Thu, 25 Jul 2024 15:19:20 -0300
Subject: [PATCH 322/547] Drops duplicated code

---
 Simplenote.xcodeproj/project.pbxproj          | 89 ++++++-------------
 Simplenote/AccountRemote.swift                | 54 -----------
 Simplenote/Classes/RemoteConstants.swift      | 12 ---
 Simplenote/Classes/SignupRemote.swift         | 24 -----
 Simplenote/LoginRemote.swift                  | 46 ----------
 Simplenote/Remote.swift                       | 72 ---------------
 Simplenote/RemoteError.swift                  | 50 -----------
 Simplenote/URLRequest+Simplenote.swift        | 13 ---
 SimplenoteTests/Network/MockURLSession.swift  | 15 ----
 .../Network/MockURLSessionDataTask.swift      | 15 ----
 SimplenoteTests/SignupRemoteTests.swift       | 75 ----------------
 .../AccountVerificationRemoteTests.swift      | 51 -----------
 12 files changed, 29 insertions(+), 487 deletions(-)
 delete mode 100644 Simplenote/AccountRemote.swift
 delete mode 100644 Simplenote/Classes/RemoteConstants.swift
 delete mode 100644 Simplenote/Classes/SignupRemote.swift
 delete mode 100644 Simplenote/LoginRemote.swift
 delete mode 100644 Simplenote/Remote.swift
 delete mode 100644 Simplenote/RemoteError.swift
 delete mode 100644 Simplenote/URLRequest+Simplenote.swift
 delete mode 100644 SimplenoteTests/Network/MockURLSession.swift
 delete mode 100644 SimplenoteTests/Network/MockURLSessionDataTask.swift
 delete mode 100644 SimplenoteTests/SignupRemoteTests.swift
 delete mode 100644 SimplenoteTests/Verification/AccountVerificationRemoteTests.swift

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index e880d726c..f1b5a3a4f 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -124,7 +124,6 @@
 		A61471B925D70C190065D849 /* PopoverViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A61471B725D70C190065D849 /* PopoverViewController.swift */; };
 		A628BEB625ECD97900121B64 /* SignupVerificationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A628BEB425ECD97900121B64 /* SignupVerificationViewController.swift */; };
 		A628BEB725ECD97900121B64 /* SignupVerificationViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A628BEB525ECD97900121B64 /* SignupVerificationViewController.xib */; };
-		A628BEC325ED703A00121B64 /* RemoteConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = A628BEC225ED703A00121B64 /* RemoteConstants.swift */; };
 		A6344AD9255952C70072FA07 /* NoteContentPreviewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6344AD8255952C70072FA07 /* NoteContentPreviewTests.swift */; };
 		A645FA70254C5E69008A1519 /* NoteContentHelperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A645FA6F254C5E69008A1519 /* NoteContentHelperTests.swift */; };
 		A64DE6E9255D1C9F001D0526 /* ContentSlice.swift in Sources */ = {isa = PBXBuildFile; fileRef = A64DE6E8255D1C9F001D0526 /* ContentSlice.swift */; };
@@ -172,13 +171,8 @@
 		A6C0DFE825C18E3300B9BE39 /* NoteEditorTagListViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A6C0DFE625C18E3300B9BE39 /* NoteEditorTagListViewController.xib */; };
 		A6C2721825AF0C1E00593731 /* TagListViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6C2721725AF0C1E00593731 /* TagListViewCell.swift */; };
 		A6C3D8B7256687970042F584 /* SPObjectManager+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6C3D8B6256687970042F584 /* SPObjectManager+Simplenote.swift */; };
-		A6C7648025E9131C00A39067 /* SignupRemote.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6C7647F25E9131C00A39067 /* SignupRemote.swift */; };
-		A6CC0B0725B8287F00F12A85 /* AccountRemote.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6CC0B0625B8287F00F12A85 /* AccountRemote.swift */; };
 		A6CC0B1025B83FE400F12A85 /* AccountVerificationControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6CC0B0F25B83FE400F12A85 /* AccountVerificationControllerTests.swift */; };
 		A6CC0B1F25B840A400F12A85 /* MockAccountVerificationRemote.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6CC0B1E25B840A400F12A85 /* MockAccountVerificationRemote.swift */; };
-		A6CC0B2D25B84FF200F12A85 /* AccountVerificationRemoteTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6CC0B2C25B84FF200F12A85 /* AccountVerificationRemoteTests.swift */; };
-		A6CC0B3625B8502800F12A85 /* MockURLSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6CC0B3525B8502800F12A85 /* MockURLSession.swift */; };
-		A6CC0B4425B8505700F12A85 /* MockURLSessionDataTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6CC0B4325B8505700F12A85 /* MockURLSessionDataTask.swift */; };
 		A6CDD9C825F0163D00E0BC4D /* MagicLinkAuthenticator.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6CDD9C725F0163D00E0BC4D /* MagicLinkAuthenticator.swift */; };
 		A6CDF900256B9CB900CF2F27 /* ViewSpinner.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6CDF8FF256B9CB900CF2F27 /* ViewSpinner.swift */; };
 		A6D5AE6525483F8A00326C76 /* NSTextStorage+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6D5AE6425483F8A00326C76 /* NSTextStorage+Simplenote.swift */; };
@@ -241,6 +235,8 @@
 		B518899E1E0D5EF800E71B83 /* SPContactsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B518899D1E0D5EF800E71B83 /* SPContactsManager.swift */; };
 		B51889A01E0D5F2200E71B83 /* Contacts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B518899F1E0D5F2200E71B83 /* Contacts.framework */; };
 		B51889A41E0DB01E00E71B83 /* ContactsUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B51889A31E0DB01E00E71B83 /* ContactsUI.framework */; };
+		B51D445B2C52CB4000F296A7 /* SimplenoteEndpoints in Frameworks */ = {isa = PBXBuildFile; productRef = B51D445A2C52CB4000F296A7 /* SimplenoteEndpoints */; };
+		B51D445E2C52CDA800F296A7 /* SPUser+UserProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51D445D2C52CDA800F296A7 /* SPUser+UserProtocol.swift */; };
 		B51F6DD12460C3EE0074DDD9 /* AuthenticationValidator.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51F6DD02460C3EE0074DDD9 /* AuthenticationValidator.swift */; };
 		B51F6DD32460D12B0074DDD9 /* AuthenticationValidatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51F6DD22460D12B0074DDD9 /* AuthenticationValidatorTests.swift */; };
 		B51F6DD52460D7540074DDD9 /* NSPredicate+Email.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51F6DD42460D7540074DDD9 /* NSPredicate+Email.swift */; };
@@ -311,7 +307,6 @@
 		B55E428C22A1A4550018C0CE /* SPSortOrderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B55E428B22A1A4550018C0CE /* SPSortOrderViewController.swift */; };
 		B56315BE236BD9970066C151 /* UIKitConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AB169B22FB2DF300B4EBA5 /* UIKitConstants.swift */; };
 		B5686178195B9E93005F1245 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E2F149471799F5A500DC9690 /* libsqlite3.dylib */; };
-		B5699B092C1246C40096D6B7 /* LoginRemote.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5699B082C1246C40096D6B7 /* LoginRemote.swift */; };
 		B56A695822F9CD1500B90398 /* SPOnboardingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = B56A695622F9CD1500B90398 /* SPOnboardingViewController.xib */; };
 		B56A695922F9CD1500B90398 /* SPOnboardingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56A695722F9CD1500B90398 /* SPOnboardingViewController.swift */; };
 		B56A695B22F9CD4E00B90398 /* UINavigationBar+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56A695A22F9CD4E00B90398 /* UINavigationBar+Simplenote.swift */; };
@@ -429,7 +424,6 @@
 		BA0AF10D2BE996600050EEBD /* KeychainManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B59560DF251A46D500A06788 /* KeychainManager.swift */; };
 		BA0AF10E2BE996630050EEBD /* KeychainPasswordItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37FD30471FC4CFA2008D0B78 /* KeychainPasswordItem.swift */; };
 		BA0ED16E26D708AC002533B6 /* Color+Widgets.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA0ED16D26D708AC002533B6 /* Color+Widgets.swift */; };
-		BA0F5E0426B62A8B0098C605 /* RemoteError.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA0F5E0326B62A8B0098C605 /* RemoteError.swift */; };
 		BA113E4D269E860500F3E3B4 /* markdown-light.css in Resources */ = {isa = PBXBuildFile; fileRef = BA113E4C269E860500F3E3B4 /* markdown-light.css */; };
 		BA122DBA265EF402003D3BC5 /* SimplenoteConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5095DC824632E3300812711 /* SimplenoteConstants.swift */; };
 		BA122DBB265EF40E003D3BC5 /* UIColor+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = B575736B232D454300443C2E /* UIColor+Helpers.swift */; };
@@ -442,7 +436,6 @@
 		BA122DCA265F2E2D003D3BC5 /* UIColorSimplenoteTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA122DC9265F2E2D003D3BC5 /* UIColorSimplenoteTests.swift */; };
 		BA12B06F26B0D0150026F31D /* SPManagedObject+Widget.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA12B06C26B0D0150026F31D /* SPManagedObject+Widget.swift */; };
 		BA12B07026B0D0150026F31D /* SPManagedObject+Widget.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA12B06C26B0D0150026F31D /* SPManagedObject+Widget.swift */; };
-		BA18532826488DBC00D9A347 /* SignupRemoteTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA18532726488DBC00D9A347 /* SignupRemoteTests.swift */; };
 		BA2015BB2B57384F005E59AA /* AutomatticTracks in Frameworks */ = {isa = PBXBuildFile; productRef = BA2015BA2B57384F005E59AA /* AutomatticTracks */; };
 		BA289B5C2BE4371A000E6794 /* ListWidgetIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA289B5A2BE4371A000E6794 /* ListWidgetIntentHandler.swift */; };
 		BA289B5F2BE43728000E6794 /* NoteWidgetIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA289B5D2BE43728000E6794 /* NoteWidgetIntentHandler.swift */; };
@@ -477,10 +470,8 @@
 		BA55124E2600210B00D8F882 /* TimerFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA55124D2600210B00D8F882 /* TimerFactory.swift */; };
 		BA55B05A25F067DF0042582B /* NoticePresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA55B05925F067DF0042582B /* NoticePresenter.swift */; };
 		BA55B06325F068650042582B /* NoticeController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA55B06225F068650042582B /* NoticeController.swift */; };
-		BA5768E3269A803F008B510E /* Remote.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA5768E2269A803F008B510E /* Remote.swift */; };
 		BA5768EC269BE4D0008B510E /* AccountDeletionController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA5768EB269BE4D0008B510E /* AccountDeletionController.swift */; };
 		BA5C1C0725BF9D6C006E3820 /* SPDragBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA5C1C0625BF9D6C006E3820 /* SPDragBar.swift */; };
-		BA5E5B7D264A148C00D0EE19 /* URLRequest+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA5E5B7C264A148C00D0EE19 /* URLRequest+Simplenote.swift */; };
 		BA608EF526BB6E0200A9D94E /* ListWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA608EF426BB6E0200A9D94E /* ListWidget.swift */; };
 		BA608EF726BB6E7400A9D94E /* ListWidgetProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA608EF626BB6E7400A9D94E /* ListWidgetProvider.swift */; };
 		BA608EF926BB6F4C00A9D94E /* ListWidgetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA608EF826BB6F4C00A9D94E /* ListWidgetView.swift */; };
@@ -829,7 +820,6 @@
 		A61471B725D70C190065D849 /* PopoverViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PopoverViewController.swift; path = Classes/PopoverViewController.swift; sourceTree = "<group>"; };
 		A628BEB425ECD97900121B64 /* SignupVerificationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SignupVerificationViewController.swift; path = Classes/SignupVerificationViewController.swift; sourceTree = "<group>"; };
 		A628BEB525ECD97900121B64 /* SignupVerificationViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = SignupVerificationViewController.xib; path = Classes/SignupVerificationViewController.xib; sourceTree = "<group>"; };
-		A628BEC225ED703A00121B64 /* RemoteConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = RemoteConstants.swift; path = Classes/RemoteConstants.swift; sourceTree = "<group>"; };
 		A6344AD8255952C70072FA07 /* NoteContentPreviewTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteContentPreviewTests.swift; sourceTree = "<group>"; };
 		A645FA6F254C5E69008A1519 /* NoteContentHelperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteContentHelperTests.swift; sourceTree = "<group>"; };
 		A64DE6E8255D1C9F001D0526 /* ContentSlice.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ContentSlice.swift; path = Classes/ContentSlice.swift; sourceTree = "<group>"; };
@@ -877,13 +867,8 @@
 		A6C0DFE625C18E3300B9BE39 /* NoteEditorTagListViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NoteEditorTagListViewController.xib; sourceTree = "<group>"; };
 		A6C2721725AF0C1E00593731 /* TagListViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TagListViewCell.swift; sourceTree = "<group>"; };
 		A6C3D8B6256687970042F584 /* SPObjectManager+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "SPObjectManager+Simplenote.swift"; path = "Classes/SPObjectManager+Simplenote.swift"; sourceTree = "<group>"; };
-		A6C7647F25E9131C00A39067 /* SignupRemote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SignupRemote.swift; path = Classes/SignupRemote.swift; sourceTree = "<group>"; };
-		A6CC0B0625B8287F00F12A85 /* AccountRemote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountRemote.swift; sourceTree = "<group>"; };
 		A6CC0B0F25B83FE400F12A85 /* AccountVerificationControllerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountVerificationControllerTests.swift; sourceTree = "<group>"; };
 		A6CC0B1E25B840A400F12A85 /* MockAccountVerificationRemote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockAccountVerificationRemote.swift; sourceTree = "<group>"; };
-		A6CC0B2C25B84FF200F12A85 /* AccountVerificationRemoteTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountVerificationRemoteTests.swift; sourceTree = "<group>"; };
-		A6CC0B3525B8502800F12A85 /* MockURLSession.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockURLSession.swift; sourceTree = "<group>"; };
-		A6CC0B4325B8505700F12A85 /* MockURLSessionDataTask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockURLSessionDataTask.swift; sourceTree = "<group>"; };
 		A6CDD9C725F0163D00E0BC4D /* MagicLinkAuthenticator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MagicLinkAuthenticator.swift; path = Classes/MagicLinkAuthenticator.swift; sourceTree = "<group>"; };
 		A6CDF8FF256B9CB900CF2F27 /* ViewSpinner.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ViewSpinner.swift; path = Classes/ViewSpinner.swift; sourceTree = "<group>"; };
 		A6D5AE6425483F8A00326C76 /* NSTextStorage+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSTextStorage+Simplenote.swift"; sourceTree = "<group>"; };
@@ -944,6 +929,7 @@
 		B518899D1E0D5EF800E71B83 /* SPContactsManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SPContactsManager.swift; path = Classes/SPContactsManager.swift; sourceTree = "<group>"; };
 		B518899F1E0D5F2200E71B83 /* Contacts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Contacts.framework; path = System/Library/Frameworks/Contacts.framework; sourceTree = SDKROOT; };
 		B51889A31E0DB01E00E71B83 /* ContactsUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ContactsUI.framework; path = System/Library/Frameworks/ContactsUI.framework; sourceTree = SDKROOT; };
+		B51D445D2C52CDA800F296A7 /* SPUser+UserProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SPUser+UserProtocol.swift"; sourceTree = "<group>"; };
 		B51F6DD02460C3EE0074DDD9 /* AuthenticationValidator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationValidator.swift; sourceTree = "<group>"; };
 		B51F6DD22460D12B0074DDD9 /* AuthenticationValidatorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationValidatorTests.swift; sourceTree = "<group>"; };
 		B51F6DD42460D7540074DDD9 /* NSPredicate+Email.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSPredicate+Email.swift"; sourceTree = "<group>"; };
@@ -1024,7 +1010,6 @@
 		B55E428B22A1A4550018C0CE /* SPSortOrderViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SPSortOrderViewController.swift; path = Classes/SPSortOrderViewController.swift; sourceTree = "<group>"; };
 		B5651239243BC063001EFE77 /* fa */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fa; path = fa.lproj/Localizable.strings; sourceTree = "<group>"; };
 		B566A1DD189AA74600DC3F2D /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; };
-		B5699B082C1246C40096D6B7 /* LoginRemote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginRemote.swift; sourceTree = "<group>"; };
 		B56A695622F9CD1500B90398 /* SPOnboardingViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = SPOnboardingViewController.xib; path = Classes/SPOnboardingViewController.xib; sourceTree = "<group>"; };
 		B56A695722F9CD1500B90398 /* SPOnboardingViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SPOnboardingViewController.swift; path = Classes/SPOnboardingViewController.swift; sourceTree = "<group>"; };
 		B56A695A22F9CD4E00B90398 /* UINavigationBar+Simplenote.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "UINavigationBar+Simplenote.swift"; path = "Classes/UINavigationBar+Simplenote.swift"; sourceTree = "<group>"; };
@@ -1156,13 +1141,11 @@
 		BA0890A626BB9BE20035CA48 /* ListWidgetHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListWidgetHeaderView.swift; sourceTree = "<group>"; };
 		BA0890A826BB9BF80035CA48 /* NewNoteButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewNoteButton.swift; sourceTree = "<group>"; };
 		BA0ED16D26D708AC002533B6 /* Color+Widgets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Color+Widgets.swift"; sourceTree = "<group>"; };
-		BA0F5E0326B62A8B0098C605 /* RemoteError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoteError.swift; sourceTree = "<group>"; };
 		BA113E4C269E860500F3E3B4 /* markdown-light.css */ = {isa = PBXFileReference; lastKnownFileType = text.css; path = "markdown-light.css"; sourceTree = "<group>"; };
 		BA122DC5265EF90C003D3BC5 /* NewNoteWidgetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewNoteWidgetView.swift; sourceTree = "<group>"; };
 		BA122DC9265F2E2D003D3BC5 /* UIColorSimplenoteTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIColorSimplenoteTests.swift; sourceTree = "<group>"; };
 		BA12B06C26B0D0150026F31D /* SPManagedObject+Widget.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "SPManagedObject+Widget.swift"; sourceTree = "<group>"; };
 		BA16C6A82BC4968400C9079F /* Simplenote 7.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Simplenote 7.xcdatamodel"; sourceTree = "<group>"; };
-		BA18532726488DBC00D9A347 /* SignupRemoteTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignupRemoteTests.swift; sourceTree = "<group>"; };
 		BA289B5A2BE4371A000E6794 /* ListWidgetIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListWidgetIntentHandler.swift; sourceTree = "<group>"; };
 		BA289B5D2BE43728000E6794 /* NoteWidgetIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteWidgetIntentHandler.swift; sourceTree = "<group>"; };
 		BA289B632BE43963000E6794 /* OpenNewNoteIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenNewNoteIntentHandler.swift; sourceTree = "<group>"; };
@@ -1187,10 +1170,8 @@
 		BA55124D2600210B00D8F882 /* TimerFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimerFactory.swift; sourceTree = "<group>"; };
 		BA55B05925F067DF0042582B /* NoticePresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoticePresenter.swift; sourceTree = "<group>"; };
 		BA55B06225F068650042582B /* NoticeController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoticeController.swift; sourceTree = "<group>"; };
-		BA5768E2269A803F008B510E /* Remote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Remote.swift; sourceTree = "<group>"; };
 		BA5768EB269BE4D0008B510E /* AccountDeletionController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountDeletionController.swift; sourceTree = "<group>"; };
 		BA5C1C0625BF9D6C006E3820 /* SPDragBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPDragBar.swift; sourceTree = "<group>"; };
-		BA5E5B7C264A148C00D0EE19 /* URLRequest+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URLRequest+Simplenote.swift"; sourceTree = "<group>"; };
 		BA608EF426BB6E0200A9D94E /* ListWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListWidget.swift; sourceTree = "<group>"; };
 		BA608EF626BB6E7400A9D94E /* ListWidgetProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListWidgetProvider.swift; sourceTree = "<group>"; };
 		BA608EF826BB6F4C00A9D94E /* ListWidgetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListWidgetView.swift; sourceTree = "<group>"; };
@@ -1417,6 +1398,7 @@
 				46A3C9BE17DFA81A002865AE /* UIKit.framework in Frameworks */,
 				46A3C9BF17DFA81A002865AE /* Foundation.framework in Frameworks */,
 				4352BA0867E0E416EB5FF6B9 /* Pods_Automattic_Simplenote.framework in Frameworks */,
+				B51D445B2C52CB4000F296A7 /* SimplenoteEndpoints in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1736,7 +1718,6 @@
 			children = (
 				A6CC0B1D25B8408900F12A85 /* Helpers */,
 				A6CC0B0F25B83FE400F12A85 /* AccountVerificationControllerTests.swift */,
-				A6CC0B2C25B84FF200F12A85 /* AccountVerificationRemoteTests.swift */,
 			);
 			path = Verification;
 			sourceTree = "<group>";
@@ -1749,15 +1730,6 @@
 			path = Helpers;
 			sourceTree = "<group>";
 		};
-		A6CC0B3425B8501B00F12A85 /* Network */ = {
-			isa = PBXGroup;
-			children = (
-				A6CC0B3525B8502800F12A85 /* MockURLSession.swift */,
-				A6CC0B4325B8505700F12A85 /* MockURLSessionDataTask.swift */,
-			);
-			path = Network;
-			sourceTree = "<group>";
-		};
 		A6E1E79C24BDDF30008A44BC /* Card */ = {
 			isa = PBXGroup;
 			children = (
@@ -1843,11 +1815,18 @@
 				B52F35D022F3254800724793 /* Theme.swift */,
 				B5AB169B22FB2DF300B4EBA5 /* UIKitConstants.swift */,
 				B5095DC824632E3300812711 /* SimplenoteConstants.swift */,
-				A628BEC225ED703A00121B64 /* RemoteConstants.swift */,
 			);
 			name = Settings;
 			sourceTree = "<group>";
 		};
+		B51D445C2C52CD8D00F296A7 /* Authentication */ = {
+			isa = PBXGroup;
+			children = (
+				B51D445D2C52CDA800F296A7 /* SPUser+UserProtocol.swift */,
+			);
+			name = Authentication;
+			sourceTree = "<group>";
+		};
 		B51F6DCF2460C3D80074DDD9 /* Onboarding */ = {
 			isa = PBXGroup;
 			children = (
@@ -1997,7 +1976,6 @@
 				A6344AD8255952C70072FA07 /* NoteContentPreviewTests.swift */,
 				A694ABB225D1687200CC3A2D /* NoteScrollPositionCacheTests.swift */,
 				BAB0179A260AD591007A9CC3 /* PublishControllerTests.swift */,
-				BA18532726488DBC00D9A347 /* SignupRemoteTests.swift */,
 			);
 			name = Tools;
 			sourceTree = "<group>";
@@ -2065,7 +2043,6 @@
 				A6C0DFB425C1581D00B9BE39 /* UIScrollView+Simplenote.swift */,
 				A6A8968D25D5779D00A7B390 /* FileManager+Simplenote.swift */,
 				BAE08625261282D1009D40CD /* Note+Publish.swift */,
-				BA5E5B7C264A148C00D0EE19 /* URLRequest+Simplenote.swift */,
 				BAFDBBD726B88BD200119615 /* Date+Simplenote.swift */,
 				BAB27BD526BA425C00AE4ACC /* Color+Simplenote.swift */,
 				BAA59E78269F9FE30068BD3D /* Date+Simplenote.swift */,
@@ -2183,7 +2160,6 @@
 		B5B85BA6235173D900AD5221 /* Helpers */ = {
 			isa = PBXGroup;
 			children = (
-				A6CC0B3425B8501B00F12A85 /* Network */,
 				B5421F3B23CE7A14004DDC19 /* Constants.swift */,
 				B5421F3D23CE7A1C004DDC19 /* MockupStorage.swift */,
 				B5421F3E23CE7A1C004DDC19 /* MockupStorage+Sample.swift */,
@@ -2219,7 +2195,6 @@
 		B5BE053E1AB751FD002417BF /* Tools */ = {
 			isa = PBXGroup;
 			children = (
-				BA57692A269D2103008B510E /* Remotes */,
 				B51F6DCF2460C3D80074DDD9 /* Onboarding */,
 				B5CBEF3F22D3AD92009DBE67 /* MigrationsHandler.swift */,
 				B5D3FCCF201F96AC00A813B7 /* StatusChecker.h */,
@@ -2440,18 +2415,6 @@
 			path = Tools;
 			sourceTree = "<group>";
 		};
-		BA57692A269D2103008B510E /* Remotes */ = {
-			isa = PBXGroup;
-			children = (
-				B5699B082C1246C40096D6B7 /* LoginRemote.swift */,
-				A6C7647F25E9131C00A39067 /* SignupRemote.swift */,
-				A6CC0B0625B8287F00F12A85 /* AccountRemote.swift */,
-				BA5768E2269A803F008B510E /* Remote.swift */,
-				BA0F5E0326B62A8B0098C605 /* RemoteError.swift */,
-			);
-			name = Remotes;
-			sourceTree = "<group>";
-		};
 		BA75D87C26C0842000883FFA /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
@@ -2703,6 +2666,7 @@
 		E29ADD4117848E8500E55842 /* Simplenote */ = {
 			isa = PBXGroup;
 			children = (
+				B51D445C2C52CD8D00F296A7 /* Authentication */,
 				467D9C7A1788D10400785EF3 /* Categories */,
 				A690032F253D85C40087D0D2 /* Controllers */,
 				B5C7BF92230C592B000DEC91 /* Credentials */,
@@ -2916,6 +2880,7 @@
 				B50D2FB524E6DFAC00163FC3 /* SimplenoteSearch */,
 				B59CACFB2541E05400958330 /* SimplenoteInterlinks */,
 				BA2015BA2B57384F005E59AA /* AutomatticTracks */,
+				B51D445A2C52CB4000F296A7 /* SimplenoteEndpoints */,
 			);
 			productName = Simplenote;
 			productReference = 46A3C9D717DFA81A002865AE /* Simplenote.app */;
@@ -3135,6 +3100,7 @@
 				3F762E8D2677F19C0088CD45 /* XCRemoteSwiftPackageReference "XCUITestHelpers" */,
 				3F4BA07C26CDF295000619B1 /* XCRemoteSwiftPackageReference "ScreenObject" */,
 				BA2015B92B573761005E59AA /* XCRemoteSwiftPackageReference "Automattic-Tracks-iOS" */,
+				B51D44592C52CB4000F296A7 /* XCRemoteSwiftPackageReference "SimplenoteEndpoints-Swift" */,
 			);
 			productRefGroup = E29ADD3917848E8500E55842 /* Products */;
 			projectDirPath = "";
@@ -3569,7 +3535,6 @@
 				B56E763622BD565700C5AA47 /* UIView+Simplenote.swift in Sources */,
 				B5E4082D235DE41A00D4E1DF /* UIColor+Studio.swift in Sources */,
 				A6CDF900256B9CB900CF2F27 /* ViewSpinner.swift in Sources */,
-				BA5E5B7D264A148C00D0EE19 /* URLRequest+Simplenote.swift in Sources */,
 				375D24B721E01131007AB25A /* stack.c in Sources */,
 				373AD30821C4739500A4EA89 /* NSMutableAttributedString+Styling.m in Sources */,
 				B524AE112352CC7900EA11D4 /* UIScreen+Simplenote.swift in Sources */,
@@ -3592,7 +3557,6 @@
 				B5757368232BED0700443C2E /* UIBezierPath+Simplenote.swift in Sources */,
 				B5476BB723D89AF7000E7723 /* SPSectionHeaderView.swift in Sources */,
 				B5377349252E2A4200BC78C5 /* Value1TableViewCell.swift in Sources */,
-				BA0F5E0426B62A8B0098C605 /* RemoteError.swift in Sources */,
 				B53C5A5A230330CD00DA2143 /* SPNoteListViewController+Extensions.swift in Sources */,
 				A6C0DFB525C1581D00B9BE39 /* UIScrollView+Simplenote.swift in Sources */,
 				375D24B621E01131007AB25A /* html_blocks.c in Sources */,
@@ -3630,7 +3594,6 @@
 				B52BB75022CFD18F0042C162 /* UIActivity+Simplenote.swift in Sources */,
 				F9E197D42283D05C0092B3E1 /* CrashLogging.swift in Sources */,
 				BA9B59022685549F00DAD1ED /* StorageSettings.swift in Sources */,
-				B5699B092C1246C40096D6B7 /* LoginRemote.swift in Sources */,
 				DE7E545B214E34C8008D9928 /* NSString+Count.swift in Sources */,
 				A6E6CE0025A4B0A9005A92DB /* PinLockVerifyController.swift in Sources */,
 				BA55124E2600210B00D8F882 /* TimerFactory.swift in Sources */,
@@ -3664,7 +3627,6 @@
 				BA289B732BE45A3C000E6794 /* IntentsConstants.swift in Sources */,
 				BAF4A96F26DB085D00C51C1D /* NSURLComponents+Simplenote.swift in Sources */,
 				B5E951E124FEDAD4004B10B8 /* UIPasteboard+Note.swift in Sources */,
-				A6C7648025E9131C00A39067 /* SignupRemote.swift in Sources */,
 				A681C73C2541AC8D00F369C2 /* HuggableTableView.swift in Sources */,
 				46A3C99917DFA81A002865AE /* SPTransitionController.m in Sources */,
 				B56A695B22F9CD4E00B90398 /* UINavigationBar+Simplenote.swift in Sources */,
@@ -3684,6 +3646,7 @@
 				B5AEC38423FAC5D600D24221 /* DateFormatter+Simplenote.swift in Sources */,
 				B5DF734622A5713600602CE7 /* SortMode.swift in Sources */,
 				BA55B05A25F067DF0042582B /* NoticePresenter.swift in Sources */,
+				B51D445E2C52CDA800F296A7 /* SPUser+UserProtocol.swift in Sources */,
 				46A3C99D17DFA81A002865AE /* SPAddCollaboratorsViewController.m in Sources */,
 				B52646AA22D3E04C00EBF299 /* UIViewController+Simplenote.swift in Sources */,
 				B55E428C22A1A4550018C0CE /* SPSortOrderViewController.swift in Sources */,
@@ -3693,7 +3656,6 @@
 				E215C79E180B228800AD36B5 /* SPTextField.m in Sources */,
 				A6DE79CE2552E6CC00BC69C6 /* TagListViewController.swift in Sources */,
 				B513F2B82319A9A40021CFA4 /* UITableViewCell+Simplenote.swift in Sources */,
-				A628BEC325ED703A00121B64 /* RemoteConstants.swift in Sources */,
 				B51F6DD52460D7540074DDD9 /* NSPredicate+Email.swift in Sources */,
 				B5C2EDF0255AFB6C00C09B32 /* PassthruView.swift in Sources */,
 				A6F4882325A8889E0050CFA8 /* UITextField+Tag.swift in Sources */,
@@ -3743,7 +3705,6 @@
 				375D24B121E01131007AB25A /* html5_blocks.c in Sources */,
 				B504D4DE23D2014200AEED27 /* IndexPath+Simplenote.swift in Sources */,
 				B5C99A512C45B94600728813 /* AuthenticationMode.swift in Sources */,
-				A6CC0B0725B8287F00F12A85 /* AccountRemote.swift in Sources */,
 				A61471B925D70C190065D849 /* PopoverViewController.swift in Sources */,
 				B536988D25646C9400817E30 /* CGRect+Simplenote.swift in Sources */,
 				B5E96B611BDE5ACA00D707F5 /* SPMarkdownParser.m in Sources */,
@@ -3752,7 +3713,6 @@
 				B59560E0251A46D500A06788 /* KeychainManager.swift in Sources */,
 				46A3C9AF17DFA81A002865AE /* NSString+Condensing.m in Sources */,
 				A6F487AF25A79D550050CFA8 /* BiometricAuthentication.swift in Sources */,
-				BA5768E3269A803F008B510E /* Remote.swift in Sources */,
 				A6F4881325A884CE0050CFA8 /* UITextInput+Simplenote.swift in Sources */,
 				B50F47A41D1D78EA00822748 /* SPRatingsHelper.m in Sources */,
 				371A8630213DF00E002E9120 /* SPPinLockManager.swift in Sources */,
@@ -3767,8 +3727,6 @@
 				A6CC0B1025B83FE400F12A85 /* AccountVerificationControllerTests.swift in Sources */,
 				A694ABB325D1687200CC3A2D /* NoteScrollPositionCacheTests.swift in Sources */,
 				A6E6CE7525A5B4A3005A92DB /* MockPinLockManager.swift in Sources */,
-				A6CC0B4425B8505700F12A85 /* MockURLSessionDataTask.swift in Sources */,
-				A6CC0B3625B8502800F12A85 /* MockURLSession.swift in Sources */,
 				B52F35D322F356F500724793 /* UserDefaults+Tests.swift in Sources */,
 				B511AEE9255A0A5E005B2159 /* InterlinkResultsControllerTests.swift in Sources */,
 				374F5EF521BF057E00B57E8B /* NSMutableAttributedStringStylingTests.swift in Sources */,
@@ -3781,13 +3739,11 @@
 				BAB017AB260ADDEB007A9CC3 /* MockTimerFactory.swift in Sources */,
 				B55AC57A22D27B9100D8CEB2 /* OptionsTests.swift in Sources */,
 				B543C7DF23CF6AB400003A80 /* NotesListControllerTests.swift in Sources */,
-				A6CC0B2D25B84FF200F12A85 /* AccountVerificationRemoteTests.swift in Sources */,
 				B5421F4023CE7A1C004DDC19 /* MockupStorage+Sample.swift in Sources */,
 				A6F4883225A891A70050CFA8 /* TagTextFieldInputValidatorTests.swift in Sources */,
 				A6E6CE9125A5B970005A92DB /* PinLockRemoveControllerTests.swift in Sources */,
 				B57401A025B7D9960058960E /* EmailVerificationTests.swift in Sources */,
 				A6E6CEC925A6053A005A92DB /* MockApplication.swift in Sources */,
-				BA18532826488DBC00D9A347 /* SignupRemoteTests.swift in Sources */,
 				BA3FB8CF25FEA0C500EA9A1B /* NoticeControllerTests.swift in Sources */,
 				BAB32C63269E4190005C72B2 /* RemoteResult+TestHelpers.swift in Sources */,
 				A645FA70254C5E69008A1519 /* NoteContentHelperTests.swift in Sources */,
@@ -6282,6 +6238,14 @@
 				minimumVersion = 1.3.0;
 			};
 		};
+		B51D44592C52CB4000F296A7 /* XCRemoteSwiftPackageReference "SimplenoteEndpoints-Swift" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "git@github.com:Automattic/SimplenoteEndpoints-Swift.git";
+			requirement = {
+				branch = trunk;
+				kind = branch;
+			};
+		};
 		B59CACFA2541E05400958330 /* XCRemoteSwiftPackageReference "SimplenoteInterlinks-Swift" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "git@github.com:Automattic/SimplenoteInterlinks-Swift.git";
@@ -6339,6 +6303,11 @@
 			package = B50D2FB424E6DFAC00163FC3 /* XCRemoteSwiftPackageReference "SimplenoteSearch-Swift" */;
 			productName = SimplenoteSearch;
 		};
+		B51D445A2C52CB4000F296A7 /* SimplenoteEndpoints */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = B51D44592C52CB4000F296A7 /* XCRemoteSwiftPackageReference "SimplenoteEndpoints-Swift" */;
+			productName = SimplenoteEndpoints;
+		};
 		B59CACFB2541E05400958330 /* SimplenoteInterlinks */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = B59CACFA2541E05400958330 /* XCRemoteSwiftPackageReference "SimplenoteInterlinks-Swift" */;
diff --git a/Simplenote/AccountRemote.swift b/Simplenote/AccountRemote.swift
deleted file mode 100644
index d91a16121..000000000
--- a/Simplenote/AccountRemote.swift
+++ /dev/null
@@ -1,54 +0,0 @@
-import Foundation
-
-// MARK: - AccountVerificationRemote
-//
-class AccountRemote: Remote {
-    // MARK: Performing tasks
-
-    /// Send verification request for specified email address
-    ///
-    func verify(email: String, completion: @escaping (_ result: Result<Data?, RemoteError>) -> Void) {
-        let request = verificationURLRequest(with: email)
-
-        performDataTask(with: request, completion: completion)
-    }
-
-    /// Send account deletion request for user
-    ///
-    func requestDelete(_ user: SPUser, completion: @escaping (_ result: Result<Data?, RemoteError>) -> Void) {
-        let request = deleteRequest(with: user)
-        performDataTask(with: request, completion: completion)
-    }
-
-    // MARK: URL Requests
-
-    private func verificationURLRequest(with email: String) -> URLRequest {
-        let base64EncodedEmail = email.data(using: .utf8)!.base64EncodedString()
-        let verificationURL = URL(string: SimplenoteConstants.verificationURL)!
-
-        var request = URLRequest(url: verificationURL.appendingPathComponent(base64EncodedEmail),
-                                 cachePolicy: .reloadIgnoringLocalAndRemoteCacheData,
-                                 timeoutInterval: RemoteConstants.timeout)
-        request.httpMethod = RemoteConstants.Method.GET
-
-        return request
-    }
-
-    private func deleteRequest(with user: SPUser) -> URLRequest {
-        let url = URL(string: SimplenoteConstants.accountDeletionURL)!
-
-        var request = URLRequest(url: url,
-                                 cachePolicy: .reloadIgnoringLocalAndRemoteCacheData,
-                                 timeoutInterval: RemoteConstants.timeout)
-        request.httpMethod = RemoteConstants.Method.POST
-        request.setValue("application/json", forHTTPHeaderField: "Content-Type")
-
-        let body = [
-            "username": user.email.lowercased(),
-            "token": user.authToken
-        ]
-        request.httpBody = try? JSONEncoder().encode(body)
-
-        return request
-    }
-}
diff --git a/Simplenote/Classes/RemoteConstants.swift b/Simplenote/Classes/RemoteConstants.swift
deleted file mode 100644
index 4a081c0c2..000000000
--- a/Simplenote/Classes/RemoteConstants.swift
+++ /dev/null
@@ -1,12 +0,0 @@
-import Foundation
-
-// MARK: Remote Constants
-//
-struct RemoteConstants {
-    struct Method {
-        static let GET = "GET"
-        static let POST = "POST"
-    }
-
-    static let timeout: TimeInterval = 30
-}
diff --git a/Simplenote/Classes/SignupRemote.swift b/Simplenote/Classes/SignupRemote.swift
deleted file mode 100644
index 8a947250a..000000000
--- a/Simplenote/Classes/SignupRemote.swift
+++ /dev/null
@@ -1,24 +0,0 @@
-import Foundation
-
-// MARK: - SignupRemote
-//
-class SignupRemote: Remote {
-    func signup(with email: String, completion: @escaping (_ result: Result<Data?, RemoteError>) -> Void) {
-        let urlRequest = request(with: email)
-
-        performDataTask(with: urlRequest, completion: completion)
-    }
-
-    private func request(with email: String) -> URLRequest {
-        let url = URL(string: SimplenoteConstants.signupURL)!
-
-        var request = URLRequest(url: url,
-                                 cachePolicy: .reloadIgnoringLocalAndRemoteCacheData,
-                                 timeoutInterval: RemoteConstants.timeout)
-        request.httpMethod = RemoteConstants.Method.POST
-        request.setValue("application/json", forHTTPHeaderField: "Content-Type")
-        request.httpBody = try? JSONEncoder().encode(["username": email.lowercased()])
-
-        return request
-    }
-}
diff --git a/Simplenote/LoginRemote.swift b/Simplenote/LoginRemote.swift
deleted file mode 100644
index b69fce3f6..000000000
--- a/Simplenote/LoginRemote.swift
+++ /dev/null
@@ -1,46 +0,0 @@
-import Foundation
-
-// MARK: - LoginRemote
-//
-class LoginRemote: Remote {
-
-    func requestLoginEmail(email: String, completion: @escaping (_ result: Result<Data?, RemoteError>) -> Void) {
-        let request = requestForLoginRequest(email: email)
-        performDataTask(with: request, completion: completion)
-    }
-
-    func requestLoginConfirmation(email: String, authCode: String) async throws -> LoginConfirmationResponse {
-        let request = requestForLoginCompletion(email: email, authCode: authCode)
-        return try await performDataTask(with: request, type: LoginConfirmationResponse.self)
-    }
-}
-
-
-// MARK: - LoginConfirmationResponse
-//
-struct LoginConfirmationResponse: Decodable {
-    let username: String
-    let syncToken: String
-}
-
-
-// MARK: - Private API(s)
-//
-private extension LoginRemote {
-
-    func requestForLoginRequest(email: String) -> URLRequest {
-        let url = URL(string: SimplenoteConstants.loginRequestURL)!
-        return requestForURL(url, method: RemoteConstants.Method.POST, httpBody: [
-            "request_source": SimplenoteConstants.simplenotePlatformName,
-            "username": email.lowercased()
-        ])
-    }
-
-    func requestForLoginCompletion(email: String, authCode: String) -> URLRequest {
-        let url = URL(string: SimplenoteConstants.loginCompletionURL)!
-        return requestForURL(url, method: RemoteConstants.Method.POST, httpBody: [
-            "auth_code": authCode,
-            "username": email
-        ])
-    }
-}
diff --git a/Simplenote/Remote.swift b/Simplenote/Remote.swift
deleted file mode 100644
index ba5c8c6e7..000000000
--- a/Simplenote/Remote.swift
+++ /dev/null
@@ -1,72 +0,0 @@
-import Foundation
-
-class Remote {
-    private let urlSession: URLSession
-
-    init(urlSession: URLSession = URLSession.shared) {
-        self.urlSession = urlSession
-    }
-
-    /// Send  task for remote
-    /// Sublcassing Notes: To be able to send a task it is required to first setup the URL request for the task to use
-    ///
-    func performDataTask(with request: URLRequest, completion: @escaping (_ result: Result<Data?, RemoteError>) -> Void) {
-        let dataTask = urlSession.dataTask(with: request) { (data, response, networkError) in
-            DispatchQueue.main.async {
-                
-                if let error = RemoteError(statusCode: response?.responseStatusCode, responseData: data, networkError: networkError) {
-                    completion(.failure(error))
-                    return
-                }
-
-                completion(.success(data))
-            }
-        }
-
-        dataTask.resume()
-    }
-
-    /// Performs a URLSession Data Task
-    ///
-    func performDataTask(with request: URLRequest) async throws -> Data {
-        let (data, response) = try await urlSession.data(for: request)
-        if let error = RemoteError(statusCode: response.responseStatusCode, responseData: data) {
-            throw error
-        }
-        
-        return data
-    }
-    
-    /// Performs a URLSession Data Task, and decodes a given Type
-    ///
-    func performDataTask<T: Decodable>(with request: URLRequest, type: T.Type) async throws -> T {
-        let data = try await performDataTask(with: request)
-
-        let decoder = JSONDecoder()
-        decoder.keyDecodingStrategy = .convertFromSnakeCase
-        return try decoder.decode(type, from: data)
-    }
-    
-    /// Builds a URLRequest for the specified URL / Method / params
-    ///
-    func requestForURL(_ url: URL, method: String, httpBody: [String: String]?) -> URLRequest {
-        var request = URLRequest(url: url, cachePolicy: .reloadIgnoringLocalAndRemoteCacheData, timeoutInterval: RemoteConstants.timeout)
-
-        request.httpMethod = method
-        request.setValue("application/json", forHTTPHeaderField: "Content-Type")
-        
-        if let httpBody {
-            request.httpBody = try? JSONEncoder().encode(httpBody)
-        }
-
-        return request
-    }
-}
-
-
-extension URLResponse {
-    
-    var responseStatusCode: Int {
-        (self as? HTTPURLResponse)?.statusCode ?? .zero
-    }
-}
diff --git a/Simplenote/RemoteError.swift b/Simplenote/RemoteError.swift
deleted file mode 100644
index ebf276aba..000000000
--- a/Simplenote/RemoteError.swift
+++ /dev/null
@@ -1,50 +0,0 @@
-import Foundation
-
-
-// MARK: - RemoteError
-//
-struct RemoteError: Error {
-    let statusCode: Int
-    let response: String?
-    let networkError: Error?
-}
-
-
-// MARK: - RemoteError
-//
-extension RemoteError {
-    
-    init?(statusCode: Int?, responseData: Data? = nil, networkError: Error? = nil) {
-        if let statusCode, statusCode / 100 == 2 {
-            return nil
-        }
-
-        let response = ReponseErrorContainer(body: responseData)
-        
-        self.statusCode = statusCode ?? .zero
-        self.response = response?.error
-        self.networkError = networkError
-    }
-}
-
-
-extension RemoteError: Equatable {
-    static func == (lhs: RemoteError, rhs: RemoteError) -> Bool {
-        lhs.statusCode == rhs.statusCode && lhs.response == rhs.response && lhs.networkError?.localizedDescription == rhs.networkError?.localizedDescription
-    }
-}
-
-
-// MARK: - ReponseErrorContainer
-//
-private struct ReponseErrorContainer: Decodable, Equatable {
-    let error: String
-
-    init?(body: Data?) {
-        guard let body, let decoded = try? JSONDecoder().decode(ReponseErrorContainer.self, from: body) else {
-            return nil
-        }
-        
-        self = decoded
-    }
-}
diff --git a/Simplenote/URLRequest+Simplenote.swift b/Simplenote/URLRequest+Simplenote.swift
deleted file mode 100644
index 5adddd4cf..000000000
--- a/Simplenote/URLRequest+Simplenote.swift
+++ /dev/null
@@ -1,13 +0,0 @@
-import Foundation
-
-extension URLRequest {
-    func decodeHtmlBody<T: Decodable>() throws -> T? {
-          guard let _ = httpBody else {
-              return nil
-          }
-
-          return try httpBody.map {
-            try JSONDecoder().decode(T.self, from: $0)
-          }
-      }
-}
diff --git a/SimplenoteTests/Network/MockURLSession.swift b/SimplenoteTests/Network/MockURLSession.swift
deleted file mode 100644
index 70b5042d2..000000000
--- a/SimplenoteTests/Network/MockURLSession.swift
+++ /dev/null
@@ -1,15 +0,0 @@
-import Foundation
-
-// MARK: - MockURLSession
-//
-class MockURLSession: URLSession {
-    var data: (Data?, URLResponse?, Error?)?
-    var lastRequest: URLRequest?
-
-    override func dataTask(with request: URLRequest, completionHandler: @escaping (Data?, URLResponse?, Error?) -> Void) -> URLSessionDataTask {
-        lastRequest = request
-        return MockURLSessionDataTask {
-            completionHandler(self.data?.0, self.data?.1, self.data?.2)
-        }
-    }
-}
diff --git a/SimplenoteTests/Network/MockURLSessionDataTask.swift b/SimplenoteTests/Network/MockURLSessionDataTask.swift
deleted file mode 100644
index 32a97ea9a..000000000
--- a/SimplenoteTests/Network/MockURLSessionDataTask.swift
+++ /dev/null
@@ -1,15 +0,0 @@
-import Foundation
-
-// MARK: - MockURLSessionDataTask
-//
-class MockURLSessionDataTask: URLSessionDataTask {
-    private let completion: () -> Void
-
-    init(completion: @escaping () -> Void) {
-        self.completion = completion
-    }
-
-    override func resume() {
-        completion()
-    }
-}
diff --git a/SimplenoteTests/SignupRemoteTests.swift b/SimplenoteTests/SignupRemoteTests.swift
deleted file mode 100644
index e96d19379..000000000
--- a/SimplenoteTests/SignupRemoteTests.swift
+++ /dev/null
@@ -1,75 +0,0 @@
-import XCTest
-@testable import Simplenote
-
-class SignupRemoteTests: XCTestCase {
-    private lazy var urlSession = MockURLSession()
-    private lazy var signupRemote = SignupRemote(urlSession: urlSession)
-
-    func testSuccessWhenStatusCodeIs2xx() {
-        for _ in 0..<5 {
-            test(withStatusCode: Int.random(in: 200..<300), email: "email@gmail.com", expectedResult: .success(nil))
-        }
-    }
-
-    func testFailureWhenStatusCodeIs4xxOr5xx() {
-        for _ in 0..<5 {
-            let statusCode = Int.random(in: 400..<600)
-            test(withStatusCode: statusCode, email: "email@gmail.com", expectedResult: .failure(RemoteError(statusCode: statusCode, response: nil, networkError: nil)))
-        }
-    }
-
-    func testRequestSetsEmailToCorrectCase() throws {
-        signupRemote.signup(with: "EMAIL@gmail.com", completion: { _ in })
-
-        let expecation = "email@gmail.com"
-        let body: Dictionary<String, String> = try XCTUnwrap(urlSession.lastRequest?.decodeHtmlBody())
-        let decodedEmail = try XCTUnwrap(body["username"])
-
-        XCTAssertEqual(expecation, decodedEmail)
-    }
-
-    func testRequestSetsEmailToCorrectCaseWithSpecialCharacters() throws {
-        signupRemote.signup(with: "EMAIL123456@#$%^@gmail.com", completion: { _ in })
-
-        let expecation = "email123456@#$%^@gmail.com"
-        let body: Dictionary<String, String> = try XCTUnwrap(urlSession.lastRequest?.decodeHtmlBody())
-        let decodedEmail = try XCTUnwrap(body["username"])
-
-        XCTAssertEqual(expecation, decodedEmail)
-    }
-
-    func testRequestSetsEmailToCorrectCaseWithMixedCase() throws {
-        signupRemote.signup(with: "eMaIl@gmail.com", completion: { _ in })
-
-        let expecation = "email@gmail.com"
-        let body: Dictionary<String, String> = try XCTUnwrap(urlSession.lastRequest?.decodeHtmlBody())
-        let decodedEmail = try XCTUnwrap(body["username"])
-
-        XCTAssertEqual(expecation, decodedEmail)
-    }
-
-    private func test(withStatusCode statusCode: Int?, email: String, expectedResult: Result<Data?, RemoteError>) {
-        urlSession.data = (nil,
-                           response(with: statusCode),
-                           nil)
-
-        let expectation = self.expectation(description: "Verify is called")
-
-        signupRemote.signup(with: email) { (result) in
-            XCTAssertEqual(result, expectedResult)
-            expectation.fulfill()
-        }
-
-        waitForExpectations(timeout: Constants.expectationTimeout, handler: nil)
-    }
-
-    private func response(with statusCode: Int?) -> HTTPURLResponse? {
-        guard let statusCode = statusCode else {
-            return nil
-        }
-        return HTTPURLResponse(url: URL(fileURLWithPath: "/"),
-                               statusCode: statusCode,
-                               httpVersion: nil,
-                               headerFields: nil)
-    }
-}
diff --git a/SimplenoteTests/Verification/AccountVerificationRemoteTests.swift b/SimplenoteTests/Verification/AccountVerificationRemoteTests.swift
deleted file mode 100644
index ec2b6397b..000000000
--- a/SimplenoteTests/Verification/AccountVerificationRemoteTests.swift
+++ /dev/null
@@ -1,51 +0,0 @@
-import XCTest
-@testable import Simplenote
-
-// MARK: - AccountVerificationRemoteTests
-//
-class AccountVerificationRemoteTests: XCTestCase {
-    private lazy var urlSession = MockURLSession()
-    private lazy var remote = AccountRemote(urlSession: urlSession)
-
-    func testSuccessWhenStatusCodeIs2xx() {
-        for _ in 0..<5 {
-            test(withStatusCode: Int.random(in: 200..<300), expectedResult: .success(nil))
-        }
-    }
-
-    func testFailureWhenStatusCodeIs4xxOr5xx() {
-        for _ in 0..<5 {
-            let statusCode = Int.random(in: 400..<600)
-            test(withStatusCode: statusCode, expectedResult: .failure(RemoteError(statusCode: statusCode, response: nil, networkError: nil)))
-        }
-    }
-
-    func testFailureWhenNoResponse() {
-        test(withStatusCode: nil, expectedResult: .failure(RemoteError(statusCode: .zero, response: nil, networkError: nil)))
-    }
-
-    private func test(withStatusCode statusCode: Int?, expectedResult: Result<Data?, RemoteError>) {
-        urlSession.data = (nil,
-                           response(with: statusCode),
-                           nil)
-
-        let expectation = self.expectation(description: "Verify is called")
-
-        remote.verify(email: UUID().uuidString) { (result) in
-            XCTAssertEqual(result, expectedResult)
-            expectation.fulfill()
-        }
-
-        waitForExpectations(timeout: 3, handler: nil)
-    }
-
-    private func response(with statusCode: Int?) -> HTTPURLResponse? {
-        guard let statusCode = statusCode else {
-            return nil
-        }
-        return HTTPURLResponse(url: URL(fileURLWithPath: "/"),
-                               statusCode: statusCode,
-                               httpVersion: nil,
-                               headerFields: nil)
-    }
-}

From ce30834f05519348869e00bd49c98453366a0ab0 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Thu, 25 Jul 2024 15:22:51 -0300
Subject: [PATCH 323/547] Wires SimplenoteEndpoints Mark 1.0.0

---
 Simplenote.xcodeproj/project.pbxproj                        | 4 ++--
 .../xcshareddata/swiftpm/Package.resolved                   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index f1b5a3a4f..6154f0d96 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -6242,8 +6242,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "git@github.com:Automattic/SimplenoteEndpoints-Swift.git";
 			requirement = {
-				branch = trunk;
-				kind = branch;
+				kind = upToNextMajorVersion;
+				minimumVersion = 1.0.0;
 			};
 		};
 		B59CACFA2541E05400958330 /* XCRemoteSwiftPackageReference "SimplenoteInterlinks-Swift" */ = {
diff --git a/Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 7cb132dca..090b42b39 100644
--- a/Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "f6a7610fd9e0ddbd97380e25a842046d3c6a6b02bac538637af84160717aaa8f",
+  "originHash" : "5c7dc5a8c3fa899620d4a2168cf121438ee740cb5c2b5fac978ee6263951dbe7",
   "pins" : [
     {
       "identity" : "automattic-tracks-ios",
@@ -33,8 +33,8 @@
       "kind" : "remoteSourceControl",
       "location" : "git@github.com:Automattic/SimplenoteEndpoints-Swift.git",
       "state" : {
-        "branch" : "trunk",
-        "revision" : "3d1c0a5db39ca798a7de10e7faeef8ae66e941e6"
+        "revision" : "3d1c0a5db39ca798a7de10e7faeef8ae66e941e6",
+        "version" : "1.0.0"
       }
     },
     {

From 10ec86e6caf22e8dbef288ba1abef3f5471ada40 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Thu, 25 Jul 2024 16:01:15 -0300
Subject: [PATCH 324/547] Updates buildkite xcode to 15.4

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 2105546bf..da1e4f552 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -5,7 +5,7 @@ common_params:
     - automattic/a8c-ci-toolkit#3.1.0
   # Common environment values to use with the `env` key.
   - &common_env
-    IMAGE_ID: xcode-15.1
+    IMAGE_ID: xcode-15.4
 
 # This is the default pipeline – it will build and test the app
 steps:

From 526648df5109f297961f5cff9f2fbd72de8418dc Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Fri, 26 Jul 2024 15:16:54 -0300
Subject: [PATCH 325/547] Authentication: Code Expired now gets you back to the
 initial Login UI

---
 Simplenote/Classes/SPAuthViewController.swift | 2 +-
 Simplenote/UIAlertController+Auth.swift       | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index 9e3e49bea..e3a323041 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -675,7 +675,7 @@ private extension SPAuthViewController {
     
     func presentLoginCodeExpiredError() {
         let alertController = UIAlertController.buildLoginCodeNotFoundAlert {
-            self.requestLogInCodeAndDontPush()
+            self.navigationController?.popViewController(animated: true)
         }
         
         present(alertController, animated: true, completion: nil)
diff --git a/Simplenote/UIAlertController+Auth.swift b/Simplenote/UIAlertController+Auth.swift
index bc33c370e..73702271f 100644
--- a/Simplenote/UIAlertController+Auth.swift
+++ b/Simplenote/UIAlertController+Auth.swift
@@ -10,12 +10,10 @@ extension UIAlertController {
     static func buildLoginCodeNotFoundAlert(onRequestCode: @escaping () -> Void) -> UIAlertController {
         let title = NSLocalizedString("Sorry!", comment: "Email TextField Placeholder")
         let message = NSLocalizedString("The authentication code you've requested has expired. Please request a new one", comment: "Email TextField Placeholder")
-        let dismissAction = NSLocalizedString("Dismiss", comment: "Email TextField Placeholder")
-        let requestAction = NSLocalizedString("Request a New Code", comment: "Email TextField Placeholder")
-        
+        let acceptText = NSLocalizedString("Accept", comment: "Accept Message")
+
         let alertController = UIAlertController(title: title, message: message, preferredStyle: .alert)
-        alertController.addCancelActionWithTitle(dismissAction)
-        alertController.addDefaultActionWithTitle(requestAction) { _ in
+        alertController.addDefaultActionWithTitle(acceptText) { _ in
             onRequestCode()
         }
         

From 95bb7e67954ecd83992fb399ffda325afdd3104b Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Sat, 27 Jul 2024 08:36:41 +1000
Subject: [PATCH 326/547] Move lane to generate strings to dedicated file

---
 fastlane/Fastfile              | 45 ++----------------------------
 fastlane/lanes/localization.rb | 51 ++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 43 deletions(-)
 create mode 100644 fastlane/lanes/localization.rb

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 2bca74ae3..518a918d1 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -16,6 +16,8 @@ SECRETS_ROOT = File.join(Dir.home, '.configure', 'simplenote-ios', 'secrets')
 APP_STORE_CONNECT_KEY_PATH = File.join(SECRETS_ROOT, 'app_store_connect_fastlane_api_key.json')
 $used_test_account_index = nil
 
+import 'lanes/localization'
+
 before_all do
   # Ensure we use the latest version of the toolkit
   check_for_toolkit_updates unless is_ci || ENV['FASTLANE_SKIP_TOOLKIT_UPDATE_CHECK']
@@ -47,32 +49,6 @@ GITHUB_REPO = 'Automattic/simplenote-ios'
 APP_STORE_BUNDLE_IDENTIFIER = 'com.codality.NotationalFlow'
 DEFAULT_BRANCH = 'trunk'
 
-# List of locales used for the app strings (GlotPress code => `*.lproj` folder name`)
-#
-# TODO: Replace with `LocaleHelper` once provided by release toolkit (https://github.com/wordpress-mobile/release-toolkit/pull/296)
-GLOTPRESS_TO_LPROJ_APP_LOCALE_CODES = {
-  'ar' => 'ar',             # Arabic
-  'cy' => 'cy',             # Welsh
-  'de' => 'de',             # German
-  'el' => 'el',             # Greek
-  'en' => 'en',             # English
-  'es' => 'es',             # Spanish
-  'fa' => 'fa',             # Persian
-  'fr' => 'fr',             # French
-  'he' => 'he',             # Hebrew
-  'id' => 'id',             # Indonesian
-  'it' => 'it',             # Italian
-  'ja' => 'ja',             # Japanese
-  'ko' => 'ko',             # Korean
-  'nl' => 'nl',             # Dutch
-  'pt-br' => 'pt-BR',       # Portuguese (Brazil)
-  'ru' => 'ru',             # Russian
-  'sv' => 'sv',             # Swedish
-  'tr' => 'tr',             # Turkish
-  'zh-cn' => 'zh-Hans-CN',  # Chinese (China)
-  'zh-tw' => 'zh-Hant-TW'   # Chinese (Taiwan)
-}.freeze
-
 ########################################################################
 # Environment
 ########################################################################
@@ -1128,23 +1104,6 @@ end
 # Localization Lanes
 ########################################################################
 
-desc 'Updates the main `Localizable.strings` file — that will be imported by GlotPress'
-lane :generate_strings_file_for_glotpress do
-  en_lproj_path = File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'en.lproj')
-  ios_generate_strings_file_from_code(
-    paths: ['Simplenote/', 'SimplenoteIntents/', 'SimplenoteShare/',
-            'SimplenoteWidgets/', 'Pods/Simperium/Simperium/',
-            'Pods/Simperium/Simperium-iOS'],
-    output_dir: en_lproj_path
-  )
-
-  git_commit(
-    path: en_lproj_path,
-    message: 'Freeze strings for localization',
-    allow_nothing_to_commit: true
-  )
-end
-
 ########################################################################
 # Helper Lanes
 ########################################################################
diff --git a/fastlane/lanes/localization.rb b/fastlane/lanes/localization.rb
new file mode 100644
index 000000000..95b54c8e2
--- /dev/null
+++ b/fastlane/lanes/localization.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+# List of locales used for the app strings (GlotPress code => `*.lproj` folder name`)
+#
+# TODO: Replace with `LocaleHelper` once provided by release toolkit (https://github.com/wordpress-mobile/release-toolkit/pull/296)
+GLOTPRESS_TO_LPROJ_APP_LOCALE_CODES = {
+  'ar' => 'ar',             # Arabic
+  'cy' => 'cy',             # Welsh
+  'de' => 'de',             # German
+  'el' => 'el',             # Greek
+  'en' => 'en',             # English
+  'es' => 'es',             # Spanish
+  'fa' => 'fa',             # Persian
+  'fr' => 'fr',             # French
+  'he' => 'he',             # Hebrew
+  'id' => 'id',             # Indonesian
+  'it' => 'it',             # Italian
+  'ja' => 'ja',             # Japanese
+  'ko' => 'ko',             # Korean
+  'nl' => 'nl',             # Dutch
+  'pt-br' => 'pt-BR',       # Portuguese (Brazil)
+  'ru' => 'ru',             # Russian
+  'sv' => 'sv',             # Swedish
+  'tr' => 'tr',             # Turkish
+  'zh-cn' => 'zh-Hans-CN',  # Chinese (China)
+  'zh-tw' => 'zh-Hant-TW'   # Chinese (Taiwan)
+}.freeze
+
+platform :ios do
+  desc 'Updates the main `Localizable.strings` file — that will be imported by GlotPress'
+  lane :generate_strings_file_for_glotpress do
+    en_lproj_path = File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'en.lproj')
+    ios_generate_strings_file_from_code(
+      paths: [
+        'Simplenote/',
+        'SimplenoteIntents/',
+        'SimplenoteShare/',
+        'SimplenoteWidgets/',
+        'Pods/Simperium/Simperium/',
+        'Pods/Simperium/Simperium-iOS'
+      ],
+      output_dir: en_lproj_path
+    )
+
+    git_commit(
+      path: en_lproj_path,
+      message: 'Freeze strings for localization',
+      allow_nothing_to_commit: true
+    )
+  end
+end

From 6c22956393b46a4470d49bb0a5089d54316c36b8 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Sat, 27 Jul 2024 08:29:04 +1000
Subject: [PATCH 327/547] Move code freeze lane to dedicated file

---
 .rubocop.yml              |  3 +-
 fastlane/Fastfile         | 87 ---------------------------------------
 fastlane/lanes/release.rb | 53 ++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 88 deletions(-)
 create mode 100644 fastlane/lanes/release.rb

diff --git a/.rubocop.yml b/.rubocop.yml
index 4c0c39f28..b4e39abfd 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -16,8 +16,9 @@ Layout/LineLength:
   Max: 180
 
 Metrics/BlockLength:
-  Exclude:
+  Exclude: &xfiles
     - fastlane/Fastfile
+    - fastlane/lanes/*.rb
     - Rakefile
 
 Style/HashSyntax:
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 518a918d1..cb76c009e 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -70,57 +70,6 @@ def get_required_env(key)
 end
 
 platform :ios do
-  ########################################################################
-  # Release Lanes
-  ########################################################################
-  #####################################################################################
-  # code_freeze
-  # -----------------------------------------------------------------------------------
-  # This lane executes the steps planned on code freeze
-  # -----------------------------------------------------------------------------------
-  # Usage:
-  # bundle exec fastlane code_freeze [skip_confirm:<skip confirm>]
-  #
-  # Example:
-  # bundle exec fastlane code_freeze
-  # bundle exec fastlane code_freeze skip_confirm:true
-  #####################################################################################
-  desc 'Creates a new release branch from the current trunk'
-  lane :code_freeze do |options|
-    ios_codefreeze_prechecks(options)
-
-    ios_bump_version_release
-    new_version = ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
-
-    extract_release_notes_for_version(
-      version: new_version,
-      release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'RELEASE-NOTES.txt'),
-      extracted_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt')
-    )
-    ios_update_release_notes(new_version: new_version)
-
-    generate_strings_file_for_glotpress
-
-    UI.important('Pushing changes to remote, configuring the release on GitHub, and triggering the beta build')
-    unless options[:skip_confirm] || UI.confirm('Do you want to continue?')
-      UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.")
-    end
-
-    push_to_git_remote(tags: false)
-
-    copy_branch_protection(
-      repository: GITHUB_REPO,
-      from_branch: DEFAULT_BRANCH,
-      to_branch: "release/#{new_version}"
-    )
-    setfrozentag(
-      repository: GITHUB_REPO,
-      milestone: new_version
-    )
-
-    trigger_beta_build(branch_to_build: "release/#{new_version}")
-  end
-
   #####################################################################################
   # update_appstore_strings
   # -----------------------------------------------------------------------------------
@@ -557,42 +506,6 @@ platform :ios do
     )
   end
 
-  #####################################################################################
-  # trigger_beta_build
-  # -----------------------------------------------------------------------------------
-  # This lane triggers a beta build on CI
-  # -----------------------------------------------------------------------------------
-  # @option [String] branch_to_build The name of the branch we want the CI to build, e.g. `release/19.3`
-  #
-  # Usage:
-  # bundle exec fastlane trigger_beta_build [branch_to_build:<branch_name>]
-  #
-  #####################################################################################
-  lane :trigger_beta_build do |options|
-    trigger_buildkite_release_build(
-      branch: options[:branch_to_build],
-      beta: true
-    )
-  end
-
-  #####################################################################################
-  # trigger_release_build
-  # -----------------------------------------------------------------------------------
-  # This lane triggers a stable release build on CI
-  # -----------------------------------------------------------------------------------
-  # @option [String] branch_to_build The name of the branch we want the CI to build, e.g. `release/19.3`
-  #
-  # Usage:
-  # bundle exec fastlane trigger_release_build [branch_to_build:<branch_name>]
-  #
-  #####################################################################################
-  lane :trigger_release_build do |options|
-    trigger_buildkite_release_build(
-      branch: options[:branch_to_build],
-      beta: false
-    )
-  end
-
   #####################################################################################
   # build_and_upload_installable_build
   # -----------------------------------------------------------------------------------
diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
new file mode 100644
index 000000000..2f952a80e
--- /dev/null
+++ b/fastlane/lanes/release.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+# Lanes related to the Release Process (Code Freeze, Betas, Final Build, App Store Submission…)
+platform :ios do
+  lane :code_freeze do |options|
+    ios_codefreeze_prechecks(options)
+
+    ios_bump_version_release
+    new_version = ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
+
+    extract_release_notes_for_version(
+      version: new_version,
+      release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'RELEASE-NOTES.txt'),
+      extracted_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt')
+    )
+    ios_update_release_notes(new_version: new_version)
+
+    generate_strings_file_for_glotpress
+
+    UI.important('Pushing changes to remote, configuring the release on GitHub, and triggering the beta build')
+    unless options[:skip_confirm] || UI.confirm('Do you want to continue?')
+      UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.")
+    end
+
+    push_to_git_remote(tags: false)
+
+    copy_branch_protection(
+      repository: GITHUB_REPO,
+      from_branch: DEFAULT_BRANCH,
+      to_branch: "release/#{new_version}"
+    )
+    setfrozentag(
+      repository: GITHUB_REPO,
+      milestone: new_version
+    )
+
+    trigger_beta_build(branch_to_build: "release/#{new_version}")
+  end
+
+  lane :trigger_beta_build do |options|
+    trigger_buildkite_release_build(
+      branch: options[:branch_to_build],
+      beta: true
+    )
+  end
+
+  lane :trigger_release_build do |options|
+    trigger_buildkite_release_build(
+      branch: options[:branch_to_build],
+      beta: false
+    )
+  end
+end

From d70669aeec86a8fa4fad843b6a435c2c1515ef3b Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 09:40:33 +1000
Subject: [PATCH 328/547] Move `new_beta` lane to `release.rb`

---
 fastlane/Fastfile         | 29 -----------------------------
 fastlane/lanes/release.rb | 13 +++++++++++++
 2 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index cb76c009e..8b58484e0 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -133,35 +133,6 @@ platform :ios do
     end
   end
 
-  #####################################################################################
-  # new_beta_release
-  # -----------------------------------------------------------------------------------
-  # This lane updates the release branch for a new beta release. It will update the
-  # current release branch by default. If you want to update a different branch
-  # (i.e. hotfix branch) pass the related version with the 'base_version' param
-  # (example: base_version:10.6.1 will work on the 10.6.1 branch)
-  # -----------------------------------------------------------------------------------
-  # Usage:
-  # bundle exec fastlane new_beta_release [skip_confirm:<skip confirm>] [base_version:<version>]
-  #
-  # Example:
-  # bundle exec fastlane new_beta_release
-  # bundle exec fastlane new_beta_release skip_confirm:true
-  # bundle exec fastlane new_beta_release base_version:10.6.1
-  #####################################################################################
-  desc 'Updates a release branch for a new beta release'
-  lane :new_beta_release do |options|
-    ios_betabuild_prechecks(options)
-    download_localized_strings_and_metadata_from_glotpress
-    ios_lint_localizations(
-      input_dir: 'Simplenote',
-      allow_retry: true
-    )
-    ios_bump_version_beta
-    version = ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
-    trigger_beta_build(branch_to_build: "release/#{version}")
-  end
-
   #####################################################################################
   # new_hotfix_release
   # -----------------------------------------------------------------------------------
diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 2f952a80e..52f30167b 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 # Lanes related to the Release Process (Code Freeze, Betas, Final Build, App Store Submission…)
+
 platform :ios do
   lane :code_freeze do |options|
     ios_codefreeze_prechecks(options)
@@ -37,6 +38,18 @@
     trigger_beta_build(branch_to_build: "release/#{new_version}")
   end
 
+  lane :new_beta_release do |options|
+    ios_betabuild_prechecks(options)
+    download_localized_strings_and_metadata_from_glotpress
+    ios_lint_localizations(
+      input_dir: 'Simplenote',
+      allow_retry: true
+    )
+    ios_bump_version_beta
+    version = ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
+    trigger_beta_build(branch_to_build: "release/#{version}")
+  end
+
   lane :trigger_beta_build do |options|
     trigger_buildkite_release_build(
       branch: options[:branch_to_build],

From 624c158c4defe40d4119e0fce4573e586ad504da Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 09:43:54 +1000
Subject: [PATCH 329/547] Use `set_milestone_frozen_marker` instead of
 `setfrozentag`

---
 fastlane/Fastfile         | 2 +-
 fastlane/lanes/release.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 8b58484e0..1fc8e0b5c 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -221,7 +221,7 @@ platform :ios do
       repository: GITHUB_REPO,
       branch: "release/#{version}"
     )
-    setfrozentag(
+    set_milestone_frozen_marker(
       repository: GITHUB_REPO,
       milestone: version,
       freeze: false
diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 52f30167b..bf0e001fb 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -30,7 +30,7 @@
       from_branch: DEFAULT_BRANCH,
       to_branch: "release/#{new_version}"
     )
-    setfrozentag(
+    set_milestone_frozen_marker(
       repository: GITHUB_REPO,
       milestone: new_version
     )

From c6d14fa2d1fc02e5382aa0a3634df95ee31a1675 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 09:55:54 +1000
Subject: [PATCH 330/547] Introduce `EnvManager`

---
 fastlane/Fastfile           | 67 ++++++++++++----------------------
 fastlane/example.env        | 17 +++++++++
 fastlane/lib/env_manager.rb | 71 +++++++++++++++++++++++++++++++++++++
 3 files changed, 111 insertions(+), 44 deletions(-)
 create mode 100644 fastlane/example.env
 create mode 100644 fastlane/lib/env_manager.rb

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 1fc8e0b5c..8bcf97857 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -8,31 +8,20 @@ fastlane_require 'buildkit'
 
 UI.user_error!('Please run fastlane via `bundle exec`') unless FastlaneCore::Helper.bundler?
 
-USER_ENV_FILE_PATH = File.join(Dir.home, '.simplenoteios-env.default')
-PROJECT_ENV_FILE_PATH = File.join(
-  Dir.home, '.configure', 'simplenote-ios', 'secrets', 'project.env'
-)
 SECRETS_ROOT = File.join(Dir.home, '.configure', 'simplenote-ios', 'secrets')
 APP_STORE_CONNECT_KEY_PATH = File.join(SECRETS_ROOT, 'app_store_connect_fastlane_api_key.json')
 $used_test_account_index = nil
 
 import 'lanes/localization'
+import 'lanes/release'
+
+require_relative 'lib/env_manager'
 
 before_all do
   # Ensure we use the latest version of the toolkit
   check_for_toolkit_updates unless is_ci || ENV['FASTLANE_SKIP_TOOLKIT_UPDATE_CHECK']
 
-  # Check that the env files exist
-  unless is_ci || File.file?(USER_ENV_FILE_PATH)
-    error_message = <<~ERROR
-      ~/.simplenoteios-env.default not found. Please copy env/user.env-example to #{USER_ENV_FILE_PATH} and fill in the values") using the following command:
-
-      \tcp #{PROJECT_ROOT_FOLDER}/fastlane/env/user.env-example #{USER_ENV_FILE_PATH}
-    ERROR
-    UI.user_error!(error_message)
-  end
-
-  UI.user_error!('project.env not found: Make sure your configuration is up to date with `rake dependencies`') unless File.file?(PROJECT_ENV_FILE_PATH)
+  EnvManager.set_up(env_file_name: 'simplenote-ios')
 
   setup_ci
 end
@@ -52,9 +41,6 @@ DEFAULT_BRANCH = 'trunk'
 ########################################################################
 # Environment
 ########################################################################
-Dotenv.load(USER_ENV_FILE_PATH)
-Dotenv.load(PROJECT_ENV_FILE_PATH)
-
 ENV['PROJECT_NAME'] = 'Simplenote'
 ENV['PROJECT_ROOT_FOLDER'] = PROJECT_ROOT_FOLDER
 ENV['APP_STORE_STRINGS_FILE_NAME'] = 'AppStoreStrings.pot'
@@ -62,13 +48,6 @@ ENV['PUBLIC_CONFIG_FILE'] = VERSION_FILE_PATH
 ENV['DOWNLOAD_METADATA'] = './fastlane/download_metadata.swift'
 ENV['FL_RELEASE_TOOLKIT_DEFAULT_BRANCH'] = 'trunk'
 
-# Use this instead of getting values from ENV directly
-# It will throw an error if the requested value is missing
-def get_required_env(key)
-  UI.user_error!("Environment variable '#{key}' is not set. Have you setup #{USER_ENV_FILE_PATH} correctly?") unless ENV.key?(key)
-  ENV.fetch(key)
-end
-
 platform :ios do
   #####################################################################################
   # update_appstore_strings
@@ -353,7 +332,7 @@ platform :ios do
       export_method: 'enterprise',
       clean: true,
       output_directory: OUTPUT_DIRECTORY_PATH,
-      export_team_id: get_required_env('INT_EXPORT_TEAM_ID'),
+      export_team_id: EnvManager.get_required_env!('INT_EXPORT_TEAM_ID'),
       export_options: {
         method: 'enterprise',
         provisioningProfiles: simplenote_provisioning_profiles(
@@ -366,7 +345,7 @@ platform :ios do
     File.rename(File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote.ipa'), File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote Internal.ipa'))
 
     appcenter_upload(
-      api_token: get_required_env('APPCENTER_API_TOKEN'),
+      api_token: EnvManager.get_required_env!('APPCENTER_API_TOKEN'),
       owner_name: 'automattic',
       owner_type: 'organization',
       app_name: 'Simplenote',
@@ -375,7 +354,7 @@ platform :ios do
     )
 
     sentry_upload_dsym(
-      auth_token: get_required_env('SENTRY_API_TOKEN'),
+      auth_token: EnvManager.get_required_env!('SENTRY_AUTH_TOKEN'),
       org_slug: 'a8c',
       project_slug: 'simplenote-ios',
       dsym_path: lane_context[SharedValues::DSYM_OUTPUT_PATH]
@@ -413,7 +392,7 @@ platform :ios do
       clean: true,
       export_options: {
         method: 'app-store',
-        export_team_id: get_required_env('EXT_EXPORT_TEAM_ID'),
+        export_team_id: EnvManager.get_required_env!('EXT_EXPORT_TEAM_ID'),
         provisioningProfiles: simplenote_provisioning_profiles
       }
     )
@@ -428,7 +407,7 @@ platform :ios do
 
     sentry_upload_dsym(
       dsym_path: dsym_path,
-      auth_token: get_required_env('SENTRY_AUTH_TOKEN'),
+      auth_token: EnvManager.get_required_env!('SENTRY_AUTH_TOKEN'),
       org_slug: 'a8c',
       project_slug: 'simplenote-ios'
     )
@@ -503,7 +482,7 @@ platform :ios do
       export_method: 'enterprise',
       clean: true,
       output_directory: OUTPUT_DIRECTORY_PATH,
-      export_team_id: get_required_env('INT_EXPORT_TEAM_ID'),
+      export_team_id: EnvManager.get_required_env!('INT_EXPORT_TEAM_ID'),
       export_options: {
         method: 'enterprise',
         provisioningProfiles: simplenote_provisioning_profiles(
@@ -516,7 +495,7 @@ platform :ios do
     File.rename(File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote.ipa'), File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote Alpha.ipa'))
 
     appcenter_upload(
-      api_token: get_required_env('APPCENTER_API_TOKEN'),
+      api_token: EnvManager.get_required_env!('APPCENTER_API_TOKEN'),
       owner_name: 'automattic',
       owner_type: 'organization',
       app_name: 'Simplenote-Installable-Builds',
@@ -526,7 +505,7 @@ platform :ios do
     )
 
     sentry_upload_dsym(
-      auth_token: get_required_env('SENTRY_AUTH_TOKEN'),
+      auth_token: EnvManager.get_required_env!('SENTRY_AUTH_TOKEN'),
       org_slug: 'a8c',
       project_slug: 'simplenote-ios',
       dsym_path: lane_context[SharedValues::DSYM_OUTPUT_PATH]
@@ -790,7 +769,7 @@ platform :ios do
     if is_ci
       sanitize_test_accounts
       find_free_test_account
-      run_ui_tests(options.merge({ test_account: get_required_env('UI_TESTS_ACCOUNT_EMAIL').sub('X', $used_test_account_index.to_s) }))
+      run_ui_tests(options.merge({ test_account: EnvManager.get_required_env!('UI_TESTS_ACCOUNT_EMAIL').sub('X', $used_test_account_index.to_s) }))
       deoccupy_test_account
     else
       UI.user_error!('This lane should be run only from CI')
@@ -811,7 +790,7 @@ platform :ios do
       UI.message "\t#{identifier}"
     end
 
-    team_id = get_required_env('EXT_EXPORT_TEAM_ID')
+    team_id = EnvManager.get_required_env!('EXT_EXPORT_TEAM_ID')
 
     # Register the user's device
     register_device(
@@ -892,7 +871,7 @@ end
 private_lane :appstore_code_signing do |options|
   update_code_signing(
     type: 'appstore',
-    team_id: get_required_env('EXT_EXPORT_TEAM_ID'),
+    team_id: EnvManager.get_required_env!('EXT_EXPORT_TEAM_ID'),
     readonly: options.fetch(:readonly, true),
     app_identifiers: simplenote_app_identifiers,
     api_key_path: APP_STORE_CONNECT_KEY_PATH,
@@ -916,7 +895,7 @@ def update_code_signing_enterprise(readonly:, app_identifiers:)
   update_code_signing(
     type: 'enterprise',
     # Enterprise builds belong to the "internal" team
-    team_id: get_required_env('INT_EXPORT_TEAM_ID'),
+    team_id: EnvManager.get_required_env!('INT_EXPORT_TEAM_ID'),
     readonly: readonly,
     app_identifiers: app_identifiers,
     api_key_path: api_key_path
@@ -928,10 +907,10 @@ def update_code_signing(type:, team_id:, readonly:, app_identifiers:, api_key_pa
   # NOTE: It might be neccessary to add `force: true` alongside `readonly: true` in order to regenerate some provisioning profiles.
   # If this turns out to be a hard requirement, we should consider updating the method with logic to toggle the two setting based on whether we're fetching or renewing.
 
-  # Fail early if secrets not available via `get_required_env`.
+  # Fail early if secrets not available via `EnvManager.get_required_env!`.
   # Otherwise, Fastlane will prompt to type them.
-  access_key = get_required_env('MATCH_S3_ACCESS_KEY')
-  secret_access_key = get_required_env('MATCH_S3_SECRET_ACCESS_KEY')
+  access_key = EnvManager.get_required_env!('MATCH_S3_ACCESS_KEY')
+  secret_access_key = EnvManager.get_required_env!('MATCH_S3_SECRET_ACCESS_KEY')
 
   match(
     storage_mode: 's3',
@@ -1064,7 +1043,7 @@ end
 #   fetch_test_accounts_hash
 #     => {"0"=>"4079", "1"=>"free", "2"=>"free", "3"=>"free"}
 def fetch_test_accounts_hash
-  uri = URI.parse(get_required_env('UI_TESTS_ACCOUNTS_JSON_URL'))
+  uri = URI.parse(EnvManager.get_required_env!('UI_TESTS_ACCOUNTS_JSON_URL'))
   response = Net::HTTP.get_response(uri)
   accounts_state = response.body.chomp
   JSON.parse(accounts_state)
@@ -1081,7 +1060,7 @@ def find_free_test_account
 
   UI.user_error!('Could not find free UI Test account. Quitting.') if $used_test_account_index.nil?
   UI.message("Free account index: #{$used_test_account_index}")
-  change_test_account_availability(get_required_env('BUILDKITE_BUILD_NUMBER').to_s)
+  change_test_account_availability(ENV['BUILDKITE_BUILD_NUMBER'].to_s)
 end
 
 # Replace a value in a key which is equal to $used_test_account_index global variable
@@ -1111,7 +1090,7 @@ def sanitize_test_accounts
 end
 
 def job_running?(job_number)
-  client = Buildkit.new(token: get_required_env('BUILDKITE_TOKEN'))
+  client = Buildkit.new(token: EnvManager.get_required_env!('BUILDKITE_TOKEN'))
   build = client.build('automattic', 'simplenote-ios', job_number)
 
   state = build['state']
@@ -1125,7 +1104,7 @@ end
 
 def submit_accounts_hash(accounts_hash)
   UI.message("Writing new accounts state: #{accounts_hash}")
-  uri = URI.parse(get_required_env('UI_TESTS_ACCOUNTS_JSON_URL'))
+  uri = URI.parse(EnvManager.get_required_env!('UI_TESTS_ACCOUNTS_JSON_URL'))
   request = Net::HTTP::Post.new(uri)
   request.body = accounts_hash.to_json
 
diff --git a/fastlane/example.env b/fastlane/example.env
new file mode 100644
index 000000000..4d561bbe6
--- /dev/null
+++ b/fastlane/example.env
@@ -0,0 +1,17 @@
+# You don't need to fill in these values for Fastlane to run.
+#
+# However, if a lane requires some of these environment values and they are not set here, it will fail.
+GITHUB_TOKEN=
+BUILDKITE_TOKEN=
+
+MATCH_S3_ACCESS_KEY=
+MATCH_S3_SECRET_ACCESS_KEY=
+
+APP_STORE_CONNECT_API_KEY_KEY_ID=
+APP_STORE_CONNECT_API_KEY_ISSUER_ID=
+APP_STORE_CONNECT_API_KEY_KEY=
+
+APPCENTER_API_TOKEN=
+SENTRY_AUTH_TOKEN=
+
+UI_TESTS_ACCOUNT_EMAIL=
diff --git a/fastlane/lib/env_manager.rb b/fastlane/lib/env_manager.rb
new file mode 100644
index 000000000..d1b8705cd
--- /dev/null
+++ b/fastlane/lib/env_manager.rb
@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require 'dotenv'
+# TODO: It would be nice to decouple this from Fastlane.
+# To give a good UX in the current use case, however, it's best to access the Fastlane UI methods directly.
+require 'fastlane'
+
+# Manages loading of environment variables from a .env and accessing them in a user-friendly way.
+class EnvManager
+  @env_path = nil
+  @env_example_path = nil
+  @print_error_lambda = nil
+
+  # Set up by loading the .env file with the given name.
+  #
+  # TODO: We could go one step and guess the name based on the repo URL.
+  def self.set_up(
+    env_file_name:,
+    env_file_folder: File.join(Dir.home, '.a8c-apps'),
+    example_env_file_path: 'fastlane/example.env',
+    print_error_lambda: ->(message) { FastlaneCore::UI.user_error!(message) }
+  )
+    @env_path = File.join(env_file_folder, env_file_name)
+    @env_example_path = example_env_file_path
+    @print_error_lambda = print_error_lambda
+
+    # We don't check for @env_path to exist here
+    Dotenv.load(@env_path)
+  end
+
+  # Use this instead of getting values from `ENV` directly. It will throw an error if the requested value is missing or empty.
+  def self.get_required_env!(key)
+    unless ENV.key?(key)
+      message = "Environment variable '#{key}' is not set."
+
+      if running_on_ci?
+        @print_error_lambda.call(message)
+      elsif File.exist?(@env_path)
+        @print_error_lambda.call("#{message} Consider adding it to #{@env_path}.")
+      else
+        env_file_dir = File.dirname(@env_path)
+        env_file_name = File.basename(@env_path)
+
+        @print_error_lambda.call <<~MSG
+          #{env_file_name} not found in #{env_file_dir} while looking for env var #{key}.
+
+          Please copy #{@env_example_path} to #{@env_path} and fill in the value for #{key}.
+
+          mkdir -p #{env_file_dir} && cp #{@env_example_path} #{@env_path}
+        MSG
+      end
+    end
+
+    value = ENV.fetch(key)
+
+    UI.user_error!("Env var for key #{key} is set but empty. Please set a value for #{key}.") if value.to_s.empty?
+
+    value
+  end
+
+  # Use this to ensure all env vars a lane requires are set.
+  #
+  # The best place to call this is at the start of a lane, to fail early.
+  def self.require_env_vars!(*keys)
+    keys.each { |key| get_required_env!(key) }
+  end
+
+  def self.running_on_ci?
+    ENV['CI'] == 'true'
+  end
+end

From 5f29398e6c99bd09068e382a64537c65ee57ef5e Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 09:59:19 +1000
Subject: [PATCH 331/547] Remove obsolete lane to register device

Devs can self-serve this using internal tooling nowadays
---
 fastlane/Fastfile | 49 -----------------------------------------------
 1 file changed, 49 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 8bcf97857..f660a424b 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -775,55 +775,6 @@ platform :ios do
       UI.user_error!('This lane should be run only from CI')
     end
   end
-
-  desc 'Registers a Device in the developer console'
-  lane :register_new_device do |options|
-    device_name = UI.input('Device Name: ') if options[:device_name].nil?
-    device_id = UI.input('Device ID: ') if options[:device_id].nil?
-    # Currently, Simplenote has an odd setup with a dedicated app id for development builds
-    all_bundle_ids =
-      simplenote_app_identifiers +
-      simplenote_app_identifiers(root_bundle_id: "#{APP_STORE_BUNDLE_IDENTIFIER}.Development")
-
-    UI.message "Registering #{device_name} with ID #{device_id} and registering it with any provisioning profiles associated with these bundle identifiers:"
-    all_bundle_ids.each do |identifier|
-      UI.message "\t#{identifier}"
-    end
-
-    team_id = EnvManager.get_required_env!('EXT_EXPORT_TEAM_ID')
-
-    # Register the user's device
-    register_device(
-      name: device_name,
-      udid: device_id,
-      team_id: team_id,
-      api_key_path: APP_STORE_CONNECT_KEY_PATH
-    )
-
-    # We're about to use `add_development_certificates_to_provisioning_profiles` and `add_all_devices_to_provisioning_profiles`.
-    # These actions use Developer Portal APIs that don't yet support authentication via API key (-.-').
-    # Let's preemptively ask for and set the email here to avoid being asked twice for it if not set.
-
-    require 'credentials_manager'
-
-    # If Fastlane cannot instantiate a user, it will ask the caller for the email.
-    # Once we have it, we can set it as `FASTLANE_USER` in the environment (which has lifecycle limited to this call) so that the next commands will already have access to it.
-    # Note that if the user is already available to `AccountManager`, setting it in the environment is redundant, but Fastlane
-    # doesn't provide a way to check it so we have to do it anyway.
-    ENV['FASTLANE_USER'] = CredentialsManager::AccountManager.new.user
-
-    # Add all development certificates to the provisioning profiles (just in case – this is an easy step to miss)
-    add_development_certificates_to_provisioning_profiles(
-      team_id: team_id,
-      app_identifier: all_bundle_ids
-    )
-
-    # Add all devices to the provisioning profiles
-    add_all_devices_to_provisioning_profiles(
-      team_id: team_id,
-      app_identifier: all_bundle_ids
-    )
-  end
 end
 
 ########################################################################

From 6676dea8ccde52d5bf1caa85e0a09018aa2c60a1 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 10:00:17 +1000
Subject: [PATCH 332/547] Replace unnecessarily reads from env of team ids with
 direct definition

---
 fastlane/Fastfile | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index f660a424b..5b2e5f1e4 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -38,6 +38,9 @@ GITHUB_REPO = 'Automattic/simplenote-ios'
 APP_STORE_BUNDLE_IDENTIFIER = 'com.codality.NotationalFlow'
 DEFAULT_BRANCH = 'trunk'
 
+TEAM_ID_APP_STORE_CONNECT = 'PZYM8XX95Q'
+TEAM_ID_ENTERPRISE = '99KV9Z6BKV'
+
 ########################################################################
 # Environment
 ########################################################################
@@ -332,7 +335,7 @@ platform :ios do
       export_method: 'enterprise',
       clean: true,
       output_directory: OUTPUT_DIRECTORY_PATH,
-      export_team_id: EnvManager.get_required_env!('INT_EXPORT_TEAM_ID'),
+      export_team_id: TEAM_ID_ENTERPRISE,
       export_options: {
         method: 'enterprise',
         provisioningProfiles: simplenote_provisioning_profiles(
@@ -392,7 +395,7 @@ platform :ios do
       clean: true,
       export_options: {
         method: 'app-store',
-        export_team_id: EnvManager.get_required_env!('EXT_EXPORT_TEAM_ID'),
+        export_team_id: TEAM_ID_APP_STORE_CONNECT,
         provisioningProfiles: simplenote_provisioning_profiles
       }
     )
@@ -482,7 +485,7 @@ platform :ios do
       export_method: 'enterprise',
       clean: true,
       output_directory: OUTPUT_DIRECTORY_PATH,
-      export_team_id: EnvManager.get_required_env!('INT_EXPORT_TEAM_ID'),
+      export_team_id: TEAM_ID_ENTERPRISE,
       export_options: {
         method: 'enterprise',
         provisioningProfiles: simplenote_provisioning_profiles(
@@ -822,7 +825,7 @@ end
 private_lane :appstore_code_signing do |options|
   update_code_signing(
     type: 'appstore',
-    team_id: EnvManager.get_required_env!('EXT_EXPORT_TEAM_ID'),
+    team_id: TEAM_ID_APP_STORE_CONNECT,
     readonly: options.fetch(:readonly, true),
     app_identifiers: simplenote_app_identifiers,
     api_key_path: APP_STORE_CONNECT_KEY_PATH,
@@ -846,7 +849,7 @@ def update_code_signing_enterprise(readonly:, app_identifiers:)
   update_code_signing(
     type: 'enterprise',
     # Enterprise builds belong to the "internal" team
-    team_id: EnvManager.get_required_env!('INT_EXPORT_TEAM_ID'),
+    team_id: TEAM_ID_ENTERPRISE,
     readonly: readonly,
     app_identifiers: app_identifiers,
     api_key_path: api_key_path

From 03f66af44ee4916614c0080d2f5af0e973d523ed Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 10:33:53 +1000
Subject: [PATCH 333/547] Remove `project.env` from `configure`

---
 .configure | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.configure b/.configure
index 7f10aae64..5498e1b3e 100644
--- a/.configure
+++ b/.configure
@@ -18,11 +18,6 @@
       "destination": "~/.configure/simplenote-ios/secrets/google_cloud_keys.json",
       "encrypt": true
     },
-    {
-      "file": "iOS/simplenote/project.env",
-      "destination": "~/.configure/simplenote-ios/secrets/project.env",
-      "encrypt": true
-    },
     {
       "file": "iOS/app_store_connect_fastlane_api_key.json",
       "destination": "~/.configure/simplenote-ios/secrets/app_store_connect_fastlane_api_key.json",

From 7ab30928ddee18a4c66376126f6e54108aa40eca Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 10:42:58 +1000
Subject: [PATCH 334/547] Replace `ios_codefreeze_prechecks` with individual
 checks

---
 fastlane/lanes/release.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index bf0e001fb..24ee9861d 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -4,7 +4,8 @@
 
 platform :ios do
   lane :code_freeze do |options|
-    ios_codefreeze_prechecks(options)
+    ensure_git_status_clean
+    Fastlane::Helper::GitHelper.checkout_and_pull(DEFAULT_BRANCH)
 
     ios_bump_version_release
     new_version = ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)

From 5994d4e84be9a0ae45f9e18175a8e42d6a6efcd1 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 10:48:16 +1000
Subject: [PATCH 335/547] Use `skip_confirm:` named argument in code freeze
 lane

---
 fastlane/lanes/release.rb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 24ee9861d..2bf04bf2d 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -3,8 +3,9 @@
 # Lanes related to the Release Process (Code Freeze, Betas, Final Build, App Store Submission…)
 
 platform :ios do
-  lane :code_freeze do |options|
+  lane :code_freeze do |skip_confirm: false|
     ensure_git_status_clean
+
     Fastlane::Helper::GitHelper.checkout_and_pull(DEFAULT_BRANCH)
 
     ios_bump_version_release
@@ -20,9 +21,7 @@
     generate_strings_file_for_glotpress
 
     UI.important('Pushing changes to remote, configuring the release on GitHub, and triggering the beta build')
-    unless options[:skip_confirm] || UI.confirm('Do you want to continue?')
-      UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.")
-    end
+    UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.") unless skip_confirm || UI.confirm('Do you want to continue?')
 
     push_to_git_remote(tags: false)
 

From 22c766f738504f1121073f1aa5707a735f556026 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 10:54:08 +1000
Subject: [PATCH 336/547] Introduce version calculators and adopt in code
 freeze lane

---
 fastlane/Fastfile         | 59 +++++++++++++++++++++++++++++++++++++++
 fastlane/lanes/release.rb | 44 +++++++++++++++++++++++++----
 2 files changed, 98 insertions(+), 5 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 5b2e5f1e4..af42ac79f 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -51,6 +51,11 @@ ENV['PUBLIC_CONFIG_FILE'] = VERSION_FILE_PATH
 ENV['DOWNLOAD_METADATA'] = './fastlane/download_metadata.swift'
 ENV['FL_RELEASE_TOOLKIT_DEFAULT_BRANCH'] = 'trunk'
 
+VERSION_CALCULATOR = Fastlane::Wpmreleasetoolkit::Versioning::MarketingVersionCalculator.new
+VERSION_FORMATTER = Fastlane::Wpmreleasetoolkit::Versioning::FourPartVersionFormatter.new
+BUILD_CODE_FORMATTER = Fastlane::Wpmreleasetoolkit::Versioning::FourPartBuildCodeFormatter.new
+PUBLIC_VERSION_FILE = Fastlane::Wpmreleasetoolkit::Versioning::IOSVersionFile.new(xcconfig_path: VERSION_FILE_PATH)
+
 platform :ios do
   #####################################################################################
   # update_appstore_strings
@@ -1097,3 +1102,57 @@ def generate_installable_build_number
     "#{branch}-#{commit}"
   end
 end
+
+# Returns the release version of the app in the format `1.2` or `1.2.3` if it is a hotfix
+#
+def release_version_current
+  current_version = VERSION_FORMATTER.parse(PUBLIC_VERSION_FILE.read_release_version)
+  VERSION_FORMATTER.release_version(current_version)
+end
+
+#  Returns the next release version of the app in the format `1.2` or `1.2.3` if it is a hotfix
+#
+def release_version_next
+  current_version = VERSION_FORMATTER.parse(PUBLIC_VERSION_FILE.read_release_version)
+  next_calculated_release_version = VERSION_CALCULATOR.next_release_version(version: current_version)
+  VERSION_FORMATTER.release_version(next_calculated_release_version)
+end
+
+# Returns the current build code of the app
+#
+def build_code_current
+  # We use the four part (1.2.3.4) build code format, so the version calculator can be used to calculate the next four-part version
+  version = VERSION_FORMATTER.parse(PUBLIC_VERSION_FILE.read_build_code(attribute_name: 'VERSION_LONG'))
+  BUILD_CODE_FORMATTER.build_code(version: version)
+end
+
+# Returns the build code of the app for the code freeze.
+# It is the release version name with build number (last of the four components) set to 0.
+#
+def build_code_code_freeze
+  # We use the four part (1.2.3.4) build code format, so the version calculator can be used to calculate the next four-part version
+  release_version_current = VERSION_FORMATTER.parse(INTERNAL_VERSION_FILE.read_release_version)
+  build_code_code_freeze = VERSION_CALCULATOR.next_release_version(version: release_version_current)
+  BUILD_CODE_FORMATTER.build_code(version: build_code_code_freeze)
+end
+
+# Returns the build code of the app for the code freeze.
+# It is the release version name with build number (last of the four components) set to 0.
+#
+def build_code_hotfix(release_version:)
+  version = VERSION_FORMATTER.parse(release_version)
+  BUILD_CODE_FORMATTER.build_code(version: version)
+end
+
+# Returns the next build code of the app
+#
+def build_code_next
+  # We use the four part (1.2.3.4) build code format, so the version calculator can be used to calculate the next four-part version
+  build_code_current = VERSION_FORMATTER.parse(PUBLIC_VERSION_FILE.read_build_code(attribute_name: 'VERSION_LONG'))
+  build_code_next = VERSION_CALCULATOR.next_build_number(version: build_code_current)
+  BUILD_CODE_FORMATTER.build_code(version: build_code_next)
+end
+
+def release_branch_name(release_version: release_version_current)
+  "release/#{release_version}"
+end
diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 2bf04bf2d..8552bd79c 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -8,8 +8,34 @@
 
     Fastlane::Helper::GitHelper.checkout_and_pull(DEFAULT_BRANCH)
 
-    ios_bump_version_release
-    new_version = ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
+    computed_release_branch_name = release_branch_name(release_version: release_version_next)
+
+    message = <<~MESSAGE
+      Code Freeze:
+      • New release branch from #{DEFAULT_BRANCH}: #{computed_release_branch_name}
+
+      • Current release version and build code: #{release_version_current} (#{build_code_current}).
+      • New release version and build code: #{release_version_next} (#{build_code_code_freeze}).
+    MESSAGE
+
+    UI.important(message)
+
+    UI.user_error!('Aborted by user request') unless skip_confirm || UI.confirm('Do you want to continue?')
+
+    UI.message 'Creating release branch...'
+    Fastlane::Helper::GitHelper.create_branch(computed_release_branch_name, from: DEFAULT_BRANCH)
+    UI.success "Done! New release branch is: #{git_branch}"
+
+    UI.message 'Bumping release version and build code...'
+    PUBLIC_VERSION_FILE.write(
+      version_short: release_version_next,
+      version_long: build_code_code_freeze
+    )
+    UI.success "Done! New Release Version: #{release_version_current}. New Build Code: #{build_code_current}."
+
+    commit_version_and_build_files
+
+    new_version = release_version_current
 
     extract_release_notes_for_version(
       version: new_version,
@@ -20,7 +46,7 @@
 
     generate_strings_file_for_glotpress
 
-    UI.important('Pushing changes to remote, configuring the release on GitHub, and triggering the beta build')
+    UI.important('Pushing changes to remote, configuring the release on GitHub, and triggering the beta build...')
     UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.") unless skip_confirm || UI.confirm('Do you want to continue?')
 
     push_to_git_remote(tags: false)
@@ -28,14 +54,14 @@
     copy_branch_protection(
       repository: GITHUB_REPO,
       from_branch: DEFAULT_BRANCH,
-      to_branch: "release/#{new_version}"
+      to_branch: computed_release_branch_name
     )
     set_milestone_frozen_marker(
       repository: GITHUB_REPO,
       milestone: new_version
     )
 
-    trigger_beta_build(branch_to_build: "release/#{new_version}")
+    trigger_beta_build(branch_to_build: computed_release_branch_name)
   end
 
   lane :new_beta_release do |options|
@@ -64,3 +90,11 @@
     )
   end
 end
+
+def commit_version_and_build_files
+  git_commit(
+    path: [PUBLIC_CONFIG_FILE],
+    message: 'Bump version number',
+    allow_nothing_to_commit: false
+  )
+end

From 9e757f4e4cac16d7f2f458cd81fb323286db7362 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 11:01:22 +1000
Subject: [PATCH 337/547] Update release-toolkit to latest version

---
 Gemfile.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 5e891f661..006e2ecdc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -24,8 +24,8 @@ GEM
     ast (2.4.2)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.957.0)
-    aws-sdk-core (3.201.2)
+    aws-partitions (1.958.0)
+    aws-sdk-core (3.201.3)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
@@ -37,7 +37,7 @@ GEM
       aws-sdk-core (~> 3, >= 3.201.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.8.0)
+    aws-sigv4 (1.9.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.2.0)
@@ -153,7 +153,7 @@ GEM
     faraday-httpclient (1.0.1)
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
-    faraday-net_http (1.0.1)
+    faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
@@ -161,7 +161,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.3.1)
-    fastlane (2.221.1)
+    fastlane (2.222.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -205,7 +205,7 @@ GEM
     fastlane-plugin-appcenter (2.1.2)
     fastlane-plugin-sentry (1.22.0)
       os (~> 1.1, >= 1.1.4)
-    fastlane-plugin-wpmreleasetoolkit (11.0.3)
+    fastlane-plugin-wpmreleasetoolkit (11.1.0)
       activesupport (>= 6.1.7.1)
       buildkit (~> 1.5)
       chroma (= 0.2.0)
@@ -294,9 +294,9 @@ GEM
     netrc (0.11.0)
     nkf (0.2.0)
     no_proxy_fix (0.1.2)
-    nokogiri (1.16.6-arm64-darwin)
+    nokogiri (1.16.7-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.6-x86_64-linux)
+    nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
     octokit (6.1.1)
       faraday (>= 1, < 3)

From f390b27f82fb1aa744f4b6fe56c8406a6c260dcd Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 11:01:54 +1000
Subject: [PATCH 338/547] Add command to check CocoaPods are using stable
 versions

---
 fastlane/Fastfile         |  6 +++---
 fastlane/lanes/release.rb | 11 +++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index af42ac79f..0838d4290 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -12,11 +12,11 @@ SECRETS_ROOT = File.join(Dir.home, '.configure', 'simplenote-ios', 'secrets')
 APP_STORE_CONNECT_KEY_PATH = File.join(SECRETS_ROOT, 'app_store_connect_fastlane_api_key.json')
 $used_test_account_index = nil
 
-import 'lanes/localization'
-import 'lanes/release'
-
 require_relative 'lib/env_manager'
 
+import 'lanes/localization.rb'
+import 'lanes/release.rb'
+
 before_all do
   # Ensure we use the latest version of the toolkit
   check_for_toolkit_updates unless is_ci || ENV['FASTLANE_SKIP_TOOLKIT_UPDATE_CHECK']
diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 8552bd79c..3734f6559 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -8,6 +8,8 @@
 
     Fastlane::Helper::GitHelper.checkout_and_pull(DEFAULT_BRANCH)
 
+    check_pods_references
+
     computed_release_branch_name = release_branch_name(release_version: release_version_next)
 
     message = <<~MESSAGE
@@ -98,3 +100,12 @@ def commit_version_and_build_files
     allow_nothing_to_commit: false
   )
 end
+
+def check_pods_references
+  # This will also print the result to STDOUT
+  result = ios_check_beta_deps(lockfile: File.join(PROJECT_ROOT_FOLDER, 'Podfile.lock'))
+
+  style = result[:pods].nil? || result[:pods].empty? ? 'success' : 'warning'
+  message = "### Checking Internal Dependencies are all on a **stable** version\n\n#{result[:message]}"
+  buildkite_annotate(context: 'pods-check', style: style, message: message) if is_ci
+end

From 29095457dee304ff2abc87167a8673caf165c643 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 11:13:27 +1000
Subject: [PATCH 339/547] DRY one release branch name computation

---
 fastlane/lanes/release.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 3734f6559..3cff5462b 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -74,8 +74,7 @@
       allow_retry: true
     )
     ios_bump_version_beta
-    version = ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
-    trigger_beta_build(branch_to_build: "release/#{version}")
+    trigger_beta_build(branch_to_build: release_branch_name)
   end
 
   lane :trigger_beta_build do |options|

From 754d2770b0de5aaf3b4393cf414aaf39e17d250f Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 11:18:58 +1000
Subject: [PATCH 340/547] Move method to trigger Buildkite release build to
 `release.rb`

---
 fastlane/Fastfile         | 23 ++++++-----------------
 fastlane/lanes/release.rb | 24 ++++++++++++++----------
 2 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 0838d4290..7bdbb5064 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -34,13 +34,18 @@ end
 PROJECT_ROOT_FOLDER = File.dirname(File.expand_path(__dir__))
 VERSION_FILE_PATH = File.join(PROJECT_ROOT_FOLDER, 'config', 'Version.Public.xcconfig')
 OUTPUT_DIRECTORY_PATH = File.join(PROJECT_ROOT_FOLDER, 'build', 'results')
-GITHUB_REPO = 'Automattic/simplenote-ios'
 APP_STORE_BUNDLE_IDENTIFIER = 'com.codality.NotationalFlow'
 DEFAULT_BRANCH = 'trunk'
 
 TEAM_ID_APP_STORE_CONNECT = 'PZYM8XX95Q'
 TEAM_ID_ENTERPRISE = '99KV9Z6BKV'
 
+ORGANIZATION = 'automattic'
+PROJECT_SLUG = 'simplenote-ios'
+GITHUB_REPO = "#{ORGANIZATION}/#{PROJECT_SLUG}".freeze
+BUILDKITE_ORGANIZATION = ORGANIZATION
+BUILDKITE_PIPELINE = PROJECT_SLUG
+
 ########################################################################
 # Environment
 ########################################################################
@@ -930,22 +935,6 @@ end
 # Helper Lanes
 ########################################################################
 
-# Triggers a Release Build on Buildkite
-#
-# @param [String] branch The branch to build
-# @param [Boolean] beta Indicate if we should build a beta or regular release
-#
-def trigger_buildkite_release_build(branch:, beta:)
-  push_to_git_remote(tags: false)
-  buildkite_trigger_build(
-    buildkite_organization: 'automattic',
-    buildkite_pipeline: 'simplenote-ios',
-    branch: branch,
-    environment: { BETA_RELEASE: beta },
-    pipeline_file: 'release-build.yml'
-  )
-end
-
 def fastlane_directory
   __dir__
 end
diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 3cff5462b..8f4ceb57d 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -77,18 +77,12 @@
     trigger_beta_build(branch_to_build: release_branch_name)
   end
 
-  lane :trigger_beta_build do |options|
-    trigger_buildkite_release_build(
-      branch: options[:branch_to_build],
-      beta: true
-    )
+  lane :trigger_beta_build do |branch_to_build:|
+    trigger_buildkite_release_build(branch: branch_to_build, beta: true)
   end
 
-  lane :trigger_release_build do |options|
-    trigger_buildkite_release_build(
-      branch: options[:branch_to_build],
-      beta: false
-    )
+  lane :trigger_release_build do |branch_to_build:|
+    trigger_buildkite_release_build(branch: branch_to_build, beta: false)
   end
 end
 
@@ -108,3 +102,13 @@ def check_pods_references
   message = "### Checking Internal Dependencies are all on a **stable** version\n\n#{result[:message]}"
   buildkite_annotate(context: 'pods-check', style: style, message: message) if is_ci
 end
+
+def trigger_buildkite_release_build(branch:, beta:)
+  buildkite_trigger_build(
+    buildkite_organization: BUILDKITE_ORGANIZATION,
+    buildkite_pipeline: BUILDKITE_PIPELINE,
+    branch: branch,
+    environment: { BETA_RELEASE: beta },
+    pipeline_file: 'release-build.yml'
+  )
+end

From 63a16fcf3c7e40eab39a47d3de53122ff12bb46a Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 11:32:15 +1000
Subject: [PATCH 341/547] Add shared vars and explicitly set agents in
 Buildkite pipelines

---
 .buildkite/pipeline.yml         | 24 +++++++++---------------
 .buildkite/release-build.yml    | 19 +++++--------------
 .buildkite/shared-pipeline-vars | 11 +++++++++++
 .xcode-version                  |  2 +-
 4 files changed, 26 insertions(+), 30 deletions(-)
 create mode 100755 .buildkite/shared-pipeline-vars

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 2105546bf..3357f122e 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,11 +1,8 @@
-# Nodes with values to reuse in the pipeline.
-common_params:
-  # Common plugin settings to use with the `plugins` key.
-  - &common_plugins
-    - automattic/a8c-ci-toolkit#3.1.0
-  # Common environment values to use with the `env` key.
-  - &common_env
-    IMAGE_ID: xcode-15.1
+agents:
+  queue: mac
+
+env:
+  IMAGE_ID: $IMAGE_ID
 
 # This is the default pipeline – it will build and test the app
 steps:
@@ -15,8 +12,7 @@ steps:
   #################
   - label: "🔬 Build and Test"
     command: ".buildkite/commands/build-and-test.sh"
-    env: *common_env
-    plugins: *common_plugins
+    plugins: [$CI_TOOLKIT_PLUGIN]
     artifact_paths:
       - "build/results/*"
 
@@ -25,7 +21,7 @@ steps:
   #################
   - label: ":swift: SwiftLint"
     command: run_swiftlint --strict
-    plugins: *common_plugins
+    plugins: [$CI_TOOLKIT_PLUGIN]
     notify:
       - github_commit_status:
           context: "SwiftLint"
@@ -37,8 +33,7 @@ steps:
   #################
   - label: "🛠 Installable Build"
     command: ".buildkite/commands/build-prototype.sh"
-    env: *common_env
-    plugins: *common_plugins
+    plugins: [$CI_TOOLKIT_PLUGIN]
     if: "build.pull_request.id != null || build.pull_request.draft"
     artifact_paths:
       - "build/results/*"
@@ -48,7 +43,6 @@ steps:
   #################
   - label: "🔬 UI Test (Full)"
     command: ".buildkite/commands/build-and-ui-test.sh SimplenoteUITests 'iPhone SE (3rd generation)'"
-    env: *common_env
-    plugins: *common_plugins
+    plugins: [$CI_TOOLKIT_PLUGIN]
     artifact_paths:
       - "build/results/*"
diff --git a/.buildkite/release-build.yml b/.buildkite/release-build.yml
index f728cdcb0..ee622ae51 100644
--- a/.buildkite/release-build.yml
+++ b/.buildkite/release-build.yml
@@ -1,20 +1,11 @@
-# This pipeline is meant to be run via the Buildkite API, and is only used for release builds
-
-# Nodes with values to reuse in the pipeline.
-common_params:
-  # Common plugin settings to use with the `plugins` key.
-  - &common_plugins
-    - automattic/a8c-ci-toolkit#3.1.0
-  # Common environment values to use with the `env` key.
-  - &common_env
-    IMAGE_ID: xcode-15.1
-
 steps:
-
   - label: ":testflight: Simplenote iOS Release Build (App Store Connect)"
     command: ".buildkite/commands/release-build.sh"
     priority: 1
-    env: *common_env
-    plugins: *common_plugins
+    env:
+      IMAGE_ID: $IMAGE_ID
+    agents:
+      queue: mac
+    plugins: [$CI_TOOLKIT_PLUGIN]
     notify:
     - slack: "#build-and-ship"
diff --git a/.buildkite/shared-pipeline-vars b/.buildkite/shared-pipeline-vars
new file mode 100755
index 000000000..3c7429977
--- /dev/null
+++ b/.buildkite/shared-pipeline-vars
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# This file is `source`'d before calling `buildkite-agent pipeline upload`, and can be used
+# to set up some variables that will be interpolated in the `.yml` pipeline before uploading it.
+
+# The ~> modifier is not currently used, but we check for it just in case
+XCODE_VERSION=$(sed -E -n 's/^(~> )?(.*)/xcode-\2/p' .xcode-version)
+export CI_TOOLKIT_PLUGIN_VERSION="3.4.2"
+
+export IMAGE_ID="$XCODE_VERSION"
+export CI_TOOLKIT_PLUGIN="automattic/a8c-ci-toolkit#$CI_TOOLKIT_PLUGIN_VERSION"
diff --git a/.xcode-version b/.xcode-version
index 6dfe8b129..adbc6d2b1 100644
--- a/.xcode-version
+++ b/.xcode-version
@@ -1 +1 @@
-14.3.1
+15.1

From 009cbdb0c9038f8b574fc506d532976689caa512 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 11:34:27 +1000
Subject: [PATCH 342/547] Remove unnecessary comments and double quotes from
 Buildkite pipelines

---
 .buildkite/pipeline.yml      | 38 ++++++++++++------------------------
 .buildkite/release-build.yml |  2 +-
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 3357f122e..db6862cb0 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,48 +1,36 @@
+# This is the default pipeline – it will build and test the app
+
 agents:
   queue: mac
 
 env:
   IMAGE_ID: $IMAGE_ID
 
-# This is the default pipeline – it will build and test the app
 steps:
-
-  #################
-  # Run Unit Tests
-  #################
-  - label: "🔬 Build and Test"
-    command: ".buildkite/commands/build-and-test.sh"
+  - label: 🔬 Build and Test
+    command: .buildkite/commands/build-and-test.sh
     plugins: [$CI_TOOLKIT_PLUGIN]
     artifact_paths:
-      - "build/results/*"
+      - build/results/*
 
-  #################
-  # Linters
-  #################
   - label: ":swift: SwiftLint"
     command: run_swiftlint --strict
     plugins: [$CI_TOOLKIT_PLUGIN]
     notify:
       - github_commit_status:
-          context: "SwiftLint"
+          context: SwiftLint
     agents:
-      queue: "default"
+      queue: default
 
-  #################
-  # Create Installable Build
-  #################
-  - label: "🛠 Installable Build"
-    command: ".buildkite/commands/build-prototype.sh"
+  - label: 🛠 Installable Build
+    command: .buildkite/commands/build-prototype.sh
     plugins: [$CI_TOOLKIT_PLUGIN]
     if: "build.pull_request.id != null || build.pull_request.draft"
     artifact_paths:
-      - "build/results/*"
+      - build/results/*
 
-  #################
-  # UI Tests
-  #################
-  - label: "🔬 UI Test (Full)"
-    command: ".buildkite/commands/build-and-ui-test.sh SimplenoteUITests 'iPhone SE (3rd generation)'"
+  - label: 🔬 UI Test (Full)
+    command: .buildkite/commands/build-and-ui-test.sh SimplenoteUITests 'iPhone SE (3rd generation)'
     plugins: [$CI_TOOLKIT_PLUGIN]
     artifact_paths:
-      - "build/results/*"
+      - build/results/*
diff --git a/.buildkite/release-build.yml b/.buildkite/release-build.yml
index ee622ae51..8d01e4da1 100644
--- a/.buildkite/release-build.yml
+++ b/.buildkite/release-build.yml
@@ -1,6 +1,6 @@
 steps:
   - label: ":testflight: Simplenote iOS Release Build (App Store Connect)"
-    command: ".buildkite/commands/release-build.sh"
+    command: .buildkite/commands/release-build.sh
     priority: 1
     env:
       IMAGE_ID: $IMAGE_ID

From 96aa4d20c2750292e8dac5416ab73a081ec2b840 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 11:42:06 +1000
Subject: [PATCH 343/547] Double quote a var access in `release-build.sh`

---
 .buildkite/commands/release-build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/commands/release-build.sh b/.buildkite/commands/release-build.sh
index 1b7c2c3d0..f3a7246ab 100755
--- a/.buildkite/commands/release-build.sh
+++ b/.buildkite/commands/release-build.sh
@@ -14,4 +14,4 @@ bundle exec fastlane build_and_upload_to_app_store_connect \
   skip_confirm:true \
   skip_prechecks:true \
   create_release:true \
-  beta_release:${1:-true} # use first call param, default to true for safety
+  "beta_release:${1:-true}" # use first call param, default to true for safety

From 883781d46ef298af4fd85d67e913e664865eacf1 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 11:48:24 +1000
Subject: [PATCH 344/547] Extract lane to build for ASC into dedicated file

---
 fastlane/Fastfile       | 71 +----------------------------------------
 fastlane/lanes/build.rb | 59 ++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 70 deletions(-)
 create mode 100644 fastlane/lanes/build.rb

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 7bdbb5064..17334ee02 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -16,6 +16,7 @@ require_relative 'lib/env_manager'
 
 import 'lanes/localization.rb'
 import 'lanes/release.rb'
+import 'lanes/build.rb'
 
 before_all do
   # Ensure we use the latest version of the toolkit
@@ -374,76 +375,6 @@ platform :ios do
     )
   end
 
-  #####################################################################################
-  # build_and_upload_to_app_store_connect
-  # -----------------------------------------------------------------------------------
-  # This lane builds the app and upload it for external distribution
-  # -----------------------------------------------------------------------------------
-  # Usage:
-  # bundle exec fastlane build_and_upload_to_app_store_connect [skip_confirm:<skip confirm>] [create_release:<Create release on GH>] [beta_release:<intermediate beta?>]
-  #
-  # Example:
-  # bundle exec fastlane build_and_upload_to_app_store_connect
-  # bundle exec fastlane build_and_upload_to_app_store_connect skip_confirm:true
-  #####################################################################################
-  desc 'Builds and uploads for distribution'
-  lane :build_and_upload_to_app_store_connect do |options|
-    unless options[:skip_prechecks]
-      ios_build_prechecks(
-        skip_confirm: options[:skip_confirm],
-        external: true
-      )
-      ios_build_preflight
-    end
-
-    appstore_code_signing
-
-    gym(
-      scheme: 'Simplenote',
-      workspace: 'Simplenote.xcworkspace',
-      configuration: 'Distribution AppStore',
-      clean: true,
-      export_options: {
-        method: 'app-store',
-        export_team_id: TEAM_ID_APP_STORE_CONNECT,
-        provisioningProfiles: simplenote_provisioning_profiles
-      }
-    )
-
-    testflight(
-      skip_waiting_for_build_processing: true,
-      api_key_path: APP_STORE_CONNECT_KEY_PATH
-    )
-
-    sh('rm ../Simplenote.ipa')
-    dsym_path = File.join(File.dirname(Dir.pwd), 'Simplenote.app.dSYM.zip')
-
-    sentry_upload_dsym(
-      dsym_path: dsym_path,
-      auth_token: EnvManager.get_required_env!('SENTRY_AUTH_TOKEN'),
-      org_slug: 'a8c',
-      project_slug: 'simplenote-ios'
-    )
-
-    sh("rm #{dsym_path}")
-
-    if options[:create_release]
-      archive_zip_path = File.join(File.dirname(Dir.pwd), 'Simplenote.xarchive.zip')
-      zip(path: lane_context[SharedValues::XCODEBUILD_ARCHIVE], output_path: archive_zip_path)
-
-      version = options[:beta_release] ? ios_get_build_version : ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
-      create_release(
-        repository: GITHUB_REPO,
-        version: version,
-        release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt'),
-        release_assets: archive_zip_path.to_s,
-        prerelease: options[:beta_release]
-      )
-
-      sh("rm #{archive_zip_path}")
-    end
-  end
-
   # Upload the localized metadata (from `fastlane/metadata/`) to App Store Connect
   #
   # @option [Boolean] with_screenshots (default: false) If true, will also upload the latest screenshot files to ASC
diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb
new file mode 100644
index 000000000..d0cc804b0
--- /dev/null
+++ b/fastlane/lanes/build.rb
@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+desc 'Builds and uploads for distribution via App Store Connect'
+lane :build_and_upload_to_app_store_connect do |options|
+  unless options[:skip_prechecks]
+    ios_build_prechecks(
+      skip_confirm: options[:skip_confirm],
+      external: true
+    )
+    ios_build_preflight
+  end
+
+  appstore_code_signing
+
+  gym(
+    scheme: 'Simplenote',
+    workspace: 'Simplenote.xcworkspace',
+    configuration: 'Distribution AppStore',
+    clean: true,
+    export_options: {
+      method: 'app-store',
+      export_team_id: TEAM_ID_APP_STORE_CONNECT,
+      provisioningProfiles: simplenote_provisioning_profiles
+    }
+  )
+
+  testflight(
+    skip_waiting_for_build_processing: true,
+    api_key_path: APP_STORE_CONNECT_KEY_PATH
+  )
+
+  sh('rm ../Simplenote.ipa')
+  dsym_path = File.join(File.dirname(Dir.pwd), 'Simplenote.app.dSYM.zip')
+
+  sentry_upload_dsym(
+    dsym_path: dsym_path,
+    auth_token: EnvManager.get_required_env!('SENTRY_AUTH_TOKEN'),
+    org_slug: 'a8c',
+    project_slug: 'simplenote-ios'
+  )
+
+  sh("rm #{dsym_path}")
+
+  if options[:create_release]
+    archive_zip_path = File.join(File.dirname(Dir.pwd), 'Simplenote.xarchive.zip')
+    zip(path: lane_context[SharedValues::XCODEBUILD_ARCHIVE], output_path: archive_zip_path)
+
+    version = options[:beta_release] ? ios_get_build_version : ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
+    create_release(
+      repository: GITHUB_REPO,
+      version: version,
+      release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt'),
+      release_assets: archive_zip_path.to_s,
+      prerelease: options[:beta_release]
+    )
+
+    sh("rm #{archive_zip_path}")
+  end
+end

From 96639bfe5ffbce5d104d004a82c63efa31eecbc3 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 11:51:04 +1000
Subject: [PATCH 345/547] Use named block arguments in build for ASC lane

---
 fastlane/lanes/build.rb | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb
index d0cc804b0..4c32d1b5e 100644
--- a/fastlane/lanes/build.rb
+++ b/fastlane/lanes/build.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 desc 'Builds and uploads for distribution via App Store Connect'
-lane :build_and_upload_to_app_store_connect do |options|
-  unless options[:skip_prechecks]
+lane :build_and_upload_to_app_store_connect do |beta_release:, skip_prechecks: false, skip_confirm: false, create_release: false|
+  unless skip_prechecks
     ios_build_prechecks(
-      skip_confirm: options[:skip_confirm],
+      skip_confirm: skip_confirm,
       external: true
     )
     ios_build_preflight
@@ -41,19 +41,19 @@
 
   sh("rm #{dsym_path}")
 
-  if options[:create_release]
-    archive_zip_path = File.join(File.dirname(Dir.pwd), 'Simplenote.xarchive.zip')
-    zip(path: lane_context[SharedValues::XCODEBUILD_ARCHIVE], output_path: archive_zip_path)
-
-    version = options[:beta_release] ? ios_get_build_version : ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
-    create_release(
-      repository: GITHUB_REPO,
-      version: version,
-      release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt'),
-      release_assets: archive_zip_path.to_s,
-      prerelease: options[:beta_release]
-    )
+  next unless create_release
 
-    sh("rm #{archive_zip_path}")
-  end
+  archive_zip_path = File.join(File.dirname(Dir.pwd), 'Simplenote.xarchive.zip')
+  zip(path: lane_context[SharedValues::XCODEBUILD_ARCHIVE], output_path: archive_zip_path)
+
+  version = beta_release ? ios_get_build_version : ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
+  create_release(
+    repository: GITHUB_REPO,
+    version: version,
+    release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt'),
+    release_assets: archive_zip_path.to_s,
+    prerelease: beta_release
+  )
+
+  sh("rm #{archive_zip_path}")
 end

From 14149e94ee196397cb581cc07e66ea147e8e3049 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 11:51:53 +1000
Subject: [PATCH 346/547] Remove calls to delete artifacts from build for ASC
 lane

---
 fastlane/lanes/build.rb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb
index 4c32d1b5e..9d37b2d9e 100644
--- a/fastlane/lanes/build.rb
+++ b/fastlane/lanes/build.rb
@@ -29,7 +29,6 @@
     api_key_path: APP_STORE_CONNECT_KEY_PATH
   )
 
-  sh('rm ../Simplenote.ipa')
   dsym_path = File.join(File.dirname(Dir.pwd), 'Simplenote.app.dSYM.zip')
 
   sentry_upload_dsym(
@@ -39,8 +38,6 @@
     project_slug: 'simplenote-ios'
   )
 
-  sh("rm #{dsym_path}")
-
   next unless create_release
 
   archive_zip_path = File.join(File.dirname(Dir.pwd), 'Simplenote.xarchive.zip')
@@ -54,6 +51,4 @@
     release_assets: archive_zip_path.to_s,
     prerelease: beta_release
   )
-
-  sh("rm #{archive_zip_path}")
 end

From 66781d6f40b15471e97ff353ee84c8623bad1fce Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 11:55:16 +1000
Subject: [PATCH 347/547] Remove `ios_build_preflight` and
 `ios_build_prechecks` from build lane

---
 fastlane/lanes/build.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb
index 9d37b2d9e..5635aa1e7 100644
--- a/fastlane/lanes/build.rb
+++ b/fastlane/lanes/build.rb
@@ -3,13 +3,13 @@
 desc 'Builds and uploads for distribution via App Store Connect'
 lane :build_and_upload_to_app_store_connect do |beta_release:, skip_prechecks: false, skip_confirm: false, create_release: false|
   unless skip_prechecks
-    ios_build_prechecks(
-      skip_confirm: skip_confirm,
-      external: true
-    )
-    ios_build_preflight
+    ensure_git_status_clean unless skip_prechecks || is_ci
+    sentry_check_cli_installed
   end
 
+  UI.important("Building version #{release_version_current} (#{build_code_current}) and uploading to TestFlight...")
+  UI.user_error!('Aborted by user request') unless skip_confirm || UI.confirm('Do you want to continue?')
+
   appstore_code_signing
 
   gym(

From 3ca756adebdd7c9054118586c049e034b10d1ff3 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 12:01:12 +1000
Subject: [PATCH 348/547] Use `xcconfig` to define development team for release
 builds

---
 Simplenote.xcodeproj/project.pbxproj | 10 ++--------
 config/Project.Release.xcconfig      |  1 +
 config/Simplenote.release.xcconfig   |  1 +
 3 files changed, 4 insertions(+), 8 deletions(-)
 create mode 100644 config/Project.Release.xcconfig

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index 6154f0d96..d46d32506 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -768,6 +768,7 @@
 		3FA60139242C5AAD0068FC52 /* SimplenoteScreenshots.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SimplenoteScreenshots.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		3FA6013B242C5AAE0068FC52 /* SimplenoteScreenshots.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SimplenoteScreenshots.swift; sourceTree = "<group>"; };
 		3FA6013D242C5AAE0068FC52 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		3FD478242C572EE10071B8B9 /* Project.Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Project.Release.xcconfig; sourceTree = "<group>"; };
 		3FF314D226FC47720012E68E /* XCUIApplication+Assertions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "XCUIApplication+Assertions.swift"; sourceTree = "<group>"; };
 		3FFBDBEB26FBF132008AD052 /* UITestsFoundation.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = UITestsFoundation.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		3FFBDBED26FBF132008AD052 /* UITestsFoundation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UITestsFoundation.h; sourceTree = "<group>"; };
@@ -1631,6 +1632,7 @@
 				8C573B0D22CD1AD6005BC6F5 /* Version.Public.xcconfig */,
 				8C573B0A22CD1A61005BC6F5 /* Simplenote.debug.xcconfig */,
 				8C573B0B22CD1A6F005BC6F5 /* Simplenote.release.xcconfig */,
+				3FD478242C572EE10071B8B9 /* Project.Release.xcconfig */,
 			);
 			path = config;
 			sourceTree = "<group>";
@@ -4586,7 +4588,6 @@
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = PZYM8XX95Q;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
 				ENABLE_TESTABILITY = YES;
@@ -4897,7 +4898,6 @@
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = PZYM8XX95Q;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -5268,7 +5268,6 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = PZYM8XX95Q;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -5350,7 +5349,6 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution: Automattic, Inc. (PZYM8XX95Q)";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = PZYM8XX95Q;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -5438,7 +5436,6 @@
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = PZYM8XX95Q;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = "SimplenoteIntents/Supporting Files/Info.plist";
@@ -5552,7 +5549,6 @@
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = PZYM8XX95Q;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = "SimplenoteIntents/Supporting Files/Info.plist";
@@ -5639,7 +5635,6 @@
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 4.36.0.0;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = PZYM8XX95Q;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = SimplenoteWidgets/Info.plist;
@@ -5765,7 +5760,6 @@
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 4.36.0.0;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = PZYM8XX95Q;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = SimplenoteWidgets/Info.plist;
diff --git a/config/Project.Release.xcconfig b/config/Project.Release.xcconfig
new file mode 100644
index 000000000..7b29190ff
--- /dev/null
+++ b/config/Project.Release.xcconfig
@@ -0,0 +1 @@
+DEVELOPMENT_TEAM = PZYM8XX95Q
diff --git a/config/Simplenote.release.xcconfig b/config/Simplenote.release.xcconfig
index f77a796b2..b8b65be61 100644
--- a/config/Simplenote.release.xcconfig
+++ b/config/Simplenote.release.xcconfig
@@ -1,3 +1,4 @@
 #include "Version.public.xcconfig"
+#include "Project.Release.xcconfig"
 
 DISPLAY_NAME=Simplenote

From 447ec1596ea7a27ef4cdef2d9445aff42ba43f79 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 12:04:28 +1000
Subject: [PATCH 349/547] Use `xcconfig` to specify provisioning profile for
 ASC builds

---
 Simplenote.xcodeproj/project.pbxproj | 8 --------
 config/Simplenote.release.xcconfig   | 2 ++
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index d46d32506..aad5b080c 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -4618,7 +4618,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.codality.NotationalFlow;
 				PRODUCT_NAME = Simplenote;
 				PROVISIONING_PROFILE = "";
-				PROVISIONING_PROFILE_SPECIFIER = "Simplenote Release";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "RELEASE $(SP_IOS_SDK)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Simplenote/Simplenote-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -4927,7 +4926,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.codality.NotationalFlow;
 				PRODUCT_NAME = Simplenote;
 				PROVISIONING_PROFILE = "";
-				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.codality.NotationalFlow";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "BUILD_APP_STORE $(SP_IOS_SDK)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Simplenote/Simplenote-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -5288,7 +5286,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.codality.NotationalFlow.Share;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
-				PROVISIONING_PROFILE_SPECIFIER = "Simplenote Release Share";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = APP_EXTENSION;
 				SWIFT_OBJC_BRIDGING_HEADER = "SimplenoteShare/Simplenote-Share-Bridging-Header.h";
@@ -5369,7 +5366,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.codality.NotationalFlow.Share;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
-				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.codality.NotationalFlow.Share";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = APP_EXTENSION;
 				SWIFT_OBJC_BRIDGING_HEADER = "SimplenoteShare/Simplenote-Share-Bridging-Header.h";
@@ -5449,7 +5445,6 @@
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.codality.NotationalFlow.Intents;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.codality.NotationalFlow.Intents";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = APP_EXTENSION;
 				SWIFT_OBJC_BRIDGING_HEADER = "SimplenoteIntents/Simplenote-Intents-Bridging-Header.h";
@@ -5562,7 +5557,6 @@
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.codality.NotationalFlow.Intents;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.codality.NotationalFlow.Intents";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = APP_EXTENSION;
 				SWIFT_OBJC_BRIDGING_HEADER = "SimplenoteIntents/Simplenote-Intents-Bridging-Header.h";
@@ -5649,7 +5643,6 @@
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.codality.NotationalFlow.Widgets;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.codality.NotationalFlow.Widgets";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = APP_EXTENSION;
 				SWIFT_OBJC_BRIDGING_HEADER = "SimplenoteWidgets/Simplenote-Widgets-Bridging-Header.h";
@@ -5774,7 +5767,6 @@
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.codality.NotationalFlow.Widgets;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.codality.NotationalFlow.Widgets";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = APP_EXTENSION;
 				SWIFT_OBJC_BRIDGING_HEADER = "SimplenoteWidgets/Simplenote-Widgets-Bridging-Header.h";
diff --git a/config/Simplenote.release.xcconfig b/config/Simplenote.release.xcconfig
index b8b65be61..26a784bda 100644
--- a/config/Simplenote.release.xcconfig
+++ b/config/Simplenote.release.xcconfig
@@ -2,3 +2,5 @@
 #include "Project.Release.xcconfig"
 
 DISPLAY_NAME=Simplenote
+
+PROVISIONING_PROFILE_SPECIFIER = match AppStore $(PRODUCT_BUNDLE_IDENTIFIER)

From 4a244cac211b58d0f5b8805f7ac50cd380996a79 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 12:06:23 +1000
Subject: [PATCH 350/547] Extract logic to build for ASC in dedicated lane

---
 fastlane/lanes/build.rb | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb
index 5635aa1e7..9ff70b78f 100644
--- a/fastlane/lanes/build.rb
+++ b/fastlane/lanes/build.rb
@@ -10,19 +10,7 @@
   UI.important("Building version #{release_version_current} (#{build_code_current}) and uploading to TestFlight...")
   UI.user_error!('Aborted by user request') unless skip_confirm || UI.confirm('Do you want to continue?')
 
-  appstore_code_signing
-
-  gym(
-    scheme: 'Simplenote',
-    workspace: 'Simplenote.xcworkspace',
-    configuration: 'Distribution AppStore',
-    clean: true,
-    export_options: {
-      method: 'app-store',
-      export_team_id: TEAM_ID_APP_STORE_CONNECT,
-      provisioningProfiles: simplenote_provisioning_profiles
-    }
-  )
+  build_for_app_store_connect
 
   testflight(
     skip_waiting_for_build_processing: true,
@@ -52,3 +40,19 @@
     prerelease: beta_release
   )
 end
+
+lane :build_for_app_store_connect do |fetch_code_signig: true|
+  appstore_code_signing if fetch_code_signig
+
+  gym(
+    scheme: 'Simplenote',
+    workspace: 'Simplenote.xcworkspace',
+    configuration: 'Distribution AppStore',
+    clean: true,
+    export_options: {
+      method: 'app-store',
+      export_team_id: TEAM_ID_APP_STORE_CONNECT,
+      provisioningProfiles: simplenote_provisioning_profiles
+    }
+  )
+end

From c704b2729eea15a7382b474671dda4694b205249 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 12:07:02 +1000
Subject: [PATCH 351/547] Use project file as source of truth for ASC code
 signing settings

---
 fastlane/lanes/build.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb
index 9ff70b78f..9e00621e2 100644
--- a/fastlane/lanes/build.rb
+++ b/fastlane/lanes/build.rb
@@ -49,10 +49,6 @@
     workspace: 'Simplenote.xcworkspace',
     configuration: 'Distribution AppStore',
     clean: true,
-    export_options: {
-      method: 'app-store',
-      export_team_id: TEAM_ID_APP_STORE_CONNECT,
-      provisioningProfiles: simplenote_provisioning_profiles
-    }
+    export_method: 'app-store'
   )
 end

From ffbe630074ca84f19a87bc952e893bc53803df43 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 12:08:31 +1000
Subject: [PATCH 352/547] DRY workspace definition

---
 fastlane/Fastfile       | 6 ++++--
 fastlane/lanes/build.rb | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 17334ee02..6db868864 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -47,6 +47,8 @@ GITHUB_REPO = "#{ORGANIZATION}/#{PROJECT_SLUG}".freeze
 BUILDKITE_ORGANIZATION = ORGANIZATION
 BUILDKITE_PIPELINE = PROJECT_SLUG
 
+WORKSPACE = 'Simplenote.xcworkspace'
+
 ########################################################################
 # Environment
 ########################################################################
@@ -342,7 +344,7 @@ platform :ios do
     gym(
       scheme: 'Simplenote',
       configuration: 'Distribution Internal',
-      workspace: 'Simplenote.xcworkspace',
+      workspace: WORKSPACE,
       export_method: 'enterprise',
       clean: true,
       output_directory: OUTPUT_DIRECTORY_PATH,
@@ -422,7 +424,7 @@ platform :ios do
     gym(
       scheme: 'Simplenote',
       configuration: 'Distribution Alpha',
-      workspace: 'Simplenote.xcworkspace',
+      workspace: WORKSPACE,
       export_method: 'enterprise',
       clean: true,
       output_directory: OUTPUT_DIRECTORY_PATH,
diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb
index 9e00621e2..efb814eaf 100644
--- a/fastlane/lanes/build.rb
+++ b/fastlane/lanes/build.rb
@@ -41,12 +41,12 @@
   )
 end
 
-lane :build_for_app_store_connect do |fetch_code_signig: true|
-  appstore_code_signing if fetch_code_signig
+lane :build_for_app_store_connect do |fetch_code_signing: true|
+  appstore_code_signing if fetch_code_signing
 
   gym(
     scheme: 'Simplenote',
-    workspace: 'Simplenote.xcworkspace',
+    workspace: WORKSPACE,
     configuration: 'Distribution AppStore',
     clean: true,
     export_method: 'app-store'

From 9f96265a43534bc2bba852e7ffb94603c34ccae6 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 12:29:23 +1000
Subject: [PATCH 353/547] Update Fastlane versioning object to reflect app's
 strategy

---
 fastlane/Fastfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 6db868864..ad49c227d 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -59,7 +59,7 @@ ENV['PUBLIC_CONFIG_FILE'] = VERSION_FILE_PATH
 ENV['DOWNLOAD_METADATA'] = './fastlane/download_metadata.swift'
 ENV['FL_RELEASE_TOOLKIT_DEFAULT_BRANCH'] = 'trunk'
 
-VERSION_CALCULATOR = Fastlane::Wpmreleasetoolkit::Versioning::MarketingVersionCalculator.new
+VERSION_CALCULATOR = Fastlane::Wpmreleasetoolkit::Versioning::SemanticVersionCalculator.new
 VERSION_FORMATTER = Fastlane::Wpmreleasetoolkit::Versioning::FourPartVersionFormatter.new
 BUILD_CODE_FORMATTER = Fastlane::Wpmreleasetoolkit::Versioning::FourPartBuildCodeFormatter.new
 PUBLIC_VERSION_FILE = Fastlane::Wpmreleasetoolkit::Versioning::IOSVersionFile.new(xcconfig_path: VERSION_FILE_PATH)
@@ -1032,7 +1032,7 @@ def release_version_current
   VERSION_FORMATTER.release_version(current_version)
 end
 
-#  Returns the next release version of the app in the format `1.2` or `1.2.3` if it is a hotfix
+# Returns the next release version of the app in the format `1.2` or `1.2.3` if it is a hotfix
 #
 def release_version_next
   current_version = VERSION_FORMATTER.parse(PUBLIC_VERSION_FILE.read_release_version)
@@ -1053,7 +1053,7 @@ end
 #
 def build_code_code_freeze
   # We use the four part (1.2.3.4) build code format, so the version calculator can be used to calculate the next four-part version
-  release_version_current = VERSION_FORMATTER.parse(INTERNAL_VERSION_FILE.read_release_version)
+  release_version_current = VERSION_FORMATTER.parse(PUBLIC_VERSION_FILE.read_release_version)
   build_code_code_freeze = VERSION_CALCULATOR.next_release_version(version: release_version_current)
   BUILD_CODE_FORMATTER.build_code(version: build_code_code_freeze)
 end

From 5f8b66a1c20ab6bba582679fc43e21efc93fc770 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 12:32:02 +1000
Subject: [PATCH 354/547] Fix incorrect config file path

---
 fastlane/lanes/release.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 8f4ceb57d..d5f843904 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -88,7 +88,7 @@
 
 def commit_version_and_build_files
   git_commit(
-    path: [PUBLIC_CONFIG_FILE],
+    path: [VERSION_FILE_PATH],
     message: 'Bump version number',
     allow_nothing_to_commit: false
   )

From eb52ef6d228f70ea5053d3139d93334f8fae709d Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 12:34:35 +1000
Subject: [PATCH 355/547] Revert commits accidentally pushed to `trunk`

These changes should have been done via PR, see #1621

Revert "Fix incorrect config file path"
This reverts commit 5f8b66a1c20ab6bba582679fc43e21efc93fc770.

Revert "Update Fastlane versioning object to reflect app's strategy"
This reverts commit 9f96265a43534bc2bba852e7ffb94603c34ccae6.

Revert "DRY workspace definition"
This reverts commit ffbe630074ca84f19a87bc952e893bc53803df43.

Revert "Use project file as source of truth for ASC code signing settings"
This reverts commit c704b2729eea15a7382b474671dda4694b205249.

Revert "Extract logic to build for ASC in dedicated lane"
This reverts commit 4a244cac211b58d0f5b8805f7ac50cd380996a79.

Revert "Use `xcconfig` to specify provisioning profile for ASC builds"
This reverts commit 447ec1596ea7a27ef4cdef2d9445aff42ba43f79.

Revert "Use `xcconfig` to define development team for release builds"
This reverts commit 3ca756adebdd7c9054118586c049e034b10d1ff3.

Revert "Remove `ios_build_preflight` and `ios_build_prechecks` from build lane"
This reverts commit 66781d6f40b15471e97ff353ee84c8623bad1fce

Revert "Remove calls to delete artifacts from build for ASC lane"
This reverts commit 14149e94ee196397cb581cc07e66ea147e8e3049.

Revert "Use named block arguments in build for ASC lane"
This reverts commit 96639bfe5ffbce5d104d004a82c63efa31eecbc3.

Revert "Extract lane to build for ASC into dedicated file"
This reverts commit 883781d46ef298af4fd85d67e913e664865eacf1.

Revert "Double quote a var access in `release-build.sh`"
This reverts commit 96aa4d20c2750292e8dac5416ab73a081ec2b840.

Revert "Merge remote-tracking branch 'origin/trunk' into mokagio/release-automation-update"
This reverts commit 98c3b93983fff4123ea245f0003cb18c86401bb1, reversing
changes made to 009cbdb0c9038f8b574fc506d532976689caa512.

Revert "Remove unnecessary comments and double quotes from Buildkite pipelines"
This reverts commit 009cbdb0c9038f8b574fc506d532976689caa512.

Revert "Add shared vars and explicitly set agents in Buildkite pipelines"
This reverts commit 63a16fcf3c7e40eab39a47d3de53122ff12bb46a.

Revert "Move method to trigger Buildkite release build to `release.rb`"
This reverts commit 754d2770b0de5aaf3b4393cf414aaf39e17d250f.

Revert "DRY one release branch name computation"
This reverts commit 29095457dee304ff2abc87167a8673caf165c643.

Revert "Add command to check CocoaPods are using stable versions"
This reverts commit f390b27f82fb1aa744f4b6fe56c8406a6c260dcd.

Revert "Update release-toolkit to latest version"
This reverts commit 9e757f4e4cac16d7f2f458cd81fb323286db7362.

Revert "Introduce version calculators and adopt in code freeze lane"
This reverts commit 22c766f738504f1121073f1aa5707a735f556026.

Revert "Use `skip_confirm:` named argument in code freeze lane"
This reverts commit 5994d4e84be9a0ae45f9e18175a8e42d6a6efcd1.

Revert "Replace `ios_codefreeze_prechecks` with individual checks"
This reverts commit 7ab30928ddee18a4c66376126f6e54108aa40eca.

Revert "Remove `project.env` from `configure`"
This reverts commit 03f66af44ee4916614c0080d2f5af0e973d523ed.

Revert "Replace unnecessarily reads from env of team ids with direct definition"
This reverts commit 6676dea8ccde52d5bf1caa85e0a09018aa2c60a1.

Revert "Remove obsolete lane to register device"
This reverts commit 5f29398e6c99bd09068e382a64537c65ee57ef5e.

Revert "Introduce `EnvManager`"
This reverts commit c6d14fa2d1fc02e5382aa0a3634df95ee31a1675.

Revert "Use `set_milestone_frozen_marker` instead of `setfrozentag`"
This reverts commit 624c158c4defe40d4119e0fce4573e586ad504da.

Revert "Move `new_beta` lane to `release.rb`"
This reverts commit d70669aeec86a8fa4fad843b6a435c2c1515ef3b.

Revert "Move code freeze lane to dedicated file"
This reverts commit 6c22956393b46a4470d49bb0a5089d54316c36b8.

Revert "Move lane to generate strings to dedicated file"
This reverts commit 95bb7e67954ecd83992fb399ffda325afdd3104b.
---
 .buildkite/commands/release-build.sh          |   2 +-
 .buildkite/pipeline.yml                       |  62 ++-
 .buildkite/release-build.yml                  |  21 +-
 .buildkite/shared-pipeline-vars               |  11 -
 .configure                                    |   5 +
 .rubocop.yml                                  |   3 +-
 .xcode-version                                |   2 +-
 Gemfile.lock                                  |  16 +-
 Simplenote.xcodeproj/project.pbxproj          | 111 +++--
 .../xcshareddata/swiftpm/Package.resolved     |  12 +-
 Simplenote/AccountRemote.swift                |  54 +++
 .../Classes/MagicLinkAuthenticator.swift      |   1 -
 Simplenote/Classes/RemoteConstants.swift      |  12 +
 Simplenote/Classes/SPAuthError.swift          |  36 +-
 Simplenote/Classes/SPAuthHandler.swift        |  37 +-
 Simplenote/Classes/SPAuthViewController.swift |  71 +--
 .../SPSettingsViewController+Extensions.swift |   9 +-
 Simplenote/Classes/SignupRemote.swift         |  24 +
 .../AccountDeletionController.swift           |   1 -
 Simplenote/LoginRemote.swift                  |  46 ++
 Simplenote/Remote.swift                       |  73 +++
 Simplenote/RemoteError.swift                  |  38 ++
 Simplenote/SPUser+UserProtocol.swift          |   8 -
 Simplenote/UIAlertController+Auth.swift       |  22 -
 Simplenote/URLRequest+Simplenote.swift        |  13 +
 .../AccountVerificationController.swift       |   1 -
 SimplenoteTests/Network/MockURLSession.swift  |  15 +
 .../Network/MockURLSessionDataTask.swift      |  15 +
 .../RemoteResult+TestHelpers.swift            |   3 +-
 SimplenoteTests/SignupRemoteTests.swift       |  75 +++
 .../AccountVerificationControllerTests.swift  |   1 -
 .../AccountVerificationRemoteTests.swift      |  51 +++
 .../MockAccountVerificationRemote.swift       |   1 -
 config/Project.Release.xcconfig               |   1 -
 config/Simplenote.release.xcconfig            |   3 -
 fastlane/Fastfile                             | 431 ++++++++++++++----
 fastlane/example.env                          |  17 -
 fastlane/lanes/build.rb                       |  54 ---
 fastlane/lanes/localization.rb                |  51 ---
 fastlane/lanes/release.rb                     | 114 -----
 fastlane/lib/env_manager.rb                   |  71 ---
 41 files changed, 949 insertions(+), 645 deletions(-)
 delete mode 100755 .buildkite/shared-pipeline-vars
 create mode 100644 Simplenote/AccountRemote.swift
 create mode 100644 Simplenote/Classes/RemoteConstants.swift
 create mode 100644 Simplenote/Classes/SignupRemote.swift
 create mode 100644 Simplenote/LoginRemote.swift
 create mode 100644 Simplenote/Remote.swift
 create mode 100644 Simplenote/RemoteError.swift
 delete mode 100644 Simplenote/SPUser+UserProtocol.swift
 delete mode 100644 Simplenote/UIAlertController+Auth.swift
 create mode 100644 Simplenote/URLRequest+Simplenote.swift
 create mode 100644 SimplenoteTests/Network/MockURLSession.swift
 create mode 100644 SimplenoteTests/Network/MockURLSessionDataTask.swift
 create mode 100644 SimplenoteTests/SignupRemoteTests.swift
 create mode 100644 SimplenoteTests/Verification/AccountVerificationRemoteTests.swift
 delete mode 100644 config/Project.Release.xcconfig
 delete mode 100644 fastlane/example.env
 delete mode 100644 fastlane/lanes/build.rb
 delete mode 100644 fastlane/lanes/localization.rb
 delete mode 100644 fastlane/lanes/release.rb
 delete mode 100644 fastlane/lib/env_manager.rb

diff --git a/.buildkite/commands/release-build.sh b/.buildkite/commands/release-build.sh
index f3a7246ab..1b7c2c3d0 100755
--- a/.buildkite/commands/release-build.sh
+++ b/.buildkite/commands/release-build.sh
@@ -14,4 +14,4 @@ bundle exec fastlane build_and_upload_to_app_store_connect \
   skip_confirm:true \
   skip_prechecks:true \
   create_release:true \
-  "beta_release:${1:-true}" # use first call param, default to true for safety
+  beta_release:${1:-true} # use first call param, default to true for safety
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index db6862cb0..2105546bf 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,36 +1,54 @@
-# This is the default pipeline – it will build and test the app
-
-agents:
-  queue: mac
-
-env:
-  IMAGE_ID: $IMAGE_ID
+# Nodes with values to reuse in the pipeline.
+common_params:
+  # Common plugin settings to use with the `plugins` key.
+  - &common_plugins
+    - automattic/a8c-ci-toolkit#3.1.0
+  # Common environment values to use with the `env` key.
+  - &common_env
+    IMAGE_ID: xcode-15.1
 
+# This is the default pipeline – it will build and test the app
 steps:
-  - label: 🔬 Build and Test
-    command: .buildkite/commands/build-and-test.sh
-    plugins: [$CI_TOOLKIT_PLUGIN]
+
+  #################
+  # Run Unit Tests
+  #################
+  - label: "🔬 Build and Test"
+    command: ".buildkite/commands/build-and-test.sh"
+    env: *common_env
+    plugins: *common_plugins
     artifact_paths:
-      - build/results/*
+      - "build/results/*"
 
+  #################
+  # Linters
+  #################
   - label: ":swift: SwiftLint"
     command: run_swiftlint --strict
-    plugins: [$CI_TOOLKIT_PLUGIN]
+    plugins: *common_plugins
     notify:
       - github_commit_status:
-          context: SwiftLint
+          context: "SwiftLint"
     agents:
-      queue: default
+      queue: "default"
 
-  - label: 🛠 Installable Build
-    command: .buildkite/commands/build-prototype.sh
-    plugins: [$CI_TOOLKIT_PLUGIN]
+  #################
+  # Create Installable Build
+  #################
+  - label: "🛠 Installable Build"
+    command: ".buildkite/commands/build-prototype.sh"
+    env: *common_env
+    plugins: *common_plugins
     if: "build.pull_request.id != null || build.pull_request.draft"
     artifact_paths:
-      - build/results/*
+      - "build/results/*"
 
-  - label: 🔬 UI Test (Full)
-    command: .buildkite/commands/build-and-ui-test.sh SimplenoteUITests 'iPhone SE (3rd generation)'
-    plugins: [$CI_TOOLKIT_PLUGIN]
+  #################
+  # UI Tests
+  #################
+  - label: "🔬 UI Test (Full)"
+    command: ".buildkite/commands/build-and-ui-test.sh SimplenoteUITests 'iPhone SE (3rd generation)'"
+    env: *common_env
+    plugins: *common_plugins
     artifact_paths:
-      - build/results/*
+      - "build/results/*"
diff --git a/.buildkite/release-build.yml b/.buildkite/release-build.yml
index 8d01e4da1..f728cdcb0 100644
--- a/.buildkite/release-build.yml
+++ b/.buildkite/release-build.yml
@@ -1,11 +1,20 @@
+# This pipeline is meant to be run via the Buildkite API, and is only used for release builds
+
+# Nodes with values to reuse in the pipeline.
+common_params:
+  # Common plugin settings to use with the `plugins` key.
+  - &common_plugins
+    - automattic/a8c-ci-toolkit#3.1.0
+  # Common environment values to use with the `env` key.
+  - &common_env
+    IMAGE_ID: xcode-15.1
+
 steps:
+
   - label: ":testflight: Simplenote iOS Release Build (App Store Connect)"
-    command: .buildkite/commands/release-build.sh
+    command: ".buildkite/commands/release-build.sh"
     priority: 1
-    env:
-      IMAGE_ID: $IMAGE_ID
-    agents:
-      queue: mac
-    plugins: [$CI_TOOLKIT_PLUGIN]
+    env: *common_env
+    plugins: *common_plugins
     notify:
     - slack: "#build-and-ship"
diff --git a/.buildkite/shared-pipeline-vars b/.buildkite/shared-pipeline-vars
deleted file mode 100755
index 3c7429977..000000000
--- a/.buildkite/shared-pipeline-vars
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-# This file is `source`'d before calling `buildkite-agent pipeline upload`, and can be used
-# to set up some variables that will be interpolated in the `.yml` pipeline before uploading it.
-
-# The ~> modifier is not currently used, but we check for it just in case
-XCODE_VERSION=$(sed -E -n 's/^(~> )?(.*)/xcode-\2/p' .xcode-version)
-export CI_TOOLKIT_PLUGIN_VERSION="3.4.2"
-
-export IMAGE_ID="$XCODE_VERSION"
-export CI_TOOLKIT_PLUGIN="automattic/a8c-ci-toolkit#$CI_TOOLKIT_PLUGIN_VERSION"
diff --git a/.configure b/.configure
index 5498e1b3e..7f10aae64 100644
--- a/.configure
+++ b/.configure
@@ -18,6 +18,11 @@
       "destination": "~/.configure/simplenote-ios/secrets/google_cloud_keys.json",
       "encrypt": true
     },
+    {
+      "file": "iOS/simplenote/project.env",
+      "destination": "~/.configure/simplenote-ios/secrets/project.env",
+      "encrypt": true
+    },
     {
       "file": "iOS/app_store_connect_fastlane_api_key.json",
       "destination": "~/.configure/simplenote-ios/secrets/app_store_connect_fastlane_api_key.json",
diff --git a/.rubocop.yml b/.rubocop.yml
index b4e39abfd..4c0c39f28 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -16,9 +16,8 @@ Layout/LineLength:
   Max: 180
 
 Metrics/BlockLength:
-  Exclude: &xfiles
+  Exclude:
     - fastlane/Fastfile
-    - fastlane/lanes/*.rb
     - Rakefile
 
 Style/HashSyntax:
diff --git a/.xcode-version b/.xcode-version
index 232a7fc1a..6dfe8b129 100644
--- a/.xcode-version
+++ b/.xcode-version
@@ -1 +1 @@
-15.4
+14.3.1
diff --git a/Gemfile.lock b/Gemfile.lock
index 006e2ecdc..5e891f661 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -24,8 +24,8 @@ GEM
     ast (2.4.2)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.958.0)
-    aws-sdk-core (3.201.3)
+    aws-partitions (1.957.0)
+    aws-sdk-core (3.201.2)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
@@ -37,7 +37,7 @@ GEM
       aws-sdk-core (~> 3, >= 3.201.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.9.0)
+    aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.2.0)
@@ -153,7 +153,7 @@ GEM
     faraday-httpclient (1.0.1)
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
-    faraday-net_http (1.0.2)
+    faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
@@ -161,7 +161,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.3.1)
-    fastlane (2.222.0)
+    fastlane (2.221.1)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -205,7 +205,7 @@ GEM
     fastlane-plugin-appcenter (2.1.2)
     fastlane-plugin-sentry (1.22.0)
       os (~> 1.1, >= 1.1.4)
-    fastlane-plugin-wpmreleasetoolkit (11.1.0)
+    fastlane-plugin-wpmreleasetoolkit (11.0.3)
       activesupport (>= 6.1.7.1)
       buildkit (~> 1.5)
       chroma (= 0.2.0)
@@ -294,9 +294,9 @@ GEM
     netrc (0.11.0)
     nkf (0.2.0)
     no_proxy_fix (0.1.2)
-    nokogiri (1.16.7-arm64-darwin)
+    nokogiri (1.16.6-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-linux)
+    nokogiri (1.16.6-x86_64-linux)
       racc (~> 1.4)
     octokit (6.1.1)
       faraday (>= 1, < 3)
diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index aad5b080c..6a0958985 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -124,6 +124,7 @@
 		A61471B925D70C190065D849 /* PopoverViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A61471B725D70C190065D849 /* PopoverViewController.swift */; };
 		A628BEB625ECD97900121B64 /* SignupVerificationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A628BEB425ECD97900121B64 /* SignupVerificationViewController.swift */; };
 		A628BEB725ECD97900121B64 /* SignupVerificationViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A628BEB525ECD97900121B64 /* SignupVerificationViewController.xib */; };
+		A628BEC325ED703A00121B64 /* RemoteConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = A628BEC225ED703A00121B64 /* RemoteConstants.swift */; };
 		A6344AD9255952C70072FA07 /* NoteContentPreviewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6344AD8255952C70072FA07 /* NoteContentPreviewTests.swift */; };
 		A645FA70254C5E69008A1519 /* NoteContentHelperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A645FA6F254C5E69008A1519 /* NoteContentHelperTests.swift */; };
 		A64DE6E9255D1C9F001D0526 /* ContentSlice.swift in Sources */ = {isa = PBXBuildFile; fileRef = A64DE6E8255D1C9F001D0526 /* ContentSlice.swift */; };
@@ -171,8 +172,13 @@
 		A6C0DFE825C18E3300B9BE39 /* NoteEditorTagListViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A6C0DFE625C18E3300B9BE39 /* NoteEditorTagListViewController.xib */; };
 		A6C2721825AF0C1E00593731 /* TagListViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6C2721725AF0C1E00593731 /* TagListViewCell.swift */; };
 		A6C3D8B7256687970042F584 /* SPObjectManager+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6C3D8B6256687970042F584 /* SPObjectManager+Simplenote.swift */; };
+		A6C7648025E9131C00A39067 /* SignupRemote.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6C7647F25E9131C00A39067 /* SignupRemote.swift */; };
+		A6CC0B0725B8287F00F12A85 /* AccountRemote.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6CC0B0625B8287F00F12A85 /* AccountRemote.swift */; };
 		A6CC0B1025B83FE400F12A85 /* AccountVerificationControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6CC0B0F25B83FE400F12A85 /* AccountVerificationControllerTests.swift */; };
 		A6CC0B1F25B840A400F12A85 /* MockAccountVerificationRemote.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6CC0B1E25B840A400F12A85 /* MockAccountVerificationRemote.swift */; };
+		A6CC0B2D25B84FF200F12A85 /* AccountVerificationRemoteTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6CC0B2C25B84FF200F12A85 /* AccountVerificationRemoteTests.swift */; };
+		A6CC0B3625B8502800F12A85 /* MockURLSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6CC0B3525B8502800F12A85 /* MockURLSession.swift */; };
+		A6CC0B4425B8505700F12A85 /* MockURLSessionDataTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6CC0B4325B8505700F12A85 /* MockURLSessionDataTask.swift */; };
 		A6CDD9C825F0163D00E0BC4D /* MagicLinkAuthenticator.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6CDD9C725F0163D00E0BC4D /* MagicLinkAuthenticator.swift */; };
 		A6CDF900256B9CB900CF2F27 /* ViewSpinner.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6CDF8FF256B9CB900CF2F27 /* ViewSpinner.swift */; };
 		A6D5AE6525483F8A00326C76 /* NSTextStorage+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6D5AE6425483F8A00326C76 /* NSTextStorage+Simplenote.swift */; };
@@ -235,8 +241,6 @@
 		B518899E1E0D5EF800E71B83 /* SPContactsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B518899D1E0D5EF800E71B83 /* SPContactsManager.swift */; };
 		B51889A01E0D5F2200E71B83 /* Contacts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B518899F1E0D5F2200E71B83 /* Contacts.framework */; };
 		B51889A41E0DB01E00E71B83 /* ContactsUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B51889A31E0DB01E00E71B83 /* ContactsUI.framework */; };
-		B51D445B2C52CB4000F296A7 /* SimplenoteEndpoints in Frameworks */ = {isa = PBXBuildFile; productRef = B51D445A2C52CB4000F296A7 /* SimplenoteEndpoints */; };
-		B51D445E2C52CDA800F296A7 /* SPUser+UserProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51D445D2C52CDA800F296A7 /* SPUser+UserProtocol.swift */; };
 		B51F6DD12460C3EE0074DDD9 /* AuthenticationValidator.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51F6DD02460C3EE0074DDD9 /* AuthenticationValidator.swift */; };
 		B51F6DD32460D12B0074DDD9 /* AuthenticationValidatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51F6DD22460D12B0074DDD9 /* AuthenticationValidatorTests.swift */; };
 		B51F6DD52460D7540074DDD9 /* NSPredicate+Email.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51F6DD42460D7540074DDD9 /* NSPredicate+Email.swift */; };
@@ -294,7 +298,6 @@
 		B54A11C22C135EA2002AC8AA /* UIButton+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54A11C12C135EA2002AC8AA /* UIButton+Simplenote.swift */; };
 		B54A11C42C136225002AC8AA /* MagicLinkRequestedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54A11C32C136225002AC8AA /* MagicLinkRequestedView.swift */; };
 		B54B04D82407169500401FBB /* SPAppDelegate+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54B04D72407169500401FBB /* SPAppDelegate+Extensions.swift */; };
-		B54C1B552C4EE350001E9E18 /* UIAlertController+Auth.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54C1B542C4EE350001E9E18 /* UIAlertController+Auth.swift */; };
 		B54D9C572909BA2600D0E0EC /* StoreManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54D9C562909BA2600D0E0EC /* StoreManager.swift */; };
 		B54D9C592909CC4400D0E0EC /* StoreProduct.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54D9C582909CC4400D0E0EC /* StoreProduct.swift */; };
 		B55051821A4328B9002A1093 /* LocalAuthentication.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B55051811A4328B9002A1093 /* LocalAuthentication.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
@@ -307,6 +310,7 @@
 		B55E428C22A1A4550018C0CE /* SPSortOrderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B55E428B22A1A4550018C0CE /* SPSortOrderViewController.swift */; };
 		B56315BE236BD9970066C151 /* UIKitConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AB169B22FB2DF300B4EBA5 /* UIKitConstants.swift */; };
 		B5686178195B9E93005F1245 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E2F149471799F5A500DC9690 /* libsqlite3.dylib */; };
+		B5699B092C1246C40096D6B7 /* LoginRemote.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5699B082C1246C40096D6B7 /* LoginRemote.swift */; };
 		B56A695822F9CD1500B90398 /* SPOnboardingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = B56A695622F9CD1500B90398 /* SPOnboardingViewController.xib */; };
 		B56A695922F9CD1500B90398 /* SPOnboardingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56A695722F9CD1500B90398 /* SPOnboardingViewController.swift */; };
 		B56A695B22F9CD4E00B90398 /* UINavigationBar+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56A695A22F9CD4E00B90398 /* UINavigationBar+Simplenote.swift */; };
@@ -424,6 +428,7 @@
 		BA0AF10D2BE996600050EEBD /* KeychainManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B59560DF251A46D500A06788 /* KeychainManager.swift */; };
 		BA0AF10E2BE996630050EEBD /* KeychainPasswordItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37FD30471FC4CFA2008D0B78 /* KeychainPasswordItem.swift */; };
 		BA0ED16E26D708AC002533B6 /* Color+Widgets.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA0ED16D26D708AC002533B6 /* Color+Widgets.swift */; };
+		BA0F5E0426B62A8B0098C605 /* RemoteError.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA0F5E0326B62A8B0098C605 /* RemoteError.swift */; };
 		BA113E4D269E860500F3E3B4 /* markdown-light.css in Resources */ = {isa = PBXBuildFile; fileRef = BA113E4C269E860500F3E3B4 /* markdown-light.css */; };
 		BA122DBA265EF402003D3BC5 /* SimplenoteConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5095DC824632E3300812711 /* SimplenoteConstants.swift */; };
 		BA122DBB265EF40E003D3BC5 /* UIColor+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = B575736B232D454300443C2E /* UIColor+Helpers.swift */; };
@@ -436,6 +441,7 @@
 		BA122DCA265F2E2D003D3BC5 /* UIColorSimplenoteTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA122DC9265F2E2D003D3BC5 /* UIColorSimplenoteTests.swift */; };
 		BA12B06F26B0D0150026F31D /* SPManagedObject+Widget.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA12B06C26B0D0150026F31D /* SPManagedObject+Widget.swift */; };
 		BA12B07026B0D0150026F31D /* SPManagedObject+Widget.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA12B06C26B0D0150026F31D /* SPManagedObject+Widget.swift */; };
+		BA18532826488DBC00D9A347 /* SignupRemoteTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA18532726488DBC00D9A347 /* SignupRemoteTests.swift */; };
 		BA2015BB2B57384F005E59AA /* AutomatticTracks in Frameworks */ = {isa = PBXBuildFile; productRef = BA2015BA2B57384F005E59AA /* AutomatticTracks */; };
 		BA289B5C2BE4371A000E6794 /* ListWidgetIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA289B5A2BE4371A000E6794 /* ListWidgetIntentHandler.swift */; };
 		BA289B5F2BE43728000E6794 /* NoteWidgetIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA289B5D2BE43728000E6794 /* NoteWidgetIntentHandler.swift */; };
@@ -470,8 +476,10 @@
 		BA55124E2600210B00D8F882 /* TimerFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA55124D2600210B00D8F882 /* TimerFactory.swift */; };
 		BA55B05A25F067DF0042582B /* NoticePresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA55B05925F067DF0042582B /* NoticePresenter.swift */; };
 		BA55B06325F068650042582B /* NoticeController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA55B06225F068650042582B /* NoticeController.swift */; };
+		BA5768E3269A803F008B510E /* Remote.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA5768E2269A803F008B510E /* Remote.swift */; };
 		BA5768EC269BE4D0008B510E /* AccountDeletionController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA5768EB269BE4D0008B510E /* AccountDeletionController.swift */; };
 		BA5C1C0725BF9D6C006E3820 /* SPDragBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA5C1C0625BF9D6C006E3820 /* SPDragBar.swift */; };
+		BA5E5B7D264A148C00D0EE19 /* URLRequest+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA5E5B7C264A148C00D0EE19 /* URLRequest+Simplenote.swift */; };
 		BA608EF526BB6E0200A9D94E /* ListWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA608EF426BB6E0200A9D94E /* ListWidget.swift */; };
 		BA608EF726BB6E7400A9D94E /* ListWidgetProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA608EF626BB6E7400A9D94E /* ListWidgetProvider.swift */; };
 		BA608EF926BB6F4C00A9D94E /* ListWidgetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA608EF826BB6F4C00A9D94E /* ListWidgetView.swift */; };
@@ -768,7 +776,6 @@
 		3FA60139242C5AAD0068FC52 /* SimplenoteScreenshots.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SimplenoteScreenshots.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		3FA6013B242C5AAE0068FC52 /* SimplenoteScreenshots.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SimplenoteScreenshots.swift; sourceTree = "<group>"; };
 		3FA6013D242C5AAE0068FC52 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		3FD478242C572EE10071B8B9 /* Project.Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Project.Release.xcconfig; sourceTree = "<group>"; };
 		3FF314D226FC47720012E68E /* XCUIApplication+Assertions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "XCUIApplication+Assertions.swift"; sourceTree = "<group>"; };
 		3FFBDBEB26FBF132008AD052 /* UITestsFoundation.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = UITestsFoundation.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		3FFBDBED26FBF132008AD052 /* UITestsFoundation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UITestsFoundation.h; sourceTree = "<group>"; };
@@ -821,6 +828,7 @@
 		A61471B725D70C190065D849 /* PopoverViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PopoverViewController.swift; path = Classes/PopoverViewController.swift; sourceTree = "<group>"; };
 		A628BEB425ECD97900121B64 /* SignupVerificationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SignupVerificationViewController.swift; path = Classes/SignupVerificationViewController.swift; sourceTree = "<group>"; };
 		A628BEB525ECD97900121B64 /* SignupVerificationViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = SignupVerificationViewController.xib; path = Classes/SignupVerificationViewController.xib; sourceTree = "<group>"; };
+		A628BEC225ED703A00121B64 /* RemoteConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = RemoteConstants.swift; path = Classes/RemoteConstants.swift; sourceTree = "<group>"; };
 		A6344AD8255952C70072FA07 /* NoteContentPreviewTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteContentPreviewTests.swift; sourceTree = "<group>"; };
 		A645FA6F254C5E69008A1519 /* NoteContentHelperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteContentHelperTests.swift; sourceTree = "<group>"; };
 		A64DE6E8255D1C9F001D0526 /* ContentSlice.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ContentSlice.swift; path = Classes/ContentSlice.swift; sourceTree = "<group>"; };
@@ -868,8 +876,13 @@
 		A6C0DFE625C18E3300B9BE39 /* NoteEditorTagListViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NoteEditorTagListViewController.xib; sourceTree = "<group>"; };
 		A6C2721725AF0C1E00593731 /* TagListViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TagListViewCell.swift; sourceTree = "<group>"; };
 		A6C3D8B6256687970042F584 /* SPObjectManager+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "SPObjectManager+Simplenote.swift"; path = "Classes/SPObjectManager+Simplenote.swift"; sourceTree = "<group>"; };
+		A6C7647F25E9131C00A39067 /* SignupRemote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SignupRemote.swift; path = Classes/SignupRemote.swift; sourceTree = "<group>"; };
+		A6CC0B0625B8287F00F12A85 /* AccountRemote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountRemote.swift; sourceTree = "<group>"; };
 		A6CC0B0F25B83FE400F12A85 /* AccountVerificationControllerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountVerificationControllerTests.swift; sourceTree = "<group>"; };
 		A6CC0B1E25B840A400F12A85 /* MockAccountVerificationRemote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockAccountVerificationRemote.swift; sourceTree = "<group>"; };
+		A6CC0B2C25B84FF200F12A85 /* AccountVerificationRemoteTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountVerificationRemoteTests.swift; sourceTree = "<group>"; };
+		A6CC0B3525B8502800F12A85 /* MockURLSession.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockURLSession.swift; sourceTree = "<group>"; };
+		A6CC0B4325B8505700F12A85 /* MockURLSessionDataTask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockURLSessionDataTask.swift; sourceTree = "<group>"; };
 		A6CDD9C725F0163D00E0BC4D /* MagicLinkAuthenticator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MagicLinkAuthenticator.swift; path = Classes/MagicLinkAuthenticator.swift; sourceTree = "<group>"; };
 		A6CDF8FF256B9CB900CF2F27 /* ViewSpinner.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ViewSpinner.swift; path = Classes/ViewSpinner.swift; sourceTree = "<group>"; };
 		A6D5AE6425483F8A00326C76 /* NSTextStorage+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSTextStorage+Simplenote.swift"; sourceTree = "<group>"; };
@@ -930,7 +943,6 @@
 		B518899D1E0D5EF800E71B83 /* SPContactsManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SPContactsManager.swift; path = Classes/SPContactsManager.swift; sourceTree = "<group>"; };
 		B518899F1E0D5F2200E71B83 /* Contacts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Contacts.framework; path = System/Library/Frameworks/Contacts.framework; sourceTree = SDKROOT; };
 		B51889A31E0DB01E00E71B83 /* ContactsUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ContactsUI.framework; path = System/Library/Frameworks/ContactsUI.framework; sourceTree = SDKROOT; };
-		B51D445D2C52CDA800F296A7 /* SPUser+UserProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SPUser+UserProtocol.swift"; sourceTree = "<group>"; };
 		B51F6DD02460C3EE0074DDD9 /* AuthenticationValidator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationValidator.swift; sourceTree = "<group>"; };
 		B51F6DD22460D12B0074DDD9 /* AuthenticationValidatorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationValidatorTests.swift; sourceTree = "<group>"; };
 		B51F6DD42460D7540074DDD9 /* NSPredicate+Email.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSPredicate+Email.swift"; sourceTree = "<group>"; };
@@ -986,7 +998,6 @@
 		B54A11C12C135EA2002AC8AA /* UIButton+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIButton+Simplenote.swift"; sourceTree = "<group>"; };
 		B54A11C32C136225002AC8AA /* MagicLinkRequestedView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MagicLinkRequestedView.swift; sourceTree = "<group>"; };
 		B54B04D72407169500401FBB /* SPAppDelegate+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SPAppDelegate+Extensions.swift"; sourceTree = "<group>"; };
-		B54C1B542C4EE350001E9E18 /* UIAlertController+Auth.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIAlertController+Auth.swift"; sourceTree = "<group>"; };
 		B54D9C542909B21700D0E0EC /* Simplenote 6.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Simplenote 6.xcdatamodel"; sourceTree = "<group>"; };
 		B54D9C562909BA2600D0E0EC /* StoreManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoreManager.swift; sourceTree = "<group>"; };
 		B54D9C582909CC4400D0E0EC /* StoreProduct.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoreProduct.swift; sourceTree = "<group>"; };
@@ -1011,6 +1022,7 @@
 		B55E428B22A1A4550018C0CE /* SPSortOrderViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SPSortOrderViewController.swift; path = Classes/SPSortOrderViewController.swift; sourceTree = "<group>"; };
 		B5651239243BC063001EFE77 /* fa */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fa; path = fa.lproj/Localizable.strings; sourceTree = "<group>"; };
 		B566A1DD189AA74600DC3F2D /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; };
+		B5699B082C1246C40096D6B7 /* LoginRemote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginRemote.swift; sourceTree = "<group>"; };
 		B56A695622F9CD1500B90398 /* SPOnboardingViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = SPOnboardingViewController.xib; path = Classes/SPOnboardingViewController.xib; sourceTree = "<group>"; };
 		B56A695722F9CD1500B90398 /* SPOnboardingViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SPOnboardingViewController.swift; path = Classes/SPOnboardingViewController.swift; sourceTree = "<group>"; };
 		B56A695A22F9CD4E00B90398 /* UINavigationBar+Simplenote.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "UINavigationBar+Simplenote.swift"; path = "Classes/UINavigationBar+Simplenote.swift"; sourceTree = "<group>"; };
@@ -1142,11 +1154,13 @@
 		BA0890A626BB9BE20035CA48 /* ListWidgetHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListWidgetHeaderView.swift; sourceTree = "<group>"; };
 		BA0890A826BB9BF80035CA48 /* NewNoteButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewNoteButton.swift; sourceTree = "<group>"; };
 		BA0ED16D26D708AC002533B6 /* Color+Widgets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Color+Widgets.swift"; sourceTree = "<group>"; };
+		BA0F5E0326B62A8B0098C605 /* RemoteError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoteError.swift; sourceTree = "<group>"; };
 		BA113E4C269E860500F3E3B4 /* markdown-light.css */ = {isa = PBXFileReference; lastKnownFileType = text.css; path = "markdown-light.css"; sourceTree = "<group>"; };
 		BA122DC5265EF90C003D3BC5 /* NewNoteWidgetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewNoteWidgetView.swift; sourceTree = "<group>"; };
 		BA122DC9265F2E2D003D3BC5 /* UIColorSimplenoteTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIColorSimplenoteTests.swift; sourceTree = "<group>"; };
 		BA12B06C26B0D0150026F31D /* SPManagedObject+Widget.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "SPManagedObject+Widget.swift"; sourceTree = "<group>"; };
 		BA16C6A82BC4968400C9079F /* Simplenote 7.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Simplenote 7.xcdatamodel"; sourceTree = "<group>"; };
+		BA18532726488DBC00D9A347 /* SignupRemoteTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignupRemoteTests.swift; sourceTree = "<group>"; };
 		BA289B5A2BE4371A000E6794 /* ListWidgetIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListWidgetIntentHandler.swift; sourceTree = "<group>"; };
 		BA289B5D2BE43728000E6794 /* NoteWidgetIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteWidgetIntentHandler.swift; sourceTree = "<group>"; };
 		BA289B632BE43963000E6794 /* OpenNewNoteIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenNewNoteIntentHandler.swift; sourceTree = "<group>"; };
@@ -1171,8 +1185,10 @@
 		BA55124D2600210B00D8F882 /* TimerFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimerFactory.swift; sourceTree = "<group>"; };
 		BA55B05925F067DF0042582B /* NoticePresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoticePresenter.swift; sourceTree = "<group>"; };
 		BA55B06225F068650042582B /* NoticeController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoticeController.swift; sourceTree = "<group>"; };
+		BA5768E2269A803F008B510E /* Remote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Remote.swift; sourceTree = "<group>"; };
 		BA5768EB269BE4D0008B510E /* AccountDeletionController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountDeletionController.swift; sourceTree = "<group>"; };
 		BA5C1C0625BF9D6C006E3820 /* SPDragBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPDragBar.swift; sourceTree = "<group>"; };
+		BA5E5B7C264A148C00D0EE19 /* URLRequest+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URLRequest+Simplenote.swift"; sourceTree = "<group>"; };
 		BA608EF426BB6E0200A9D94E /* ListWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListWidget.swift; sourceTree = "<group>"; };
 		BA608EF626BB6E7400A9D94E /* ListWidgetProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListWidgetProvider.swift; sourceTree = "<group>"; };
 		BA608EF826BB6F4C00A9D94E /* ListWidgetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListWidgetView.swift; sourceTree = "<group>"; };
@@ -1399,7 +1415,6 @@
 				46A3C9BE17DFA81A002865AE /* UIKit.framework in Frameworks */,
 				46A3C9BF17DFA81A002865AE /* Foundation.framework in Frameworks */,
 				4352BA0867E0E416EB5FF6B9 /* Pods_Automattic_Simplenote.framework in Frameworks */,
-				B51D445B2C52CB4000F296A7 /* SimplenoteEndpoints in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1632,7 +1647,6 @@
 				8C573B0D22CD1AD6005BC6F5 /* Version.Public.xcconfig */,
 				8C573B0A22CD1A61005BC6F5 /* Simplenote.debug.xcconfig */,
 				8C573B0B22CD1A6F005BC6F5 /* Simplenote.release.xcconfig */,
-				3FD478242C572EE10071B8B9 /* Project.Release.xcconfig */,
 			);
 			path = config;
 			sourceTree = "<group>";
@@ -1720,6 +1734,7 @@
 			children = (
 				A6CC0B1D25B8408900F12A85 /* Helpers */,
 				A6CC0B0F25B83FE400F12A85 /* AccountVerificationControllerTests.swift */,
+				A6CC0B2C25B84FF200F12A85 /* AccountVerificationRemoteTests.swift */,
 			);
 			path = Verification;
 			sourceTree = "<group>";
@@ -1732,6 +1747,15 @@
 			path = Helpers;
 			sourceTree = "<group>";
 		};
+		A6CC0B3425B8501B00F12A85 /* Network */ = {
+			isa = PBXGroup;
+			children = (
+				A6CC0B3525B8502800F12A85 /* MockURLSession.swift */,
+				A6CC0B4325B8505700F12A85 /* MockURLSessionDataTask.swift */,
+			);
+			path = Network;
+			sourceTree = "<group>";
+		};
 		A6E1E79C24BDDF30008A44BC /* Card */ = {
 			isa = PBXGroup;
 			children = (
@@ -1817,18 +1841,11 @@
 				B52F35D022F3254800724793 /* Theme.swift */,
 				B5AB169B22FB2DF300B4EBA5 /* UIKitConstants.swift */,
 				B5095DC824632E3300812711 /* SimplenoteConstants.swift */,
+				A628BEC225ED703A00121B64 /* RemoteConstants.swift */,
 			);
 			name = Settings;
 			sourceTree = "<group>";
 		};
-		B51D445C2C52CD8D00F296A7 /* Authentication */ = {
-			isa = PBXGroup;
-			children = (
-				B51D445D2C52CDA800F296A7 /* SPUser+UserProtocol.swift */,
-			);
-			name = Authentication;
-			sourceTree = "<group>";
-		};
 		B51F6DCF2460C3D80074DDD9 /* Onboarding */ = {
 			isa = PBXGroup;
 			children = (
@@ -1978,6 +1995,7 @@
 				A6344AD8255952C70072FA07 /* NoteContentPreviewTests.swift */,
 				A694ABB225D1687200CC3A2D /* NoteScrollPositionCacheTests.swift */,
 				BAB0179A260AD591007A9CC3 /* PublishControllerTests.swift */,
+				BA18532726488DBC00D9A347 /* SignupRemoteTests.swift */,
 			);
 			name = Tools;
 			sourceTree = "<group>";
@@ -2045,6 +2063,7 @@
 				A6C0DFB425C1581D00B9BE39 /* UIScrollView+Simplenote.swift */,
 				A6A8968D25D5779D00A7B390 /* FileManager+Simplenote.swift */,
 				BAE08625261282D1009D40CD /* Note+Publish.swift */,
+				BA5E5B7C264A148C00D0EE19 /* URLRequest+Simplenote.swift */,
 				BAFDBBD726B88BD200119615 /* Date+Simplenote.swift */,
 				BAB27BD526BA425C00AE4ACC /* Color+Simplenote.swift */,
 				BAA59E78269F9FE30068BD3D /* Date+Simplenote.swift */,
@@ -2062,7 +2081,6 @@
 				B56A695D22F9D53300B90398 /* SPAuthError.swift */,
 				B56A695C22F9D53300B90398 /* SPAuthHandler.swift */,
 				B5C99A502C45B94600728813 /* AuthenticationMode.swift */,
-				B54C1B542C4EE350001E9E18 /* UIAlertController+Auth.swift */,
 				B56A695F22F9D53400B90398 /* SPAuthViewController.swift */,
 				B56A695E22F9D53300B90398 /* SPAuthViewController.xib */,
 				B5AB169722FA124F00B4EBA5 /* SPSheetController.swift */,
@@ -2162,6 +2180,7 @@
 		B5B85BA6235173D900AD5221 /* Helpers */ = {
 			isa = PBXGroup;
 			children = (
+				A6CC0B3425B8501B00F12A85 /* Network */,
 				B5421F3B23CE7A14004DDC19 /* Constants.swift */,
 				B5421F3D23CE7A1C004DDC19 /* MockupStorage.swift */,
 				B5421F3E23CE7A1C004DDC19 /* MockupStorage+Sample.swift */,
@@ -2197,6 +2216,7 @@
 		B5BE053E1AB751FD002417BF /* Tools */ = {
 			isa = PBXGroup;
 			children = (
+				BA57692A269D2103008B510E /* Remotes */,
 				B51F6DCF2460C3D80074DDD9 /* Onboarding */,
 				B5CBEF3F22D3AD92009DBE67 /* MigrationsHandler.swift */,
 				B5D3FCCF201F96AC00A813B7 /* StatusChecker.h */,
@@ -2417,6 +2437,18 @@
 			path = Tools;
 			sourceTree = "<group>";
 		};
+		BA57692A269D2103008B510E /* Remotes */ = {
+			isa = PBXGroup;
+			children = (
+				B5699B082C1246C40096D6B7 /* LoginRemote.swift */,
+				A6C7647F25E9131C00A39067 /* SignupRemote.swift */,
+				A6CC0B0625B8287F00F12A85 /* AccountRemote.swift */,
+				BA5768E2269A803F008B510E /* Remote.swift */,
+				BA0F5E0326B62A8B0098C605 /* RemoteError.swift */,
+			);
+			name = Remotes;
+			sourceTree = "<group>";
+		};
 		BA75D87C26C0842000883FFA /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
@@ -2668,7 +2700,6 @@
 		E29ADD4117848E8500E55842 /* Simplenote */ = {
 			isa = PBXGroup;
 			children = (
-				B51D445C2C52CD8D00F296A7 /* Authentication */,
 				467D9C7A1788D10400785EF3 /* Categories */,
 				A690032F253D85C40087D0D2 /* Controllers */,
 				B5C7BF92230C592B000DEC91 /* Credentials */,
@@ -2882,7 +2913,6 @@
 				B50D2FB524E6DFAC00163FC3 /* SimplenoteSearch */,
 				B59CACFB2541E05400958330 /* SimplenoteInterlinks */,
 				BA2015BA2B57384F005E59AA /* AutomatticTracks */,
-				B51D445A2C52CB4000F296A7 /* SimplenoteEndpoints */,
 			);
 			productName = Simplenote;
 			productReference = 46A3C9D717DFA81A002865AE /* Simplenote.app */;
@@ -3102,7 +3132,6 @@
 				3F762E8D2677F19C0088CD45 /* XCRemoteSwiftPackageReference "XCUITestHelpers" */,
 				3F4BA07C26CDF295000619B1 /* XCRemoteSwiftPackageReference "ScreenObject" */,
 				BA2015B92B573761005E59AA /* XCRemoteSwiftPackageReference "Automattic-Tracks-iOS" */,
-				B51D44592C52CB4000F296A7 /* XCRemoteSwiftPackageReference "SimplenoteEndpoints-Swift" */,
 			);
 			productRefGroup = E29ADD3917848E8500E55842 /* Products */;
 			projectDirPath = "";
@@ -3537,6 +3566,7 @@
 				B56E763622BD565700C5AA47 /* UIView+Simplenote.swift in Sources */,
 				B5E4082D235DE41A00D4E1DF /* UIColor+Studio.swift in Sources */,
 				A6CDF900256B9CB900CF2F27 /* ViewSpinner.swift in Sources */,
+				BA5E5B7D264A148C00D0EE19 /* URLRequest+Simplenote.swift in Sources */,
 				375D24B721E01131007AB25A /* stack.c in Sources */,
 				373AD30821C4739500A4EA89 /* NSMutableAttributedString+Styling.m in Sources */,
 				B524AE112352CC7900EA11D4 /* UIScreen+Simplenote.swift in Sources */,
@@ -3559,6 +3589,7 @@
 				B5757368232BED0700443C2E /* UIBezierPath+Simplenote.swift in Sources */,
 				B5476BB723D89AF7000E7723 /* SPSectionHeaderView.swift in Sources */,
 				B5377349252E2A4200BC78C5 /* Value1TableViewCell.swift in Sources */,
+				BA0F5E0426B62A8B0098C605 /* RemoteError.swift in Sources */,
 				B53C5A5A230330CD00DA2143 /* SPNoteListViewController+Extensions.swift in Sources */,
 				A6C0DFB525C1581D00B9BE39 /* UIScrollView+Simplenote.swift in Sources */,
 				375D24B621E01131007AB25A /* html_blocks.c in Sources */,
@@ -3596,6 +3627,7 @@
 				B52BB75022CFD18F0042C162 /* UIActivity+Simplenote.swift in Sources */,
 				F9E197D42283D05C0092B3E1 /* CrashLogging.swift in Sources */,
 				BA9B59022685549F00DAD1ED /* StorageSettings.swift in Sources */,
+				B5699B092C1246C40096D6B7 /* LoginRemote.swift in Sources */,
 				DE7E545B214E34C8008D9928 /* NSString+Count.swift in Sources */,
 				A6E6CE0025A4B0A9005A92DB /* PinLockVerifyController.swift in Sources */,
 				BA55124E2600210B00D8F882 /* TimerFactory.swift in Sources */,
@@ -3611,7 +3643,6 @@
 				46A3C98F17DFA81A002865AE /* SPNoteListViewController.m in Sources */,
 				B5BD6AF51BF66093004ECE33 /* SPMarkdownPreviewViewController.m in Sources */,
 				B5F3FFFF23F44679007A7C59 /* SPSortBar.swift in Sources */,
-				B54C1B552C4EE350001E9E18 /* UIAlertController+Auth.swift in Sources */,
 				BA4499C525ED95E5000C563E /* NoticeAction.swift in Sources */,
 				A6E02778256E9487002054DF /* PinLockSetupController.swift in Sources */,
 				B513F2B42319A8D50021CFA4 /* SPNoteTableViewCell.swift in Sources */,
@@ -3629,6 +3660,7 @@
 				BA289B732BE45A3C000E6794 /* IntentsConstants.swift in Sources */,
 				BAF4A96F26DB085D00C51C1D /* NSURLComponents+Simplenote.swift in Sources */,
 				B5E951E124FEDAD4004B10B8 /* UIPasteboard+Note.swift in Sources */,
+				A6C7648025E9131C00A39067 /* SignupRemote.swift in Sources */,
 				A681C73C2541AC8D00F369C2 /* HuggableTableView.swift in Sources */,
 				46A3C99917DFA81A002865AE /* SPTransitionController.m in Sources */,
 				B56A695B22F9CD4E00B90398 /* UINavigationBar+Simplenote.swift in Sources */,
@@ -3648,7 +3680,6 @@
 				B5AEC38423FAC5D600D24221 /* DateFormatter+Simplenote.swift in Sources */,
 				B5DF734622A5713600602CE7 /* SortMode.swift in Sources */,
 				BA55B05A25F067DF0042582B /* NoticePresenter.swift in Sources */,
-				B51D445E2C52CDA800F296A7 /* SPUser+UserProtocol.swift in Sources */,
 				46A3C99D17DFA81A002865AE /* SPAddCollaboratorsViewController.m in Sources */,
 				B52646AA22D3E04C00EBF299 /* UIViewController+Simplenote.swift in Sources */,
 				B55E428C22A1A4550018C0CE /* SPSortOrderViewController.swift in Sources */,
@@ -3658,6 +3689,7 @@
 				E215C79E180B228800AD36B5 /* SPTextField.m in Sources */,
 				A6DE79CE2552E6CC00BC69C6 /* TagListViewController.swift in Sources */,
 				B513F2B82319A9A40021CFA4 /* UITableViewCell+Simplenote.swift in Sources */,
+				A628BEC325ED703A00121B64 /* RemoteConstants.swift in Sources */,
 				B51F6DD52460D7540074DDD9 /* NSPredicate+Email.swift in Sources */,
 				B5C2EDF0255AFB6C00C09B32 /* PassthruView.swift in Sources */,
 				A6F4882325A8889E0050CFA8 /* UITextField+Tag.swift in Sources */,
@@ -3707,6 +3739,7 @@
 				375D24B121E01131007AB25A /* html5_blocks.c in Sources */,
 				B504D4DE23D2014200AEED27 /* IndexPath+Simplenote.swift in Sources */,
 				B5C99A512C45B94600728813 /* AuthenticationMode.swift in Sources */,
+				A6CC0B0725B8287F00F12A85 /* AccountRemote.swift in Sources */,
 				A61471B925D70C190065D849 /* PopoverViewController.swift in Sources */,
 				B536988D25646C9400817E30 /* CGRect+Simplenote.swift in Sources */,
 				B5E96B611BDE5ACA00D707F5 /* SPMarkdownParser.m in Sources */,
@@ -3715,6 +3748,7 @@
 				B59560E0251A46D500A06788 /* KeychainManager.swift in Sources */,
 				46A3C9AF17DFA81A002865AE /* NSString+Condensing.m in Sources */,
 				A6F487AF25A79D550050CFA8 /* BiometricAuthentication.swift in Sources */,
+				BA5768E3269A803F008B510E /* Remote.swift in Sources */,
 				A6F4881325A884CE0050CFA8 /* UITextInput+Simplenote.swift in Sources */,
 				B50F47A41D1D78EA00822748 /* SPRatingsHelper.m in Sources */,
 				371A8630213DF00E002E9120 /* SPPinLockManager.swift in Sources */,
@@ -3729,6 +3763,8 @@
 				A6CC0B1025B83FE400F12A85 /* AccountVerificationControllerTests.swift in Sources */,
 				A694ABB325D1687200CC3A2D /* NoteScrollPositionCacheTests.swift in Sources */,
 				A6E6CE7525A5B4A3005A92DB /* MockPinLockManager.swift in Sources */,
+				A6CC0B4425B8505700F12A85 /* MockURLSessionDataTask.swift in Sources */,
+				A6CC0B3625B8502800F12A85 /* MockURLSession.swift in Sources */,
 				B52F35D322F356F500724793 /* UserDefaults+Tests.swift in Sources */,
 				B511AEE9255A0A5E005B2159 /* InterlinkResultsControllerTests.swift in Sources */,
 				374F5EF521BF057E00B57E8B /* NSMutableAttributedStringStylingTests.swift in Sources */,
@@ -3741,11 +3777,13 @@
 				BAB017AB260ADDEB007A9CC3 /* MockTimerFactory.swift in Sources */,
 				B55AC57A22D27B9100D8CEB2 /* OptionsTests.swift in Sources */,
 				B543C7DF23CF6AB400003A80 /* NotesListControllerTests.swift in Sources */,
+				A6CC0B2D25B84FF200F12A85 /* AccountVerificationRemoteTests.swift in Sources */,
 				B5421F4023CE7A1C004DDC19 /* MockupStorage+Sample.swift in Sources */,
 				A6F4883225A891A70050CFA8 /* TagTextFieldInputValidatorTests.swift in Sources */,
 				A6E6CE9125A5B970005A92DB /* PinLockRemoveControllerTests.swift in Sources */,
 				B57401A025B7D9960058960E /* EmailVerificationTests.swift in Sources */,
 				A6E6CEC925A6053A005A92DB /* MockApplication.swift in Sources */,
+				BA18532826488DBC00D9A347 /* SignupRemoteTests.swift in Sources */,
 				BA3FB8CF25FEA0C500EA9A1B /* NoticeControllerTests.swift in Sources */,
 				BAB32C63269E4190005C72B2 /* RemoteResult+TestHelpers.swift in Sources */,
 				A645FA70254C5E69008A1519 /* NoteContentHelperTests.swift in Sources */,
@@ -4588,6 +4626,7 @@
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
 				DEFINES_MODULE = YES;
+				DEVELOPMENT_TEAM = PZYM8XX95Q;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
 				ENABLE_TESTABILITY = YES;
@@ -4618,6 +4657,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.codality.NotationalFlow;
 				PRODUCT_NAME = Simplenote;
 				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE_SPECIFIER = "Simplenote Release";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "RELEASE $(SP_IOS_SDK)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Simplenote/Simplenote-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -4897,6 +4937,7 @@
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
 				DEFINES_MODULE = YES;
+				DEVELOPMENT_TEAM = PZYM8XX95Q;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -4926,6 +4967,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.codality.NotationalFlow;
 				PRODUCT_NAME = Simplenote;
 				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.codality.NotationalFlow";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "BUILD_APP_STORE $(SP_IOS_SDK)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Simplenote/Simplenote-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -5266,6 +5308,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = PZYM8XX95Q;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -5286,6 +5329,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.codality.NotationalFlow.Share;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE_SPECIFIER = "Simplenote Release Share";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = APP_EXTENSION;
 				SWIFT_OBJC_BRIDGING_HEADER = "SimplenoteShare/Simplenote-Share-Bridging-Header.h";
@@ -5346,6 +5390,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution: Automattic, Inc. (PZYM8XX95Q)";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = PZYM8XX95Q;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -5366,6 +5411,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.codality.NotationalFlow.Share;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.codality.NotationalFlow.Share";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = APP_EXTENSION;
 				SWIFT_OBJC_BRIDGING_HEADER = "SimplenoteShare/Simplenote-Share-Bridging-Header.h";
@@ -5432,6 +5478,7 @@
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = PZYM8XX95Q;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = "SimplenoteIntents/Supporting Files/Info.plist";
@@ -5445,6 +5492,7 @@
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.codality.NotationalFlow.Intents;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.codality.NotationalFlow.Intents";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = APP_EXTENSION;
 				SWIFT_OBJC_BRIDGING_HEADER = "SimplenoteIntents/Simplenote-Intents-Bridging-Header.h";
@@ -5544,6 +5592,7 @@
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = PZYM8XX95Q;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = "SimplenoteIntents/Supporting Files/Info.plist";
@@ -5557,6 +5606,7 @@
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.codality.NotationalFlow.Intents;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.codality.NotationalFlow.Intents";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = APP_EXTENSION;
 				SWIFT_OBJC_BRIDGING_HEADER = "SimplenoteIntents/Simplenote-Intents-Bridging-Header.h";
@@ -5629,6 +5679,7 @@
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 4.36.0.0;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = PZYM8XX95Q;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = SimplenoteWidgets/Info.plist;
@@ -5643,6 +5694,7 @@
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.codality.NotationalFlow.Widgets;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.codality.NotationalFlow.Widgets";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = APP_EXTENSION;
 				SWIFT_OBJC_BRIDGING_HEADER = "SimplenoteWidgets/Simplenote-Widgets-Bridging-Header.h";
@@ -5753,6 +5805,7 @@
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 4.36.0.0;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = PZYM8XX95Q;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = SimplenoteWidgets/Info.plist;
@@ -5767,6 +5820,7 @@
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.codality.NotationalFlow.Widgets;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.codality.NotationalFlow.Widgets";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = APP_EXTENSION;
 				SWIFT_OBJC_BRIDGING_HEADER = "SimplenoteWidgets/Simplenote-Widgets-Bridging-Header.h";
@@ -6224,14 +6278,6 @@
 				minimumVersion = 1.3.0;
 			};
 		};
-		B51D44592C52CB4000F296A7 /* XCRemoteSwiftPackageReference "SimplenoteEndpoints-Swift" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "git@github.com:Automattic/SimplenoteEndpoints-Swift.git";
-			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 1.0.0;
-			};
-		};
 		B59CACFA2541E05400958330 /* XCRemoteSwiftPackageReference "SimplenoteInterlinks-Swift" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "git@github.com:Automattic/SimplenoteInterlinks-Swift.git";
@@ -6289,11 +6335,6 @@
 			package = B50D2FB424E6DFAC00163FC3 /* XCRemoteSwiftPackageReference "SimplenoteSearch-Swift" */;
 			productName = SimplenoteSearch;
 		};
-		B51D445A2C52CB4000F296A7 /* SimplenoteEndpoints */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = B51D44592C52CB4000F296A7 /* XCRemoteSwiftPackageReference "SimplenoteEndpoints-Swift" */;
-			productName = SimplenoteEndpoints;
-		};
 		B59CACFB2541E05400958330 /* SimplenoteInterlinks */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = B59CACFA2541E05400958330 /* XCRemoteSwiftPackageReference "SimplenoteInterlinks-Swift" */;
diff --git a/Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 090b42b39..cd06d10ef 100644
--- a/Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,5 +1,4 @@
 {
-  "originHash" : "5c7dc5a8c3fa899620d4a2168cf121438ee740cb5c2b5fac978ee6263951dbe7",
   "pins" : [
     {
       "identity" : "automattic-tracks-ios",
@@ -28,15 +27,6 @@
         "version" : "8.18.0"
       }
     },
-    {
-      "identity" : "simplenoteendpoints-swift",
-      "kind" : "remoteSourceControl",
-      "location" : "git@github.com:Automattic/SimplenoteEndpoints-Swift.git",
-      "state" : {
-        "revision" : "3d1c0a5db39ca798a7de10e7faeef8ae66e941e6",
-        "version" : "1.0.0"
-      }
-    },
     {
       "identity" : "simplenotefoundation-swift",
       "kind" : "remoteSourceControl",
@@ -92,5 +82,5 @@
       }
     }
   ],
-  "version" : 3
+  "version" : 2
 }
diff --git a/Simplenote/AccountRemote.swift b/Simplenote/AccountRemote.swift
new file mode 100644
index 000000000..d91a16121
--- /dev/null
+++ b/Simplenote/AccountRemote.swift
@@ -0,0 +1,54 @@
+import Foundation
+
+// MARK: - AccountVerificationRemote
+//
+class AccountRemote: Remote {
+    // MARK: Performing tasks
+
+    /// Send verification request for specified email address
+    ///
+    func verify(email: String, completion: @escaping (_ result: Result<Data?, RemoteError>) -> Void) {
+        let request = verificationURLRequest(with: email)
+
+        performDataTask(with: request, completion: completion)
+    }
+
+    /// Send account deletion request for user
+    ///
+    func requestDelete(_ user: SPUser, completion: @escaping (_ result: Result<Data?, RemoteError>) -> Void) {
+        let request = deleteRequest(with: user)
+        performDataTask(with: request, completion: completion)
+    }
+
+    // MARK: URL Requests
+
+    private func verificationURLRequest(with email: String) -> URLRequest {
+        let base64EncodedEmail = email.data(using: .utf8)!.base64EncodedString()
+        let verificationURL = URL(string: SimplenoteConstants.verificationURL)!
+
+        var request = URLRequest(url: verificationURL.appendingPathComponent(base64EncodedEmail),
+                                 cachePolicy: .reloadIgnoringLocalAndRemoteCacheData,
+                                 timeoutInterval: RemoteConstants.timeout)
+        request.httpMethod = RemoteConstants.Method.GET
+
+        return request
+    }
+
+    private func deleteRequest(with user: SPUser) -> URLRequest {
+        let url = URL(string: SimplenoteConstants.accountDeletionURL)!
+
+        var request = URLRequest(url: url,
+                                 cachePolicy: .reloadIgnoringLocalAndRemoteCacheData,
+                                 timeoutInterval: RemoteConstants.timeout)
+        request.httpMethod = RemoteConstants.Method.POST
+        request.setValue("application/json", forHTTPHeaderField: "Content-Type")
+
+        let body = [
+            "username": user.email.lowercased(),
+            "token": user.authToken
+        ]
+        request.httpBody = try? JSONEncoder().encode(body)
+
+        return request
+    }
+}
diff --git a/Simplenote/Classes/MagicLinkAuthenticator.swift b/Simplenote/Classes/MagicLinkAuthenticator.swift
index 50046956e..b5ba213f2 100644
--- a/Simplenote/Classes/MagicLinkAuthenticator.swift
+++ b/Simplenote/Classes/MagicLinkAuthenticator.swift
@@ -1,5 +1,4 @@
 import Foundation
-import SimplenoteEndpoints
 
 
 // MARK: - Notifications
diff --git a/Simplenote/Classes/RemoteConstants.swift b/Simplenote/Classes/RemoteConstants.swift
new file mode 100644
index 000000000..4a081c0c2
--- /dev/null
+++ b/Simplenote/Classes/RemoteConstants.swift
@@ -0,0 +1,12 @@
+import Foundation
+
+// MARK: Remote Constants
+//
+struct RemoteConstants {
+    struct Method {
+        static let GET = "GET"
+        static let POST = "POST"
+    }
+
+    static let timeout: TimeInterval = 30
+}
diff --git a/Simplenote/Classes/SPAuthError.swift b/Simplenote/Classes/SPAuthError.swift
index 66c80ef8b..dbea55c53 100644
--- a/Simplenote/Classes/SPAuthError.swift
+++ b/Simplenote/Classes/SPAuthError.swift
@@ -1,6 +1,4 @@
 import Foundation
-import SimplenoteEndpoints
-
 
 // MARK: - SPAuthError
 //
@@ -13,38 +11,17 @@ enum SPAuthError: Error {
     case unverifiedEmail
     case tooManyAttempts
     case generic
-    case requestNotFound
-    case invalidCode
     case unknown(statusCode: Int, response: String?, error: Error?)
 }
 
-
 // MARK: - SPAuthError Convenience Initializers
 //
 extension SPAuthError {
 
-    /// Returns an AuthError matching a RemoteError (Login) Counterpart
-    ///
-    init(loginRemoteError: RemoteError) {
-        self = SPAuthError(loginErrorCode: loginRemoteError.statusCode, response: loginRemoteError.response, error: loginRemoteError.networkError)
-    }
-
-    /// Returns an AuthError matching a RemoteError (Signup) Counterpart
-    ///
-    init(signupRemoteError: RemoteError) {
-        self = SPAuthError(signupErrorCode: signupRemoteError.statusCode, response: signupRemoteError.response, error: signupRemoteError.networkError)
-    }
-
-    /// Returns the AuthError matching a given Simperium Login Error Code
+    /// Returns the SPAuthError matching a given Simperium Login Error Code
     ///
     init(loginErrorCode: Int, response: String?, error: Error?) {
         switch loginErrorCode {
-        case .zero:
-            self = .network
-        case 400 where response == Constants.requestNotFound:
-            self = .requestNotFound
-        case 400 where response == Constants.invalidCode:
-            self = .invalidCode
         case 401 where response == Constants.compromisedPassword:
             self = .compromisedPassword
         case 401:
@@ -58,12 +35,10 @@ extension SPAuthError {
         }
     }
 
-    /// Returns the AuthError matching a given a Signup Error Code
+    /// Returns the SPAuthError matching a given Simperium Signup Error Code
     ///
     init(signupErrorCode: Int, response: String?, error: Error?) {
         switch signupErrorCode {
-        case .zero:
-            self = .network
         case 401:
             self = .signupBadCredentials
         case 409:
@@ -76,7 +51,6 @@ extension SPAuthError {
     }
 }
 
-
 // MARK: - SPAuthError Public Methods
 //
 extension SPAuthError {
@@ -116,10 +90,6 @@ extension SPAuthError {
             return NSLocalizedString("You must verify your email before being able to login.", comment: "Error for un verified email")
         case .tooManyAttempts:
             return NSLocalizedString("Too many login attempts. Try again later.", comment: "Error message for too many login attempts")
-        case .requestNotFound:
-            return NSLocalizedString("Your authentication code has expired. Please request a new one", comment: "Error message for Invalid Login Code")
-        case .invalidCode:
-            return NSLocalizedString("The code you've entered is not correct. Please try again", comment: "Error message for Invalid Login Code")
         default:
             return NSLocalizedString("We're having problems. Please try again soon.", comment: "Generic error")
         }
@@ -129,6 +99,4 @@ extension SPAuthError {
 private struct Constants {
     static let compromisedPassword = "compromised password"
     static let requiresVerification = "verification required"
-    static let requestNotFound = "request-not-found"
-    static let invalidCode = "invalid-code"
 }
diff --git a/Simplenote/Classes/SPAuthHandler.swift b/Simplenote/Classes/SPAuthHandler.swift
index 5d0fcdd9c..899b30b54 100644
--- a/Simplenote/Classes/SPAuthHandler.swift
+++ b/Simplenote/Classes/SPAuthHandler.swift
@@ -1,6 +1,5 @@
 import Foundation
 import SafariServices
-import SimplenoteEndpoints
 
 // MARK: - SPAuthHandler
 //
@@ -56,13 +55,15 @@ class SPAuthHandler {
 
     /// Requests an Authentication Email
     ///
-    @MainActor
-    func requestLoginEmail(username: String) async throws {
+    func requestLoginEmail(username: String, onCompletion: @escaping (SPAuthError?) -> Void) {
         let remote = LoginRemote()
-        do {
-            try await remote.requestLoginEmail(email: username)
-        } catch let remoteError as RemoteError {
-            throw SPAuthError(loginRemoteError: remoteError)
+        remote.requestLoginEmail(email: username) { (result) in
+            switch result {
+            case .success:
+                onCompletion(nil)
+            case .failure(let error):
+                onCompletion(self.authenticationError(for: error))
+            }
         }
     }
 
@@ -75,8 +76,8 @@ class SPAuthHandler {
             let confirmation = try await remote.requestLoginConfirmation(email: username, authCode: code.uppercased())
             simperiumService.authenticate(withUsername: confirmation.username, token: confirmation.syncToken)
             
-        } catch let remoteError as RemoteError {
-            throw SPAuthError(loginRemoteError: remoteError)
+        } catch let error as RemoteError {
+            throw authenticationError(for: error)
         }
     }
 
@@ -89,17 +90,27 @@ class SPAuthHandler {
     ///     - onCompletion: Closure to be executed on completion
     ///
     func signupWithCredentials(username: String, onCompletion: @escaping (SPAuthError?) -> Void) {
-        SignupRemote().requestSignup(email: username) { (result) in
+        SignupRemote().signup(with: username) { (result) in
             switch result {
             case .success:
                 onCompletion(nil)
-            case .failure(let remoteError):
-                let error = SPAuthError(signupRemoteError: remoteError)
-                onCompletion(error)
+            case .failure(let error):
+                onCompletion(self.authenticationError(for: error))
             }
         }
     }
 
+    private func authenticationError(for remoteError: RemoteError) -> SPAuthError {
+        switch remoteError {
+        case .network:
+            return .network
+        case .tooManyAttempts:
+            return .tooManyAttempts
+        case .requestError(let statusCode, let error):
+            return SPAuthError(signupErrorCode: statusCode, response: error?.localizedDescription, error: error)
+        }
+    }
+
     /// Presents the Password Reset (Web) Interface
     ///
     func presentPasswordReset(from sourceViewController: UIViewController, username: String) {
diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index e3a323041..c3f50f191 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -2,8 +2,6 @@ import Foundation
 import UIKit
 import SafariServices
 import SwiftUI
-import SimplenoteEndpoints
-
 
 // MARK: - SPAuthViewController
 //
@@ -435,52 +433,24 @@ extension SPAuthViewController {
         guard ensureWarningsAreOnScreenWhenNeeded() else {
             return
         }
-
-        Task { @MainActor in
-            await requestLogInCodeAsync()
-        }
-    }
-    
-    @MainActor
-    private func requestLogInCodeAsync() async {
-        lockdownInterface()
-
-        do {
-            try await controller.requestLoginEmail(username: email)
-            self.presentCodeInterface()
-            SPTracker.trackLoginLinkRequested()
-            
-        } catch SPAuthError.tooManyAttempts {
-            self.presentPasswordInterfaceWithRateLimitingHeader()
-
-        } catch {
-            let error = error as? SPAuthError ?? .generic
-            self.handleError(error: error)
-        }
         
-        self.unlockInterface()
-    }
+        lockdownInterface()
 
-    /// Requests a new Login Code, without pushing any secondary UI on success
-    ///
-    @IBAction func requestLogInCodeAndDontPush() {
-        Task { @MainActor in
-            await self.requestLogInCodeAndDontPushAsync()
-        }
-    }
+        controller.requestLoginEmail(username: email) { error in
+            switch error {
+            case .none:
+                self.presentCodeInterface()
+                SPTracker.trackLoginLinkRequested()
+                
+            case .tooManyAttempts:
+                self.presentPasswordInterfaceWithRateLimitingHeader()
+                
+            case .some(let error):
+                self.handleError(error: error)
+            }
 
-    /// Requests a new Login Code, without pushing any secondary UI on success. Asynchronous API!
-    ///
-    @MainActor
-    private func requestLogInCodeAndDontPushAsync() async {
-        do {
-            try await controller.requestLoginEmail(username: email)
-        } catch {
-            let error = error as? SPAuthError ?? .generic
-            self.handleError(error: error)
+            self.unlockInterface()
         }
-        
-        SPTracker.trackLoginLinkRequested()
     }
     
     @IBAction func performLogInWithCode() {
@@ -547,7 +517,7 @@ extension SPAuthViewController {
     }
     
     @IBAction func presentPasswordInterface() {
-        presentPasswordInterfaceWithHeader(header: AuthenticationStrings.loginWithEmailEmailHeader)
+        presentPasswordInterfaceWithHeader(header: nil)
     }
     
     @IBAction func presentPasswordInterfaceWithRateLimitingHeader() {
@@ -643,8 +613,6 @@ private extension SPAuthViewController {
             presentPasswordCompromisedError(error: error)
         case .unverifiedEmail:
             presentUserUnverifiedError(error: error, email: email)
-        case .requestNotFound:
-            presentLoginCodeExpiredError()
         case .unknown(let statusCode, let response, let error) where debugEnabled:
             let details = NSAttributedString.stringFromNetworkError(statusCode: statusCode, response: response, error: error)
             presentDebugDetails(details: details)
@@ -672,14 +640,6 @@ private extension SPAuthViewController {
 
         present(alertController, animated: true, completion: nil)
     }
-    
-    func presentLoginCodeExpiredError() {
-        let alertController = UIAlertController.buildLoginCodeNotFoundAlert {
-            self.navigationController?.popViewController(animated: true)
-        }
-        
-        present(alertController, animated: true, completion: nil)
-    }
 
     func presentUserUnverifiedError(error: SPAuthError, email: String) {
         let alertController = UIAlertController(title: error.title, message: error.message, preferredStyle: .alert)
@@ -894,7 +854,6 @@ private enum AuthenticationStrings {
     static let acceptActionText             = NSLocalizedString("Accept", comment: "Accept Action")
     static let cancelActionText             = NSLocalizedString("Cancel", comment: "Cancel Action")
     static let loginActionText              = NSLocalizedString("Log In", comment: "Log In Action")
-    static let loginWithEmailEmailHeader    = NSLocalizedString("Enter the password for the account {{EMAIL}}", comment: "Header for Login With Password. Please preserve the {{EMAIL}} substring")
     static let loginWithEmailLimitHeader    = NSLocalizedString("Log in with email failed, please enter your password", comment: "Header for Enter Password UI, when the user performed too many requests")
     static let compromisedAlertCancel       = NSLocalizedString("Cancel", comment: "Cancel action for password alert")
     static let compromisedAlertReset        = NSLocalizedString("Change Password", comment: "Change password action")
diff --git a/Simplenote/Classes/SPSettingsViewController+Extensions.swift b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
index 7c0bb73a9..fb9bcead3 100644
--- a/Simplenote/Classes/SPSettingsViewController+Extensions.swift
+++ b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
@@ -1,6 +1,4 @@
 import UIKit
-import SimplenoteEndpoints
-
 
 // MARK: - Subscriber UI
 //
@@ -190,7 +188,12 @@ extension SPSettingsViewController {
     }
 
     private func handleError(_ error: RemoteError) {
-        presentRequestErrorAlert()
+        switch error {
+        case .network:
+            NoticeController.shared.present(NoticeFactory.networkError())
+        default:
+            presentRequestErrorAlert()
+        }
     }
 
     private func presentSuccessAlert(for user: SPUser) {
diff --git a/Simplenote/Classes/SignupRemote.swift b/Simplenote/Classes/SignupRemote.swift
new file mode 100644
index 000000000..8a947250a
--- /dev/null
+++ b/Simplenote/Classes/SignupRemote.swift
@@ -0,0 +1,24 @@
+import Foundation
+
+// MARK: - SignupRemote
+//
+class SignupRemote: Remote {
+    func signup(with email: String, completion: @escaping (_ result: Result<Data?, RemoteError>) -> Void) {
+        let urlRequest = request(with: email)
+
+        performDataTask(with: urlRequest, completion: completion)
+    }
+
+    private func request(with email: String) -> URLRequest {
+        let url = URL(string: SimplenoteConstants.signupURL)!
+
+        var request = URLRequest(url: url,
+                                 cachePolicy: .reloadIgnoringLocalAndRemoteCacheData,
+                                 timeoutInterval: RemoteConstants.timeout)
+        request.httpMethod = RemoteConstants.Method.POST
+        request.setValue("application/json", forHTTPHeaderField: "Content-Type")
+        request.httpBody = try? JSONEncoder().encode(["username": email.lowercased()])
+
+        return request
+    }
+}
diff --git a/Simplenote/Controllers/AccountDeletionController.swift b/Simplenote/Controllers/AccountDeletionController.swift
index ac248de09..c5251a05d 100644
--- a/Simplenote/Controllers/AccountDeletionController.swift
+++ b/Simplenote/Controllers/AccountDeletionController.swift
@@ -1,5 +1,4 @@
 import Foundation
-import SimplenoteEndpoints
 
 @objc
 class AccountDeletionController: NSObject {
diff --git a/Simplenote/LoginRemote.swift b/Simplenote/LoginRemote.swift
new file mode 100644
index 000000000..b69fce3f6
--- /dev/null
+++ b/Simplenote/LoginRemote.swift
@@ -0,0 +1,46 @@
+import Foundation
+
+// MARK: - LoginRemote
+//
+class LoginRemote: Remote {
+
+    func requestLoginEmail(email: String, completion: @escaping (_ result: Result<Data?, RemoteError>) -> Void) {
+        let request = requestForLoginRequest(email: email)
+        performDataTask(with: request, completion: completion)
+    }
+
+    func requestLoginConfirmation(email: String, authCode: String) async throws -> LoginConfirmationResponse {
+        let request = requestForLoginCompletion(email: email, authCode: authCode)
+        return try await performDataTask(with: request, type: LoginConfirmationResponse.self)
+    }
+}
+
+
+// MARK: - LoginConfirmationResponse
+//
+struct LoginConfirmationResponse: Decodable {
+    let username: String
+    let syncToken: String
+}
+
+
+// MARK: - Private API(s)
+//
+private extension LoginRemote {
+
+    func requestForLoginRequest(email: String) -> URLRequest {
+        let url = URL(string: SimplenoteConstants.loginRequestURL)!
+        return requestForURL(url, method: RemoteConstants.Method.POST, httpBody: [
+            "request_source": SimplenoteConstants.simplenotePlatformName,
+            "username": email.lowercased()
+        ])
+    }
+
+    func requestForLoginCompletion(email: String, authCode: String) -> URLRequest {
+        let url = URL(string: SimplenoteConstants.loginCompletionURL)!
+        return requestForURL(url, method: RemoteConstants.Method.POST, httpBody: [
+            "auth_code": authCode,
+            "username": email
+        ])
+    }
+}
diff --git a/Simplenote/Remote.swift b/Simplenote/Remote.swift
new file mode 100644
index 000000000..5c32883ea
--- /dev/null
+++ b/Simplenote/Remote.swift
@@ -0,0 +1,73 @@
+import Foundation
+
+class Remote {
+    private let urlSession: URLSession
+
+    init(urlSession: URLSession = URLSession.shared) {
+        self.urlSession = urlSession
+    }
+
+    /// Send  task for remote
+    /// Sublcassing Notes: To be able to send a task it is required to first setup the URL request for the task to use
+    ///
+    func performDataTask(with request: URLRequest, completion: @escaping (_ result: Result<Data?, RemoteError>) -> Void) {
+        let dataTask = urlSession.dataTask(with: request) { (data, response, dataTaskError) in
+            DispatchQueue.main.async {
+                
+                if let error = RemoteError(statusCode: response?.responseStatusCode ?? .zero, error: dataTaskError) {
+                    completion(.failure(error))
+                    return
+                }
+
+                completion(.success(data))
+            }
+        }
+
+        dataTask.resume()
+    }
+
+    /// Performs a URLSession Data Task
+    ///
+    func performDataTask(with request: URLRequest) async throws -> Data {
+        let (data, response) = try await urlSession.data(for: request)
+
+        if let error = RemoteError(statusCode: response.responseStatusCode) {
+            throw error
+        }
+        
+        return data
+    }
+    
+    /// Performs a URLSession Data Task, and decodes a given Type
+    ///
+    func performDataTask<T: Decodable>(with request: URLRequest, type: T.Type) async throws -> T {
+        let data = try await performDataTask(with: request)
+
+        let decoder = JSONDecoder()
+        decoder.keyDecodingStrategy = .convertFromSnakeCase
+        return try decoder.decode(type, from: data)
+    }
+    
+    /// Builds a URLRequest for the specified URL / Method / params
+    ///
+    func requestForURL(_ url: URL, method: String, httpBody: [String: String]?) -> URLRequest {
+        var request = URLRequest(url: url, cachePolicy: .reloadIgnoringLocalAndRemoteCacheData, timeoutInterval: RemoteConstants.timeout)
+
+        request.httpMethod = method
+        request.setValue("application/json", forHTTPHeaderField: "Content-Type")
+        
+        if let httpBody {
+            request.httpBody = try? JSONEncoder().encode(httpBody)
+        }
+
+        return request
+    }
+}
+
+
+extension URLResponse {
+    
+    var responseStatusCode: Int {
+        (self as? HTTPURLResponse)?.statusCode ?? .zero
+    }
+}
diff --git a/Simplenote/RemoteError.swift b/Simplenote/RemoteError.swift
new file mode 100644
index 000000000..4366d98e1
--- /dev/null
+++ b/Simplenote/RemoteError.swift
@@ -0,0 +1,38 @@
+import Foundation
+
+enum RemoteError: Error {
+    case network
+    case tooManyAttempts
+    case requestError(Int, Error?)
+}
+
+
+extension RemoteError {
+    
+    init?(statusCode: Int, error: Error? = nil) {
+        if statusCode / 100 == 2 {
+            return nil
+        }
+        
+        switch statusCode {
+        case 429:
+            self = .tooManyAttempts
+        default:
+            self = statusCode > 0 ? .requestError(statusCode, error) : .network
+        }
+    }
+}
+
+
+extension RemoteError: Equatable {
+    static func == (lhs: RemoteError, rhs: RemoteError) -> Bool {
+        switch (lhs, rhs) {
+        case (.network, .network):
+            return true
+        case (.requestError(let lhsStatus, let lhsError), .requestError(let rhsStatus, let rhsError)):
+            return lhsStatus == rhsStatus && lhsError?.localizedDescription == rhsError?.localizedDescription
+        default:
+            return false
+        }
+    }
+}
diff --git a/Simplenote/SPUser+UserProtocol.swift b/Simplenote/SPUser+UserProtocol.swift
deleted file mode 100644
index b555a4e96..000000000
--- a/Simplenote/SPUser+UserProtocol.swift
+++ /dev/null
@@ -1,8 +0,0 @@
-import Foundation
-import SimplenoteEndpoints
-import Simperium
-
-
-// MARK: - Simperium's SPUser Conformance
-//
-extension SPUser: UserProtocol { }
diff --git a/Simplenote/UIAlertController+Auth.swift b/Simplenote/UIAlertController+Auth.swift
deleted file mode 100644
index 73702271f..000000000
--- a/Simplenote/UIAlertController+Auth.swift
+++ /dev/null
@@ -1,22 +0,0 @@
-import Foundation
-
-
-// MARK: - UIAlertController Helpers
-//
-extension UIAlertController {
-    
-    /// Builds an alert indicating that the Login Code has Expired
-    ///
-    static func buildLoginCodeNotFoundAlert(onRequestCode: @escaping () -> Void) -> UIAlertController {
-        let title = NSLocalizedString("Sorry!", comment: "Email TextField Placeholder")
-        let message = NSLocalizedString("The authentication code you've requested has expired. Please request a new one", comment: "Email TextField Placeholder")
-        let acceptText = NSLocalizedString("Accept", comment: "Accept Message")
-
-        let alertController = UIAlertController(title: title, message: message, preferredStyle: .alert)
-        alertController.addDefaultActionWithTitle(acceptText) { _ in
-            onRequestCode()
-        }
-        
-        return alertController
-    }
-}
diff --git a/Simplenote/URLRequest+Simplenote.swift b/Simplenote/URLRequest+Simplenote.swift
new file mode 100644
index 000000000..5adddd4cf
--- /dev/null
+++ b/Simplenote/URLRequest+Simplenote.swift
@@ -0,0 +1,13 @@
+import Foundation
+
+extension URLRequest {
+    func decodeHtmlBody<T: Decodable>() throws -> T? {
+          guard let _ = httpBody else {
+              return nil
+          }
+
+          return try httpBody.map {
+            try JSONDecoder().decode(T.self, from: $0)
+          }
+      }
+}
diff --git a/Simplenote/Verification/AccountVerificationController.swift b/Simplenote/Verification/AccountVerificationController.swift
index 3f11cc042..4bab434a6 100644
--- a/Simplenote/Verification/AccountVerificationController.swift
+++ b/Simplenote/Verification/AccountVerificationController.swift
@@ -1,5 +1,4 @@
 import Foundation
-import SimplenoteEndpoints
 
 // MARK: - AccountVerificationController
 //
diff --git a/SimplenoteTests/Network/MockURLSession.swift b/SimplenoteTests/Network/MockURLSession.swift
new file mode 100644
index 000000000..70b5042d2
--- /dev/null
+++ b/SimplenoteTests/Network/MockURLSession.swift
@@ -0,0 +1,15 @@
+import Foundation
+
+// MARK: - MockURLSession
+//
+class MockURLSession: URLSession {
+    var data: (Data?, URLResponse?, Error?)?
+    var lastRequest: URLRequest?
+
+    override func dataTask(with request: URLRequest, completionHandler: @escaping (Data?, URLResponse?, Error?) -> Void) -> URLSessionDataTask {
+        lastRequest = request
+        return MockURLSessionDataTask {
+            completionHandler(self.data?.0, self.data?.1, self.data?.2)
+        }
+    }
+}
diff --git a/SimplenoteTests/Network/MockURLSessionDataTask.swift b/SimplenoteTests/Network/MockURLSessionDataTask.swift
new file mode 100644
index 000000000..32a97ea9a
--- /dev/null
+++ b/SimplenoteTests/Network/MockURLSessionDataTask.swift
@@ -0,0 +1,15 @@
+import Foundation
+
+// MARK: - MockURLSessionDataTask
+//
+class MockURLSessionDataTask: URLSessionDataTask {
+    private let completion: () -> Void
+
+    init(completion: @escaping () -> Void) {
+        self.completion = completion
+    }
+
+    override func resume() {
+        completion()
+    }
+}
diff --git a/SimplenoteTests/RemoteResult+TestHelpers.swift b/SimplenoteTests/RemoteResult+TestHelpers.swift
index ba37ff02f..585b9ae16 100644
--- a/SimplenoteTests/RemoteResult+TestHelpers.swift
+++ b/SimplenoteTests/RemoteResult+TestHelpers.swift
@@ -1,5 +1,4 @@
 import Foundation
-import SimplenoteEndpoints
 @testable import Simplenote
 
 extension Remote {
@@ -8,6 +7,6 @@ extension Remote {
             return .success(nil)
         }
 
-        return .failure(RemoteError(statusCode: 0, response: nil, networkError: nil))
+        return .failure(RemoteError.requestError(0, nil))
     }
 }
diff --git a/SimplenoteTests/SignupRemoteTests.swift b/SimplenoteTests/SignupRemoteTests.swift
new file mode 100644
index 000000000..239dbb818
--- /dev/null
+++ b/SimplenoteTests/SignupRemoteTests.swift
@@ -0,0 +1,75 @@
+import XCTest
+@testable import Simplenote
+
+class SignupRemoteTests: XCTestCase {
+    private lazy var urlSession = MockURLSession()
+    private lazy var signupRemote = SignupRemote(urlSession: urlSession)
+
+    func testSuccessWhenStatusCodeIs2xx() {
+        for _ in 0..<5 {
+            test(withStatusCode: Int.random(in: 200..<300), email: "email@gmail.com", expectedResult: .success(nil))
+        }
+    }
+
+    func testFailureWhenStatusCodeIs4xxOr5xx() {
+        for _ in 0..<5 {
+            let statusCode = Int.random(in: 400..<600)
+            test(withStatusCode: statusCode, email: "email@gmail.com", expectedResult: .failure(RemoteError.requestError(statusCode, nil)))
+        }
+    }
+
+    func testRequestSetsEmailToCorrectCase() throws {
+        signupRemote.signup(with: "EMAIL@gmail.com", completion: { _ in })
+
+        let expecation = "email@gmail.com"
+        let body: Dictionary<String, String> = try XCTUnwrap(urlSession.lastRequest?.decodeHtmlBody())
+        let decodedEmail = try XCTUnwrap(body["username"])
+
+        XCTAssertEqual(expecation, decodedEmail)
+    }
+
+    func testRequestSetsEmailToCorrectCaseWithSpecialCharacters() throws {
+        signupRemote.signup(with: "EMAIL123456@#$%^@gmail.com", completion: { _ in })
+
+        let expecation = "email123456@#$%^@gmail.com"
+        let body: Dictionary<String, String> = try XCTUnwrap(urlSession.lastRequest?.decodeHtmlBody())
+        let decodedEmail = try XCTUnwrap(body["username"])
+
+        XCTAssertEqual(expecation, decodedEmail)
+    }
+
+    func testRequestSetsEmailToCorrectCaseWithMixedCase() throws {
+        signupRemote.signup(with: "eMaIl@gmail.com", completion: { _ in })
+
+        let expecation = "email@gmail.com"
+        let body: Dictionary<String, String> = try XCTUnwrap(urlSession.lastRequest?.decodeHtmlBody())
+        let decodedEmail = try XCTUnwrap(body["username"])
+
+        XCTAssertEqual(expecation, decodedEmail)
+    }
+
+    private func test(withStatusCode statusCode: Int?, email: String, expectedResult: Result<Data?, RemoteError>) {
+        urlSession.data = (nil,
+                           response(with: statusCode),
+                           nil)
+
+        let expectation = self.expectation(description: "Verify is called")
+
+        signupRemote.signup(with: email) { (result) in
+            XCTAssertEqual(result, expectedResult)
+            expectation.fulfill()
+        }
+
+        waitForExpectations(timeout: Constants.expectationTimeout, handler: nil)
+    }
+
+    private func response(with statusCode: Int?) -> HTTPURLResponse? {
+        guard let statusCode = statusCode else {
+            return nil
+        }
+        return HTTPURLResponse(url: URL(fileURLWithPath: "/"),
+                               statusCode: statusCode,
+                               httpVersion: nil,
+                               headerFields: nil)
+    }
+}
diff --git a/SimplenoteTests/Verification/AccountVerificationControllerTests.swift b/SimplenoteTests/Verification/AccountVerificationControllerTests.swift
index fe5b29921..39790a9ef 100644
--- a/SimplenoteTests/Verification/AccountVerificationControllerTests.swift
+++ b/SimplenoteTests/Verification/AccountVerificationControllerTests.swift
@@ -1,5 +1,4 @@
 import XCTest
-import SimplenoteEndpoints
 @testable import Simplenote
 
 // MARK: - AccountVerificationControllerTests
diff --git a/SimplenoteTests/Verification/AccountVerificationRemoteTests.swift b/SimplenoteTests/Verification/AccountVerificationRemoteTests.swift
new file mode 100644
index 000000000..6443b0d14
--- /dev/null
+++ b/SimplenoteTests/Verification/AccountVerificationRemoteTests.swift
@@ -0,0 +1,51 @@
+import XCTest
+@testable import Simplenote
+
+// MARK: - AccountVerificationRemoteTests
+//
+class AccountVerificationRemoteTests: XCTestCase {
+    private lazy var urlSession = MockURLSession()
+    private lazy var remote = AccountRemote(urlSession: urlSession)
+
+    func testSuccessWhenStatusCodeIs2xx() {
+        for _ in 0..<5 {
+            test(withStatusCode: Int.random(in: 200..<300), expectedResult: .success(nil))
+        }
+    }
+
+    func testFailureWhenStatusCodeIs4xxOr5xx() {
+        for _ in 0..<5 {
+            let statusCode = Int.random(in: 400..<600)
+            test(withStatusCode: statusCode, expectedResult: .failure(RemoteError.requestError(statusCode, nil)))
+        }
+    }
+
+    func testFailureWhenNoResponse() {
+        test(withStatusCode: nil, expectedResult: .failure(RemoteError.network))
+    }
+
+    private func test(withStatusCode statusCode: Int?, expectedResult: Result<Data?, RemoteError>) {
+        urlSession.data = (nil,
+                           response(with: statusCode),
+                           nil)
+
+        let expectation = self.expectation(description: "Verify is called")
+
+        remote.verify(email: UUID().uuidString) { (result) in
+            XCTAssertEqual(result, expectedResult)
+            expectation.fulfill()
+        }
+
+        waitForExpectations(timeout: 3, handler: nil)
+    }
+
+    private func response(with statusCode: Int?) -> HTTPURLResponse? {
+        guard let statusCode = statusCode else {
+            return nil
+        }
+        return HTTPURLResponse(url: URL(fileURLWithPath: "/"),
+                               statusCode: statusCode,
+                               httpVersion: nil,
+                               headerFields: nil)
+    }
+}
diff --git a/SimplenoteTests/Verification/Helpers/MockAccountVerificationRemote.swift b/SimplenoteTests/Verification/Helpers/MockAccountVerificationRemote.swift
index d4add1b4e..f09f4f411 100644
--- a/SimplenoteTests/Verification/Helpers/MockAccountVerificationRemote.swift
+++ b/SimplenoteTests/Verification/Helpers/MockAccountVerificationRemote.swift
@@ -1,5 +1,4 @@
 import XCTest
-@testable import SimplenoteEndpoints
 @testable import Simplenote
 
 class MockAccountVerificationRemote: AccountRemote {
diff --git a/config/Project.Release.xcconfig b/config/Project.Release.xcconfig
deleted file mode 100644
index 7b29190ff..000000000
--- a/config/Project.Release.xcconfig
+++ /dev/null
@@ -1 +0,0 @@
-DEVELOPMENT_TEAM = PZYM8XX95Q
diff --git a/config/Simplenote.release.xcconfig b/config/Simplenote.release.xcconfig
index 26a784bda..f77a796b2 100644
--- a/config/Simplenote.release.xcconfig
+++ b/config/Simplenote.release.xcconfig
@@ -1,6 +1,3 @@
 #include "Version.public.xcconfig"
-#include "Project.Release.xcconfig"
 
 DISPLAY_NAME=Simplenote
-
-PROVISIONING_PROFILE_SPECIFIER = match AppStore $(PRODUCT_BUNDLE_IDENTIFIER)
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index ad49c227d..2bca74ae3 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -8,21 +8,29 @@ fastlane_require 'buildkit'
 
 UI.user_error!('Please run fastlane via `bundle exec`') unless FastlaneCore::Helper.bundler?
 
+USER_ENV_FILE_PATH = File.join(Dir.home, '.simplenoteios-env.default')
+PROJECT_ENV_FILE_PATH = File.join(
+  Dir.home, '.configure', 'simplenote-ios', 'secrets', 'project.env'
+)
 SECRETS_ROOT = File.join(Dir.home, '.configure', 'simplenote-ios', 'secrets')
 APP_STORE_CONNECT_KEY_PATH = File.join(SECRETS_ROOT, 'app_store_connect_fastlane_api_key.json')
 $used_test_account_index = nil
 
-require_relative 'lib/env_manager'
-
-import 'lanes/localization.rb'
-import 'lanes/release.rb'
-import 'lanes/build.rb'
-
 before_all do
   # Ensure we use the latest version of the toolkit
   check_for_toolkit_updates unless is_ci || ENV['FASTLANE_SKIP_TOOLKIT_UPDATE_CHECK']
 
-  EnvManager.set_up(env_file_name: 'simplenote-ios')
+  # Check that the env files exist
+  unless is_ci || File.file?(USER_ENV_FILE_PATH)
+    error_message = <<~ERROR
+      ~/.simplenoteios-env.default not found. Please copy env/user.env-example to #{USER_ENV_FILE_PATH} and fill in the values") using the following command:
+
+      \tcp #{PROJECT_ROOT_FOLDER}/fastlane/env/user.env-example #{USER_ENV_FILE_PATH}
+    ERROR
+    UI.user_error!(error_message)
+  end
+
+  UI.user_error!('project.env not found: Make sure your configuration is up to date with `rake dependencies`') unless File.file?(PROJECT_ENV_FILE_PATH)
 
   setup_ci
 end
@@ -35,23 +43,42 @@ end
 PROJECT_ROOT_FOLDER = File.dirname(File.expand_path(__dir__))
 VERSION_FILE_PATH = File.join(PROJECT_ROOT_FOLDER, 'config', 'Version.Public.xcconfig')
 OUTPUT_DIRECTORY_PATH = File.join(PROJECT_ROOT_FOLDER, 'build', 'results')
+GITHUB_REPO = 'Automattic/simplenote-ios'
 APP_STORE_BUNDLE_IDENTIFIER = 'com.codality.NotationalFlow'
 DEFAULT_BRANCH = 'trunk'
 
-TEAM_ID_APP_STORE_CONNECT = 'PZYM8XX95Q'
-TEAM_ID_ENTERPRISE = '99KV9Z6BKV'
-
-ORGANIZATION = 'automattic'
-PROJECT_SLUG = 'simplenote-ios'
-GITHUB_REPO = "#{ORGANIZATION}/#{PROJECT_SLUG}".freeze
-BUILDKITE_ORGANIZATION = ORGANIZATION
-BUILDKITE_PIPELINE = PROJECT_SLUG
-
-WORKSPACE = 'Simplenote.xcworkspace'
+# List of locales used for the app strings (GlotPress code => `*.lproj` folder name`)
+#
+# TODO: Replace with `LocaleHelper` once provided by release toolkit (https://github.com/wordpress-mobile/release-toolkit/pull/296)
+GLOTPRESS_TO_LPROJ_APP_LOCALE_CODES = {
+  'ar' => 'ar',             # Arabic
+  'cy' => 'cy',             # Welsh
+  'de' => 'de',             # German
+  'el' => 'el',             # Greek
+  'en' => 'en',             # English
+  'es' => 'es',             # Spanish
+  'fa' => 'fa',             # Persian
+  'fr' => 'fr',             # French
+  'he' => 'he',             # Hebrew
+  'id' => 'id',             # Indonesian
+  'it' => 'it',             # Italian
+  'ja' => 'ja',             # Japanese
+  'ko' => 'ko',             # Korean
+  'nl' => 'nl',             # Dutch
+  'pt-br' => 'pt-BR',       # Portuguese (Brazil)
+  'ru' => 'ru',             # Russian
+  'sv' => 'sv',             # Swedish
+  'tr' => 'tr',             # Turkish
+  'zh-cn' => 'zh-Hans-CN',  # Chinese (China)
+  'zh-tw' => 'zh-Hant-TW'   # Chinese (Taiwan)
+}.freeze
 
 ########################################################################
 # Environment
 ########################################################################
+Dotenv.load(USER_ENV_FILE_PATH)
+Dotenv.load(PROJECT_ENV_FILE_PATH)
+
 ENV['PROJECT_NAME'] = 'Simplenote'
 ENV['PROJECT_ROOT_FOLDER'] = PROJECT_ROOT_FOLDER
 ENV['APP_STORE_STRINGS_FILE_NAME'] = 'AppStoreStrings.pot'
@@ -59,12 +86,65 @@ ENV['PUBLIC_CONFIG_FILE'] = VERSION_FILE_PATH
 ENV['DOWNLOAD_METADATA'] = './fastlane/download_metadata.swift'
 ENV['FL_RELEASE_TOOLKIT_DEFAULT_BRANCH'] = 'trunk'
 
-VERSION_CALCULATOR = Fastlane::Wpmreleasetoolkit::Versioning::SemanticVersionCalculator.new
-VERSION_FORMATTER = Fastlane::Wpmreleasetoolkit::Versioning::FourPartVersionFormatter.new
-BUILD_CODE_FORMATTER = Fastlane::Wpmreleasetoolkit::Versioning::FourPartBuildCodeFormatter.new
-PUBLIC_VERSION_FILE = Fastlane::Wpmreleasetoolkit::Versioning::IOSVersionFile.new(xcconfig_path: VERSION_FILE_PATH)
+# Use this instead of getting values from ENV directly
+# It will throw an error if the requested value is missing
+def get_required_env(key)
+  UI.user_error!("Environment variable '#{key}' is not set. Have you setup #{USER_ENV_FILE_PATH} correctly?") unless ENV.key?(key)
+  ENV.fetch(key)
+end
 
 platform :ios do
+  ########################################################################
+  # Release Lanes
+  ########################################################################
+  #####################################################################################
+  # code_freeze
+  # -----------------------------------------------------------------------------------
+  # This lane executes the steps planned on code freeze
+  # -----------------------------------------------------------------------------------
+  # Usage:
+  # bundle exec fastlane code_freeze [skip_confirm:<skip confirm>]
+  #
+  # Example:
+  # bundle exec fastlane code_freeze
+  # bundle exec fastlane code_freeze skip_confirm:true
+  #####################################################################################
+  desc 'Creates a new release branch from the current trunk'
+  lane :code_freeze do |options|
+    ios_codefreeze_prechecks(options)
+
+    ios_bump_version_release
+    new_version = ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
+
+    extract_release_notes_for_version(
+      version: new_version,
+      release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'RELEASE-NOTES.txt'),
+      extracted_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt')
+    )
+    ios_update_release_notes(new_version: new_version)
+
+    generate_strings_file_for_glotpress
+
+    UI.important('Pushing changes to remote, configuring the release on GitHub, and triggering the beta build')
+    unless options[:skip_confirm] || UI.confirm('Do you want to continue?')
+      UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.")
+    end
+
+    push_to_git_remote(tags: false)
+
+    copy_branch_protection(
+      repository: GITHUB_REPO,
+      from_branch: DEFAULT_BRANCH,
+      to_branch: "release/#{new_version}"
+    )
+    setfrozentag(
+      repository: GITHUB_REPO,
+      milestone: new_version
+    )
+
+    trigger_beta_build(branch_to_build: "release/#{new_version}")
+  end
+
   #####################################################################################
   # update_appstore_strings
   # -----------------------------------------------------------------------------------
@@ -128,6 +208,35 @@ platform :ios do
     end
   end
 
+  #####################################################################################
+  # new_beta_release
+  # -----------------------------------------------------------------------------------
+  # This lane updates the release branch for a new beta release. It will update the
+  # current release branch by default. If you want to update a different branch
+  # (i.e. hotfix branch) pass the related version with the 'base_version' param
+  # (example: base_version:10.6.1 will work on the 10.6.1 branch)
+  # -----------------------------------------------------------------------------------
+  # Usage:
+  # bundle exec fastlane new_beta_release [skip_confirm:<skip confirm>] [base_version:<version>]
+  #
+  # Example:
+  # bundle exec fastlane new_beta_release
+  # bundle exec fastlane new_beta_release skip_confirm:true
+  # bundle exec fastlane new_beta_release base_version:10.6.1
+  #####################################################################################
+  desc 'Updates a release branch for a new beta release'
+  lane :new_beta_release do |options|
+    ios_betabuild_prechecks(options)
+    download_localized_strings_and_metadata_from_glotpress
+    ios_lint_localizations(
+      input_dir: 'Simplenote',
+      allow_retry: true
+    )
+    ios_bump_version_beta
+    version = ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
+    trigger_beta_build(branch_to_build: "release/#{version}")
+  end
+
   #####################################################################################
   # new_hotfix_release
   # -----------------------------------------------------------------------------------
@@ -216,7 +325,7 @@ platform :ios do
       repository: GITHUB_REPO,
       branch: "release/#{version}"
     )
-    set_milestone_frozen_marker(
+    setfrozentag(
       repository: GITHUB_REPO,
       milestone: version,
       freeze: false
@@ -344,11 +453,11 @@ platform :ios do
     gym(
       scheme: 'Simplenote',
       configuration: 'Distribution Internal',
-      workspace: WORKSPACE,
+      workspace: 'Simplenote.xcworkspace',
       export_method: 'enterprise',
       clean: true,
       output_directory: OUTPUT_DIRECTORY_PATH,
-      export_team_id: TEAM_ID_ENTERPRISE,
+      export_team_id: get_required_env('INT_EXPORT_TEAM_ID'),
       export_options: {
         method: 'enterprise',
         provisioningProfiles: simplenote_provisioning_profiles(
@@ -361,7 +470,7 @@ platform :ios do
     File.rename(File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote.ipa'), File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote Internal.ipa'))
 
     appcenter_upload(
-      api_token: EnvManager.get_required_env!('APPCENTER_API_TOKEN'),
+      api_token: get_required_env('APPCENTER_API_TOKEN'),
       owner_name: 'automattic',
       owner_type: 'organization',
       app_name: 'Simplenote',
@@ -370,13 +479,83 @@ platform :ios do
     )
 
     sentry_upload_dsym(
-      auth_token: EnvManager.get_required_env!('SENTRY_AUTH_TOKEN'),
+      auth_token: get_required_env('SENTRY_API_TOKEN'),
       org_slug: 'a8c',
       project_slug: 'simplenote-ios',
       dsym_path: lane_context[SharedValues::DSYM_OUTPUT_PATH]
     )
   end
 
+  #####################################################################################
+  # build_and_upload_to_app_store_connect
+  # -----------------------------------------------------------------------------------
+  # This lane builds the app and upload it for external distribution
+  # -----------------------------------------------------------------------------------
+  # Usage:
+  # bundle exec fastlane build_and_upload_to_app_store_connect [skip_confirm:<skip confirm>] [create_release:<Create release on GH>] [beta_release:<intermediate beta?>]
+  #
+  # Example:
+  # bundle exec fastlane build_and_upload_to_app_store_connect
+  # bundle exec fastlane build_and_upload_to_app_store_connect skip_confirm:true
+  #####################################################################################
+  desc 'Builds and uploads for distribution'
+  lane :build_and_upload_to_app_store_connect do |options|
+    unless options[:skip_prechecks]
+      ios_build_prechecks(
+        skip_confirm: options[:skip_confirm],
+        external: true
+      )
+      ios_build_preflight
+    end
+
+    appstore_code_signing
+
+    gym(
+      scheme: 'Simplenote',
+      workspace: 'Simplenote.xcworkspace',
+      configuration: 'Distribution AppStore',
+      clean: true,
+      export_options: {
+        method: 'app-store',
+        export_team_id: get_required_env('EXT_EXPORT_TEAM_ID'),
+        provisioningProfiles: simplenote_provisioning_profiles
+      }
+    )
+
+    testflight(
+      skip_waiting_for_build_processing: true,
+      api_key_path: APP_STORE_CONNECT_KEY_PATH
+    )
+
+    sh('rm ../Simplenote.ipa')
+    dsym_path = File.join(File.dirname(Dir.pwd), 'Simplenote.app.dSYM.zip')
+
+    sentry_upload_dsym(
+      dsym_path: dsym_path,
+      auth_token: get_required_env('SENTRY_AUTH_TOKEN'),
+      org_slug: 'a8c',
+      project_slug: 'simplenote-ios'
+    )
+
+    sh("rm #{dsym_path}")
+
+    if options[:create_release]
+      archive_zip_path = File.join(File.dirname(Dir.pwd), 'Simplenote.xarchive.zip')
+      zip(path: lane_context[SharedValues::XCODEBUILD_ARCHIVE], output_path: archive_zip_path)
+
+      version = options[:beta_release] ? ios_get_build_version : ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
+      create_release(
+        repository: GITHUB_REPO,
+        version: version,
+        release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt'),
+        release_assets: archive_zip_path.to_s,
+        prerelease: options[:beta_release]
+      )
+
+      sh("rm #{archive_zip_path}")
+    end
+  end
+
   # Upload the localized metadata (from `fastlane/metadata/`) to App Store Connect
   #
   # @option [Boolean] with_screenshots (default: false) If true, will also upload the latest screenshot files to ASC
@@ -402,6 +581,42 @@ platform :ios do
     )
   end
 
+  #####################################################################################
+  # trigger_beta_build
+  # -----------------------------------------------------------------------------------
+  # This lane triggers a beta build on CI
+  # -----------------------------------------------------------------------------------
+  # @option [String] branch_to_build The name of the branch we want the CI to build, e.g. `release/19.3`
+  #
+  # Usage:
+  # bundle exec fastlane trigger_beta_build [branch_to_build:<branch_name>]
+  #
+  #####################################################################################
+  lane :trigger_beta_build do |options|
+    trigger_buildkite_release_build(
+      branch: options[:branch_to_build],
+      beta: true
+    )
+  end
+
+  #####################################################################################
+  # trigger_release_build
+  # -----------------------------------------------------------------------------------
+  # This lane triggers a stable release build on CI
+  # -----------------------------------------------------------------------------------
+  # @option [String] branch_to_build The name of the branch we want the CI to build, e.g. `release/19.3`
+  #
+  # Usage:
+  # bundle exec fastlane trigger_release_build [branch_to_build:<branch_name>]
+  #
+  #####################################################################################
+  lane :trigger_release_build do |options|
+    trigger_buildkite_release_build(
+      branch: options[:branch_to_build],
+      beta: false
+    )
+  end
+
   #####################################################################################
   # build_and_upload_installable_build
   # -----------------------------------------------------------------------------------
@@ -424,11 +639,11 @@ platform :ios do
     gym(
       scheme: 'Simplenote',
       configuration: 'Distribution Alpha',
-      workspace: WORKSPACE,
+      workspace: 'Simplenote.xcworkspace',
       export_method: 'enterprise',
       clean: true,
       output_directory: OUTPUT_DIRECTORY_PATH,
-      export_team_id: TEAM_ID_ENTERPRISE,
+      export_team_id: get_required_env('INT_EXPORT_TEAM_ID'),
       export_options: {
         method: 'enterprise',
         provisioningProfiles: simplenote_provisioning_profiles(
@@ -441,7 +656,7 @@ platform :ios do
     File.rename(File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote.ipa'), File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote Alpha.ipa'))
 
     appcenter_upload(
-      api_token: EnvManager.get_required_env!('APPCENTER_API_TOKEN'),
+      api_token: get_required_env('APPCENTER_API_TOKEN'),
       owner_name: 'automattic',
       owner_type: 'organization',
       app_name: 'Simplenote-Installable-Builds',
@@ -451,7 +666,7 @@ platform :ios do
     )
 
     sentry_upload_dsym(
-      auth_token: EnvManager.get_required_env!('SENTRY_AUTH_TOKEN'),
+      auth_token: get_required_env('SENTRY_AUTH_TOKEN'),
       org_slug: 'a8c',
       project_slug: 'simplenote-ios',
       dsym_path: lane_context[SharedValues::DSYM_OUTPUT_PATH]
@@ -715,12 +930,61 @@ platform :ios do
     if is_ci
       sanitize_test_accounts
       find_free_test_account
-      run_ui_tests(options.merge({ test_account: EnvManager.get_required_env!('UI_TESTS_ACCOUNT_EMAIL').sub('X', $used_test_account_index.to_s) }))
+      run_ui_tests(options.merge({ test_account: get_required_env('UI_TESTS_ACCOUNT_EMAIL').sub('X', $used_test_account_index.to_s) }))
       deoccupy_test_account
     else
       UI.user_error!('This lane should be run only from CI')
     end
   end
+
+  desc 'Registers a Device in the developer console'
+  lane :register_new_device do |options|
+    device_name = UI.input('Device Name: ') if options[:device_name].nil?
+    device_id = UI.input('Device ID: ') if options[:device_id].nil?
+    # Currently, Simplenote has an odd setup with a dedicated app id for development builds
+    all_bundle_ids =
+      simplenote_app_identifiers +
+      simplenote_app_identifiers(root_bundle_id: "#{APP_STORE_BUNDLE_IDENTIFIER}.Development")
+
+    UI.message "Registering #{device_name} with ID #{device_id} and registering it with any provisioning profiles associated with these bundle identifiers:"
+    all_bundle_ids.each do |identifier|
+      UI.message "\t#{identifier}"
+    end
+
+    team_id = get_required_env('EXT_EXPORT_TEAM_ID')
+
+    # Register the user's device
+    register_device(
+      name: device_name,
+      udid: device_id,
+      team_id: team_id,
+      api_key_path: APP_STORE_CONNECT_KEY_PATH
+    )
+
+    # We're about to use `add_development_certificates_to_provisioning_profiles` and `add_all_devices_to_provisioning_profiles`.
+    # These actions use Developer Portal APIs that don't yet support authentication via API key (-.-').
+    # Let's preemptively ask for and set the email here to avoid being asked twice for it if not set.
+
+    require 'credentials_manager'
+
+    # If Fastlane cannot instantiate a user, it will ask the caller for the email.
+    # Once we have it, we can set it as `FASTLANE_USER` in the environment (which has lifecycle limited to this call) so that the next commands will already have access to it.
+    # Note that if the user is already available to `AccountManager`, setting it in the environment is redundant, but Fastlane
+    # doesn't provide a way to check it so we have to do it anyway.
+    ENV['FASTLANE_USER'] = CredentialsManager::AccountManager.new.user
+
+    # Add all development certificates to the provisioning profiles (just in case – this is an easy step to miss)
+    add_development_certificates_to_provisioning_profiles(
+      team_id: team_id,
+      app_identifier: all_bundle_ids
+    )
+
+    # Add all devices to the provisioning profiles
+    add_all_devices_to_provisioning_profiles(
+      team_id: team_id,
+      app_identifier: all_bundle_ids
+    )
+  end
 end
 
 ########################################################################
@@ -768,7 +1032,7 @@ end
 private_lane :appstore_code_signing do |options|
   update_code_signing(
     type: 'appstore',
-    team_id: TEAM_ID_APP_STORE_CONNECT,
+    team_id: get_required_env('EXT_EXPORT_TEAM_ID'),
     readonly: options.fetch(:readonly, true),
     app_identifiers: simplenote_app_identifiers,
     api_key_path: APP_STORE_CONNECT_KEY_PATH,
@@ -792,7 +1056,7 @@ def update_code_signing_enterprise(readonly:, app_identifiers:)
   update_code_signing(
     type: 'enterprise',
     # Enterprise builds belong to the "internal" team
-    team_id: TEAM_ID_ENTERPRISE,
+    team_id: get_required_env('INT_EXPORT_TEAM_ID'),
     readonly: readonly,
     app_identifiers: app_identifiers,
     api_key_path: api_key_path
@@ -804,10 +1068,10 @@ def update_code_signing(type:, team_id:, readonly:, app_identifiers:, api_key_pa
   # NOTE: It might be neccessary to add `force: true` alongside `readonly: true` in order to regenerate some provisioning profiles.
   # If this turns out to be a hard requirement, we should consider updating the method with logic to toggle the two setting based on whether we're fetching or renewing.
 
-  # Fail early if secrets not available via `EnvManager.get_required_env!`.
+  # Fail early if secrets not available via `get_required_env`.
   # Otherwise, Fastlane will prompt to type them.
-  access_key = EnvManager.get_required_env!('MATCH_S3_ACCESS_KEY')
-  secret_access_key = EnvManager.get_required_env!('MATCH_S3_SECRET_ACCESS_KEY')
+  access_key = get_required_env('MATCH_S3_ACCESS_KEY')
+  secret_access_key = get_required_env('MATCH_S3_SECRET_ACCESS_KEY')
 
   match(
     storage_mode: 's3',
@@ -864,10 +1128,43 @@ end
 # Localization Lanes
 ########################################################################
 
+desc 'Updates the main `Localizable.strings` file — that will be imported by GlotPress'
+lane :generate_strings_file_for_glotpress do
+  en_lproj_path = File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'en.lproj')
+  ios_generate_strings_file_from_code(
+    paths: ['Simplenote/', 'SimplenoteIntents/', 'SimplenoteShare/',
+            'SimplenoteWidgets/', 'Pods/Simperium/Simperium/',
+            'Pods/Simperium/Simperium-iOS'],
+    output_dir: en_lproj_path
+  )
+
+  git_commit(
+    path: en_lproj_path,
+    message: 'Freeze strings for localization',
+    allow_nothing_to_commit: true
+  )
+end
+
 ########################################################################
 # Helper Lanes
 ########################################################################
 
+# Triggers a Release Build on Buildkite
+#
+# @param [String] branch The branch to build
+# @param [Boolean] beta Indicate if we should build a beta or regular release
+#
+def trigger_buildkite_release_build(branch:, beta:)
+  push_to_git_remote(tags: false)
+  buildkite_trigger_build(
+    buildkite_organization: 'automattic',
+    buildkite_pipeline: 'simplenote-ios',
+    branch: branch,
+    environment: { BETA_RELEASE: beta },
+    pipeline_file: 'release-build.yml'
+  )
+end
+
 def fastlane_directory
   __dir__
 end
@@ -924,7 +1221,7 @@ end
 #   fetch_test_accounts_hash
 #     => {"0"=>"4079", "1"=>"free", "2"=>"free", "3"=>"free"}
 def fetch_test_accounts_hash
-  uri = URI.parse(EnvManager.get_required_env!('UI_TESTS_ACCOUNTS_JSON_URL'))
+  uri = URI.parse(get_required_env('UI_TESTS_ACCOUNTS_JSON_URL'))
   response = Net::HTTP.get_response(uri)
   accounts_state = response.body.chomp
   JSON.parse(accounts_state)
@@ -941,7 +1238,7 @@ def find_free_test_account
 
   UI.user_error!('Could not find free UI Test account. Quitting.') if $used_test_account_index.nil?
   UI.message("Free account index: #{$used_test_account_index}")
-  change_test_account_availability(ENV['BUILDKITE_BUILD_NUMBER'].to_s)
+  change_test_account_availability(get_required_env('BUILDKITE_BUILD_NUMBER').to_s)
 end
 
 # Replace a value in a key which is equal to $used_test_account_index global variable
@@ -971,7 +1268,7 @@ def sanitize_test_accounts
 end
 
 def job_running?(job_number)
-  client = Buildkit.new(token: EnvManager.get_required_env!('BUILDKITE_TOKEN'))
+  client = Buildkit.new(token: get_required_env('BUILDKITE_TOKEN'))
   build = client.build('automattic', 'simplenote-ios', job_number)
 
   state = build['state']
@@ -985,7 +1282,7 @@ end
 
 def submit_accounts_hash(accounts_hash)
   UI.message("Writing new accounts state: #{accounts_hash}")
-  uri = URI.parse(EnvManager.get_required_env!('UI_TESTS_ACCOUNTS_JSON_URL'))
+  uri = URI.parse(get_required_env('UI_TESTS_ACCOUNTS_JSON_URL'))
   request = Net::HTTP::Post.new(uri)
   request.body = accounts_hash.to_json
 
@@ -1024,57 +1321,3 @@ def generate_installable_build_number
     "#{branch}-#{commit}"
   end
 end
-
-# Returns the release version of the app in the format `1.2` or `1.2.3` if it is a hotfix
-#
-def release_version_current
-  current_version = VERSION_FORMATTER.parse(PUBLIC_VERSION_FILE.read_release_version)
-  VERSION_FORMATTER.release_version(current_version)
-end
-
-# Returns the next release version of the app in the format `1.2` or `1.2.3` if it is a hotfix
-#
-def release_version_next
-  current_version = VERSION_FORMATTER.parse(PUBLIC_VERSION_FILE.read_release_version)
-  next_calculated_release_version = VERSION_CALCULATOR.next_release_version(version: current_version)
-  VERSION_FORMATTER.release_version(next_calculated_release_version)
-end
-
-# Returns the current build code of the app
-#
-def build_code_current
-  # We use the four part (1.2.3.4) build code format, so the version calculator can be used to calculate the next four-part version
-  version = VERSION_FORMATTER.parse(PUBLIC_VERSION_FILE.read_build_code(attribute_name: 'VERSION_LONG'))
-  BUILD_CODE_FORMATTER.build_code(version: version)
-end
-
-# Returns the build code of the app for the code freeze.
-# It is the release version name with build number (last of the four components) set to 0.
-#
-def build_code_code_freeze
-  # We use the four part (1.2.3.4) build code format, so the version calculator can be used to calculate the next four-part version
-  release_version_current = VERSION_FORMATTER.parse(PUBLIC_VERSION_FILE.read_release_version)
-  build_code_code_freeze = VERSION_CALCULATOR.next_release_version(version: release_version_current)
-  BUILD_CODE_FORMATTER.build_code(version: build_code_code_freeze)
-end
-
-# Returns the build code of the app for the code freeze.
-# It is the release version name with build number (last of the four components) set to 0.
-#
-def build_code_hotfix(release_version:)
-  version = VERSION_FORMATTER.parse(release_version)
-  BUILD_CODE_FORMATTER.build_code(version: version)
-end
-
-# Returns the next build code of the app
-#
-def build_code_next
-  # We use the four part (1.2.3.4) build code format, so the version calculator can be used to calculate the next four-part version
-  build_code_current = VERSION_FORMATTER.parse(PUBLIC_VERSION_FILE.read_build_code(attribute_name: 'VERSION_LONG'))
-  build_code_next = VERSION_CALCULATOR.next_build_number(version: build_code_current)
-  BUILD_CODE_FORMATTER.build_code(version: build_code_next)
-end
-
-def release_branch_name(release_version: release_version_current)
-  "release/#{release_version}"
-end
diff --git a/fastlane/example.env b/fastlane/example.env
deleted file mode 100644
index 4d561bbe6..000000000
--- a/fastlane/example.env
+++ /dev/null
@@ -1,17 +0,0 @@
-# You don't need to fill in these values for Fastlane to run.
-#
-# However, if a lane requires some of these environment values and they are not set here, it will fail.
-GITHUB_TOKEN=
-BUILDKITE_TOKEN=
-
-MATCH_S3_ACCESS_KEY=
-MATCH_S3_SECRET_ACCESS_KEY=
-
-APP_STORE_CONNECT_API_KEY_KEY_ID=
-APP_STORE_CONNECT_API_KEY_ISSUER_ID=
-APP_STORE_CONNECT_API_KEY_KEY=
-
-APPCENTER_API_TOKEN=
-SENTRY_AUTH_TOKEN=
-
-UI_TESTS_ACCOUNT_EMAIL=
diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb
deleted file mode 100644
index efb814eaf..000000000
--- a/fastlane/lanes/build.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-desc 'Builds and uploads for distribution via App Store Connect'
-lane :build_and_upload_to_app_store_connect do |beta_release:, skip_prechecks: false, skip_confirm: false, create_release: false|
-  unless skip_prechecks
-    ensure_git_status_clean unless skip_prechecks || is_ci
-    sentry_check_cli_installed
-  end
-
-  UI.important("Building version #{release_version_current} (#{build_code_current}) and uploading to TestFlight...")
-  UI.user_error!('Aborted by user request') unless skip_confirm || UI.confirm('Do you want to continue?')
-
-  build_for_app_store_connect
-
-  testflight(
-    skip_waiting_for_build_processing: true,
-    api_key_path: APP_STORE_CONNECT_KEY_PATH
-  )
-
-  dsym_path = File.join(File.dirname(Dir.pwd), 'Simplenote.app.dSYM.zip')
-
-  sentry_upload_dsym(
-    dsym_path: dsym_path,
-    auth_token: EnvManager.get_required_env!('SENTRY_AUTH_TOKEN'),
-    org_slug: 'a8c',
-    project_slug: 'simplenote-ios'
-  )
-
-  next unless create_release
-
-  archive_zip_path = File.join(File.dirname(Dir.pwd), 'Simplenote.xarchive.zip')
-  zip(path: lane_context[SharedValues::XCODEBUILD_ARCHIVE], output_path: archive_zip_path)
-
-  version = beta_release ? ios_get_build_version : ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
-  create_release(
-    repository: GITHUB_REPO,
-    version: version,
-    release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt'),
-    release_assets: archive_zip_path.to_s,
-    prerelease: beta_release
-  )
-end
-
-lane :build_for_app_store_connect do |fetch_code_signing: true|
-  appstore_code_signing if fetch_code_signing
-
-  gym(
-    scheme: 'Simplenote',
-    workspace: WORKSPACE,
-    configuration: 'Distribution AppStore',
-    clean: true,
-    export_method: 'app-store'
-  )
-end
diff --git a/fastlane/lanes/localization.rb b/fastlane/lanes/localization.rb
deleted file mode 100644
index 95b54c8e2..000000000
--- a/fastlane/lanes/localization.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-# List of locales used for the app strings (GlotPress code => `*.lproj` folder name`)
-#
-# TODO: Replace with `LocaleHelper` once provided by release toolkit (https://github.com/wordpress-mobile/release-toolkit/pull/296)
-GLOTPRESS_TO_LPROJ_APP_LOCALE_CODES = {
-  'ar' => 'ar',             # Arabic
-  'cy' => 'cy',             # Welsh
-  'de' => 'de',             # German
-  'el' => 'el',             # Greek
-  'en' => 'en',             # English
-  'es' => 'es',             # Spanish
-  'fa' => 'fa',             # Persian
-  'fr' => 'fr',             # French
-  'he' => 'he',             # Hebrew
-  'id' => 'id',             # Indonesian
-  'it' => 'it',             # Italian
-  'ja' => 'ja',             # Japanese
-  'ko' => 'ko',             # Korean
-  'nl' => 'nl',             # Dutch
-  'pt-br' => 'pt-BR',       # Portuguese (Brazil)
-  'ru' => 'ru',             # Russian
-  'sv' => 'sv',             # Swedish
-  'tr' => 'tr',             # Turkish
-  'zh-cn' => 'zh-Hans-CN',  # Chinese (China)
-  'zh-tw' => 'zh-Hant-TW'   # Chinese (Taiwan)
-}.freeze
-
-platform :ios do
-  desc 'Updates the main `Localizable.strings` file — that will be imported by GlotPress'
-  lane :generate_strings_file_for_glotpress do
-    en_lproj_path = File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'en.lproj')
-    ios_generate_strings_file_from_code(
-      paths: [
-        'Simplenote/',
-        'SimplenoteIntents/',
-        'SimplenoteShare/',
-        'SimplenoteWidgets/',
-        'Pods/Simperium/Simperium/',
-        'Pods/Simperium/Simperium-iOS'
-      ],
-      output_dir: en_lproj_path
-    )
-
-    git_commit(
-      path: en_lproj_path,
-      message: 'Freeze strings for localization',
-      allow_nothing_to_commit: true
-    )
-  end
-end
diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
deleted file mode 100644
index d5f843904..000000000
--- a/fastlane/lanes/release.rb
+++ /dev/null
@@ -1,114 +0,0 @@
-# frozen_string_literal: true
-
-# Lanes related to the Release Process (Code Freeze, Betas, Final Build, App Store Submission…)
-
-platform :ios do
-  lane :code_freeze do |skip_confirm: false|
-    ensure_git_status_clean
-
-    Fastlane::Helper::GitHelper.checkout_and_pull(DEFAULT_BRANCH)
-
-    check_pods_references
-
-    computed_release_branch_name = release_branch_name(release_version: release_version_next)
-
-    message = <<~MESSAGE
-      Code Freeze:
-      • New release branch from #{DEFAULT_BRANCH}: #{computed_release_branch_name}
-
-      • Current release version and build code: #{release_version_current} (#{build_code_current}).
-      • New release version and build code: #{release_version_next} (#{build_code_code_freeze}).
-    MESSAGE
-
-    UI.important(message)
-
-    UI.user_error!('Aborted by user request') unless skip_confirm || UI.confirm('Do you want to continue?')
-
-    UI.message 'Creating release branch...'
-    Fastlane::Helper::GitHelper.create_branch(computed_release_branch_name, from: DEFAULT_BRANCH)
-    UI.success "Done! New release branch is: #{git_branch}"
-
-    UI.message 'Bumping release version and build code...'
-    PUBLIC_VERSION_FILE.write(
-      version_short: release_version_next,
-      version_long: build_code_code_freeze
-    )
-    UI.success "Done! New Release Version: #{release_version_current}. New Build Code: #{build_code_current}."
-
-    commit_version_and_build_files
-
-    new_version = release_version_current
-
-    extract_release_notes_for_version(
-      version: new_version,
-      release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'RELEASE-NOTES.txt'),
-      extracted_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt')
-    )
-    ios_update_release_notes(new_version: new_version)
-
-    generate_strings_file_for_glotpress
-
-    UI.important('Pushing changes to remote, configuring the release on GitHub, and triggering the beta build...')
-    UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.") unless skip_confirm || UI.confirm('Do you want to continue?')
-
-    push_to_git_remote(tags: false)
-
-    copy_branch_protection(
-      repository: GITHUB_REPO,
-      from_branch: DEFAULT_BRANCH,
-      to_branch: computed_release_branch_name
-    )
-    set_milestone_frozen_marker(
-      repository: GITHUB_REPO,
-      milestone: new_version
-    )
-
-    trigger_beta_build(branch_to_build: computed_release_branch_name)
-  end
-
-  lane :new_beta_release do |options|
-    ios_betabuild_prechecks(options)
-    download_localized_strings_and_metadata_from_glotpress
-    ios_lint_localizations(
-      input_dir: 'Simplenote',
-      allow_retry: true
-    )
-    ios_bump_version_beta
-    trigger_beta_build(branch_to_build: release_branch_name)
-  end
-
-  lane :trigger_beta_build do |branch_to_build:|
-    trigger_buildkite_release_build(branch: branch_to_build, beta: true)
-  end
-
-  lane :trigger_release_build do |branch_to_build:|
-    trigger_buildkite_release_build(branch: branch_to_build, beta: false)
-  end
-end
-
-def commit_version_and_build_files
-  git_commit(
-    path: [VERSION_FILE_PATH],
-    message: 'Bump version number',
-    allow_nothing_to_commit: false
-  )
-end
-
-def check_pods_references
-  # This will also print the result to STDOUT
-  result = ios_check_beta_deps(lockfile: File.join(PROJECT_ROOT_FOLDER, 'Podfile.lock'))
-
-  style = result[:pods].nil? || result[:pods].empty? ? 'success' : 'warning'
-  message = "### Checking Internal Dependencies are all on a **stable** version\n\n#{result[:message]}"
-  buildkite_annotate(context: 'pods-check', style: style, message: message) if is_ci
-end
-
-def trigger_buildkite_release_build(branch:, beta:)
-  buildkite_trigger_build(
-    buildkite_organization: BUILDKITE_ORGANIZATION,
-    buildkite_pipeline: BUILDKITE_PIPELINE,
-    branch: branch,
-    environment: { BETA_RELEASE: beta },
-    pipeline_file: 'release-build.yml'
-  )
-end
diff --git a/fastlane/lib/env_manager.rb b/fastlane/lib/env_manager.rb
deleted file mode 100644
index d1b8705cd..000000000
--- a/fastlane/lib/env_manager.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-# frozen_string_literal: true
-
-require 'dotenv'
-# TODO: It would be nice to decouple this from Fastlane.
-# To give a good UX in the current use case, however, it's best to access the Fastlane UI methods directly.
-require 'fastlane'
-
-# Manages loading of environment variables from a .env and accessing them in a user-friendly way.
-class EnvManager
-  @env_path = nil
-  @env_example_path = nil
-  @print_error_lambda = nil
-
-  # Set up by loading the .env file with the given name.
-  #
-  # TODO: We could go one step and guess the name based on the repo URL.
-  def self.set_up(
-    env_file_name:,
-    env_file_folder: File.join(Dir.home, '.a8c-apps'),
-    example_env_file_path: 'fastlane/example.env',
-    print_error_lambda: ->(message) { FastlaneCore::UI.user_error!(message) }
-  )
-    @env_path = File.join(env_file_folder, env_file_name)
-    @env_example_path = example_env_file_path
-    @print_error_lambda = print_error_lambda
-
-    # We don't check for @env_path to exist here
-    Dotenv.load(@env_path)
-  end
-
-  # Use this instead of getting values from `ENV` directly. It will throw an error if the requested value is missing or empty.
-  def self.get_required_env!(key)
-    unless ENV.key?(key)
-      message = "Environment variable '#{key}' is not set."
-
-      if running_on_ci?
-        @print_error_lambda.call(message)
-      elsif File.exist?(@env_path)
-        @print_error_lambda.call("#{message} Consider adding it to #{@env_path}.")
-      else
-        env_file_dir = File.dirname(@env_path)
-        env_file_name = File.basename(@env_path)
-
-        @print_error_lambda.call <<~MSG
-          #{env_file_name} not found in #{env_file_dir} while looking for env var #{key}.
-
-          Please copy #{@env_example_path} to #{@env_path} and fill in the value for #{key}.
-
-          mkdir -p #{env_file_dir} && cp #{@env_example_path} #{@env_path}
-        MSG
-      end
-    end
-
-    value = ENV.fetch(key)
-
-    UI.user_error!("Env var for key #{key} is set but empty. Please set a value for #{key}.") if value.to_s.empty?
-
-    value
-  end
-
-  # Use this to ensure all env vars a lane requires are set.
-  #
-  # The best place to call this is at the start of a lane, to fail early.
-  def self.require_env_vars!(*keys)
-    keys.each { |key| get_required_env!(key) }
-  end
-
-  def self.running_on_ci?
-    ENV['CI'] == 'true'
-  end
-end

From a3c8d403136c0fb0bcd77dee459dddc4e2b5f0df Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 11:32:15 +1000
Subject: [PATCH 356/547] Add shared vars and explicitly set agents in
 Buildkite pipelines

---
 .buildkite/pipeline.yml         | 24 +++++++++---------------
 .buildkite/release-build.yml    | 19 +++++--------------
 .buildkite/shared-pipeline-vars | 11 +++++++++++
 .xcode-version                  |  2 +-
 4 files changed, 26 insertions(+), 30 deletions(-)
 create mode 100755 .buildkite/shared-pipeline-vars

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 2105546bf..3357f122e 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,11 +1,8 @@
-# Nodes with values to reuse in the pipeline.
-common_params:
-  # Common plugin settings to use with the `plugins` key.
-  - &common_plugins
-    - automattic/a8c-ci-toolkit#3.1.0
-  # Common environment values to use with the `env` key.
-  - &common_env
-    IMAGE_ID: xcode-15.1
+agents:
+  queue: mac
+
+env:
+  IMAGE_ID: $IMAGE_ID
 
 # This is the default pipeline – it will build and test the app
 steps:
@@ -15,8 +12,7 @@ steps:
   #################
   - label: "🔬 Build and Test"
     command: ".buildkite/commands/build-and-test.sh"
-    env: *common_env
-    plugins: *common_plugins
+    plugins: [$CI_TOOLKIT_PLUGIN]
     artifact_paths:
       - "build/results/*"
 
@@ -25,7 +21,7 @@ steps:
   #################
   - label: ":swift: SwiftLint"
     command: run_swiftlint --strict
-    plugins: *common_plugins
+    plugins: [$CI_TOOLKIT_PLUGIN]
     notify:
       - github_commit_status:
           context: "SwiftLint"
@@ -37,8 +33,7 @@ steps:
   #################
   - label: "🛠 Installable Build"
     command: ".buildkite/commands/build-prototype.sh"
-    env: *common_env
-    plugins: *common_plugins
+    plugins: [$CI_TOOLKIT_PLUGIN]
     if: "build.pull_request.id != null || build.pull_request.draft"
     artifact_paths:
       - "build/results/*"
@@ -48,7 +43,6 @@ steps:
   #################
   - label: "🔬 UI Test (Full)"
     command: ".buildkite/commands/build-and-ui-test.sh SimplenoteUITests 'iPhone SE (3rd generation)'"
-    env: *common_env
-    plugins: *common_plugins
+    plugins: [$CI_TOOLKIT_PLUGIN]
     artifact_paths:
       - "build/results/*"
diff --git a/.buildkite/release-build.yml b/.buildkite/release-build.yml
index f728cdcb0..ee622ae51 100644
--- a/.buildkite/release-build.yml
+++ b/.buildkite/release-build.yml
@@ -1,20 +1,11 @@
-# This pipeline is meant to be run via the Buildkite API, and is only used for release builds
-
-# Nodes with values to reuse in the pipeline.
-common_params:
-  # Common plugin settings to use with the `plugins` key.
-  - &common_plugins
-    - automattic/a8c-ci-toolkit#3.1.0
-  # Common environment values to use with the `env` key.
-  - &common_env
-    IMAGE_ID: xcode-15.1
-
 steps:
-
   - label: ":testflight: Simplenote iOS Release Build (App Store Connect)"
     command: ".buildkite/commands/release-build.sh"
     priority: 1
-    env: *common_env
-    plugins: *common_plugins
+    env:
+      IMAGE_ID: $IMAGE_ID
+    agents:
+      queue: mac
+    plugins: [$CI_TOOLKIT_PLUGIN]
     notify:
     - slack: "#build-and-ship"
diff --git a/.buildkite/shared-pipeline-vars b/.buildkite/shared-pipeline-vars
new file mode 100755
index 000000000..3c7429977
--- /dev/null
+++ b/.buildkite/shared-pipeline-vars
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# This file is `source`'d before calling `buildkite-agent pipeline upload`, and can be used
+# to set up some variables that will be interpolated in the `.yml` pipeline before uploading it.
+
+# The ~> modifier is not currently used, but we check for it just in case
+XCODE_VERSION=$(sed -E -n 's/^(~> )?(.*)/xcode-\2/p' .xcode-version)
+export CI_TOOLKIT_PLUGIN_VERSION="3.4.2"
+
+export IMAGE_ID="$XCODE_VERSION"
+export CI_TOOLKIT_PLUGIN="automattic/a8c-ci-toolkit#$CI_TOOLKIT_PLUGIN_VERSION"
diff --git a/.xcode-version b/.xcode-version
index 6dfe8b129..232a7fc1a 100644
--- a/.xcode-version
+++ b/.xcode-version
@@ -1 +1 @@
-14.3.1
+15.4

From 6eda9456898deb79768ec88fd5ace460f7684c3d Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Thu, 25 Jul 2024 15:19:20 -0300
Subject: [PATCH 357/547] Restore `trunk` state as of
 `f85f732f9f6f10f0dcafc4918f94f4353f66c9a6`

I accidentally pushed commits to `trunk` which should have been in a PR
while experimenting with an updated code freeze workflow for version
4.52.

This commit was done by comparing against the tip of `trunk` before my
mistake, f85f732f9f6f10f0dcafc4918f94f4353f66c9a6

It reverts bfc2fc0c3ae11d892a624dc049862f1888a1285d and
a774214e2eec8faaf26a4e367d7757d7616268c2, then cherry-picks all those
changes there were somehow reverted in my previous fix attempt, eb52ef6d228f70ea5053d3139d93334f8fae709d
---
 Gemfile                                       |  5 +-
 Gemfile.lock                                  | 64 +++++++------
 Simplenote.xcodeproj/project.pbxproj          | 93 +++++++------------
 .../xcshareddata/swiftpm/Package.resolved     | 12 ++-
 Simplenote/AccountRemote.swift                | 54 -----------
 .../Classes/MagicLinkAuthenticator.swift      |  1 +
 Simplenote/Classes/RemoteConstants.swift      | 12 ---
 Simplenote/Classes/SPAuthError.swift          | 36 ++++++-
 Simplenote/Classes/SPAuthHandler.swift        | 37 +++-----
 Simplenote/Classes/SPAuthViewController.swift | 71 +++++++++++---
 .../SPSettingsViewController+Extensions.swift |  9 +-
 Simplenote/Classes/SignupRemote.swift         | 24 -----
 .../AccountDeletionController.swift           |  1 +
 Simplenote/LoginRemote.swift                  | 46 ---------
 Simplenote/Remote.swift                       | 73 ---------------
 Simplenote/RemoteError.swift                  | 38 --------
 Simplenote/SPUser+UserProtocol.swift          |  8 ++
 Simplenote/UIAlertController+Auth.swift       | 22 +++++
 Simplenote/URLRequest+Simplenote.swift        | 13 ---
 .../AccountVerificationController.swift       |  1 +
 SimplenoteTests/Network/MockURLSession.swift  | 15 ---
 .../Network/MockURLSessionDataTask.swift      | 15 ---
 .../RemoteResult+TestHelpers.swift            |  3 +-
 SimplenoteTests/SignupRemoteTests.swift       | 75 ---------------
 .../AccountVerificationControllerTests.swift  |  1 +
 .../AccountVerificationRemoteTests.swift      | 51 ----------
 .../MockAccountVerificationRemote.swift       |  1 +
 27 files changed, 222 insertions(+), 559 deletions(-)
 delete mode 100644 Simplenote/AccountRemote.swift
 delete mode 100644 Simplenote/Classes/RemoteConstants.swift
 delete mode 100644 Simplenote/Classes/SignupRemote.swift
 delete mode 100644 Simplenote/LoginRemote.swift
 delete mode 100644 Simplenote/Remote.swift
 delete mode 100644 Simplenote/RemoteError.swift
 create mode 100644 Simplenote/SPUser+UserProtocol.swift
 create mode 100644 Simplenote/UIAlertController+Auth.swift
 delete mode 100644 Simplenote/URLRequest+Simplenote.swift
 delete mode 100644 SimplenoteTests/Network/MockURLSession.swift
 delete mode 100644 SimplenoteTests/Network/MockURLSessionDataTask.swift
 delete mode 100644 SimplenoteTests/SignupRemoteTests.swift
 delete mode 100644 SimplenoteTests/Verification/AccountVerificationRemoteTests.swift

diff --git a/Gemfile b/Gemfile
index 085001d07..a2653bc3a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,8 +8,11 @@ gem 'danger-dangermattic', '~> 1.0'
 gem 'fastlane', '~> 2'
 gem 'fastlane-plugin-appcenter', '~> 2.1.2'
 gem 'fastlane-plugin-sentry', '~> 1.6'
-gem 'fastlane-plugin-wpmreleasetoolkit', '~> 11.0', '>= 11.0.1'
+gem 'fastlane-plugin-wpmreleasetoolkit', '~> 11.0.1'
 
 group :screenshots, optional: true do
   gem 'rmagick', '~> 3.2.0'
 end
+
+plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
+eval_gemfile(plugins_path) if File.exist?(plugins_path)
diff --git a/Gemfile.lock b/Gemfile.lock
index 5e891f661..5f2447ee7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,7 +5,7 @@ GEM
       base64
       nkf
       rexml
-    activesupport (7.1.3.4)
+    activesupport (7.1.3.2)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -15,8 +15,8 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
@@ -24,24 +24,24 @@ GEM
     ast (2.4.2)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.957.0)
-    aws-sdk-core (3.201.2)
+    aws-partitions (1.921.0)
+    aws-sdk-core (3.193.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.88.0)
-      aws-sdk-core (~> 3, >= 3.201.0)
-      aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.156.0)
-      aws-sdk-core (~> 3, >= 3.201.0)
+    aws-sdk-kms (1.80.0)
+      aws-sdk-core (~> 3, >= 3.193.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.148.0)
+      aws-sdk-core (~> 3, >= 3.193.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.5)
+      aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.2.0)
-    bigdecimal (3.1.8)
+    bigdecimal (3.1.7)
     buildkit (1.6.0)
       sawyer (>= 0.6)
     chroma (0.2.0)
@@ -91,7 +91,7 @@ GEM
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
-    concurrent-ruby (1.3.3)
+    concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
     cork (0.3.0)
       colored2 (~> 3.1)
@@ -129,7 +129,7 @@ GEM
     escape (0.0.4)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    excon (0.111.0)
+    excon (0.110.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -161,7 +161,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.3.1)
-    fastlane (2.221.1)
+    fastlane (2.220.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -205,7 +205,7 @@ GEM
     fastlane-plugin-appcenter (2.1.2)
     fastlane-plugin-sentry (1.22.0)
       os (~> 1.1, >= 1.1.4)
-    fastlane-plugin-wpmreleasetoolkit (11.0.3)
+    fastlane-plugin-wpmreleasetoolkit (11.0.1)
       activesupport (>= 6.1.7.1)
       buildkit (~> 1.5)
       chroma (= 0.2.0)
@@ -266,27 +266,27 @@ GEM
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.6)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.14.5)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     java-properties (0.3.0)
     jmespath (1.6.2)
     json (2.7.2)
-    jwt (2.8.2)
+    jwt (2.8.1)
       base64
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     language_server-protocol (3.17.0.3)
-    mini_magick (4.13.2)
+    mini_magick (4.12.0)
     mini_mime (1.1.5)
-    minitest (5.24.1)
+    minitest (5.22.3)
     molinillo (0.8.0)
     multi_json (1.15.0)
-    multipart-post (2.4.1)
+    multipart-post (2.4.0)
     mutex_m (0.2.0)
     nanaimo (0.3.0)
     nap (1.1.0)
@@ -294,9 +294,9 @@ GEM
     netrc (0.11.0)
     nkf (0.2.0)
     no_proxy_fix (0.1.2)
-    nokogiri (1.16.6-arm64-darwin)
+    nokogiri (1.16.4-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.6-x86_64-linux)
+    nokogiri (1.16.4-x86_64-linux)
       racc (~> 1.4)
     octokit (6.1.1)
       faraday (>= 1, < 3)
@@ -305,16 +305,16 @@ GEM
     options (2.3.2)
     optparse (0.5.0)
     os (1.1.4)
-    parallel (1.25.1)
+    parallel (1.24.0)
     parser (3.3.1.0)
       ast (~> 2.4.1)
       racc
     plist (3.7.1)
-    progress_bar (1.3.4)
-      highline (>= 1.6)
+    progress_bar (1.3.3)
+      highline (>= 1.6, < 3)
       options (~> 2.3.0)
     public_suffix (4.0.7)
-    racc (1.8.0)
+    racc (1.7.3)
     rainbow (3.1.1)
     rake (13.2.1)
     rake-compiler (1.2.7)
@@ -326,8 +326,7 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.9)
-      strscan
+    rexml (3.2.6)
     rmagick (3.2.0)
     rouge (2.0.7)
     rubocop (1.63.4)
@@ -359,7 +358,6 @@ GEM
     simctl (1.6.10)
       CFPropertyList
       naturally
-    strscan (3.1.0)
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -399,8 +397,8 @@ DEPENDENCIES
   fastlane (~> 2)
   fastlane-plugin-appcenter (~> 2.1.2)
   fastlane-plugin-sentry (~> 1.6)
-  fastlane-plugin-wpmreleasetoolkit (~> 11.0, >= 11.0.1)
+  fastlane-plugin-wpmreleasetoolkit (~> 11.0.1)
   rmagick (~> 3.2.0)
 
 BUNDLED WITH
-   2.4.21
+   2.5.4
diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index 6a0958985..6154f0d96 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -124,7 +124,6 @@
 		A61471B925D70C190065D849 /* PopoverViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A61471B725D70C190065D849 /* PopoverViewController.swift */; };
 		A628BEB625ECD97900121B64 /* SignupVerificationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A628BEB425ECD97900121B64 /* SignupVerificationViewController.swift */; };
 		A628BEB725ECD97900121B64 /* SignupVerificationViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A628BEB525ECD97900121B64 /* SignupVerificationViewController.xib */; };
-		A628BEC325ED703A00121B64 /* RemoteConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = A628BEC225ED703A00121B64 /* RemoteConstants.swift */; };
 		A6344AD9255952C70072FA07 /* NoteContentPreviewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6344AD8255952C70072FA07 /* NoteContentPreviewTests.swift */; };
 		A645FA70254C5E69008A1519 /* NoteContentHelperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A645FA6F254C5E69008A1519 /* NoteContentHelperTests.swift */; };
 		A64DE6E9255D1C9F001D0526 /* ContentSlice.swift in Sources */ = {isa = PBXBuildFile; fileRef = A64DE6E8255D1C9F001D0526 /* ContentSlice.swift */; };
@@ -172,13 +171,8 @@
 		A6C0DFE825C18E3300B9BE39 /* NoteEditorTagListViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A6C0DFE625C18E3300B9BE39 /* NoteEditorTagListViewController.xib */; };
 		A6C2721825AF0C1E00593731 /* TagListViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6C2721725AF0C1E00593731 /* TagListViewCell.swift */; };
 		A6C3D8B7256687970042F584 /* SPObjectManager+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6C3D8B6256687970042F584 /* SPObjectManager+Simplenote.swift */; };
-		A6C7648025E9131C00A39067 /* SignupRemote.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6C7647F25E9131C00A39067 /* SignupRemote.swift */; };
-		A6CC0B0725B8287F00F12A85 /* AccountRemote.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6CC0B0625B8287F00F12A85 /* AccountRemote.swift */; };
 		A6CC0B1025B83FE400F12A85 /* AccountVerificationControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6CC0B0F25B83FE400F12A85 /* AccountVerificationControllerTests.swift */; };
 		A6CC0B1F25B840A400F12A85 /* MockAccountVerificationRemote.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6CC0B1E25B840A400F12A85 /* MockAccountVerificationRemote.swift */; };
-		A6CC0B2D25B84FF200F12A85 /* AccountVerificationRemoteTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6CC0B2C25B84FF200F12A85 /* AccountVerificationRemoteTests.swift */; };
-		A6CC0B3625B8502800F12A85 /* MockURLSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6CC0B3525B8502800F12A85 /* MockURLSession.swift */; };
-		A6CC0B4425B8505700F12A85 /* MockURLSessionDataTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6CC0B4325B8505700F12A85 /* MockURLSessionDataTask.swift */; };
 		A6CDD9C825F0163D00E0BC4D /* MagicLinkAuthenticator.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6CDD9C725F0163D00E0BC4D /* MagicLinkAuthenticator.swift */; };
 		A6CDF900256B9CB900CF2F27 /* ViewSpinner.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6CDF8FF256B9CB900CF2F27 /* ViewSpinner.swift */; };
 		A6D5AE6525483F8A00326C76 /* NSTextStorage+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6D5AE6425483F8A00326C76 /* NSTextStorage+Simplenote.swift */; };
@@ -241,6 +235,8 @@
 		B518899E1E0D5EF800E71B83 /* SPContactsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B518899D1E0D5EF800E71B83 /* SPContactsManager.swift */; };
 		B51889A01E0D5F2200E71B83 /* Contacts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B518899F1E0D5F2200E71B83 /* Contacts.framework */; };
 		B51889A41E0DB01E00E71B83 /* ContactsUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B51889A31E0DB01E00E71B83 /* ContactsUI.framework */; };
+		B51D445B2C52CB4000F296A7 /* SimplenoteEndpoints in Frameworks */ = {isa = PBXBuildFile; productRef = B51D445A2C52CB4000F296A7 /* SimplenoteEndpoints */; };
+		B51D445E2C52CDA800F296A7 /* SPUser+UserProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51D445D2C52CDA800F296A7 /* SPUser+UserProtocol.swift */; };
 		B51F6DD12460C3EE0074DDD9 /* AuthenticationValidator.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51F6DD02460C3EE0074DDD9 /* AuthenticationValidator.swift */; };
 		B51F6DD32460D12B0074DDD9 /* AuthenticationValidatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51F6DD22460D12B0074DDD9 /* AuthenticationValidatorTests.swift */; };
 		B51F6DD52460D7540074DDD9 /* NSPredicate+Email.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51F6DD42460D7540074DDD9 /* NSPredicate+Email.swift */; };
@@ -298,6 +294,7 @@
 		B54A11C22C135EA2002AC8AA /* UIButton+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54A11C12C135EA2002AC8AA /* UIButton+Simplenote.swift */; };
 		B54A11C42C136225002AC8AA /* MagicLinkRequestedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54A11C32C136225002AC8AA /* MagicLinkRequestedView.swift */; };
 		B54B04D82407169500401FBB /* SPAppDelegate+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54B04D72407169500401FBB /* SPAppDelegate+Extensions.swift */; };
+		B54C1B552C4EE350001E9E18 /* UIAlertController+Auth.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54C1B542C4EE350001E9E18 /* UIAlertController+Auth.swift */; };
 		B54D9C572909BA2600D0E0EC /* StoreManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54D9C562909BA2600D0E0EC /* StoreManager.swift */; };
 		B54D9C592909CC4400D0E0EC /* StoreProduct.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54D9C582909CC4400D0E0EC /* StoreProduct.swift */; };
 		B55051821A4328B9002A1093 /* LocalAuthentication.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B55051811A4328B9002A1093 /* LocalAuthentication.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
@@ -310,7 +307,6 @@
 		B55E428C22A1A4550018C0CE /* SPSortOrderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B55E428B22A1A4550018C0CE /* SPSortOrderViewController.swift */; };
 		B56315BE236BD9970066C151 /* UIKitConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AB169B22FB2DF300B4EBA5 /* UIKitConstants.swift */; };
 		B5686178195B9E93005F1245 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E2F149471799F5A500DC9690 /* libsqlite3.dylib */; };
-		B5699B092C1246C40096D6B7 /* LoginRemote.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5699B082C1246C40096D6B7 /* LoginRemote.swift */; };
 		B56A695822F9CD1500B90398 /* SPOnboardingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = B56A695622F9CD1500B90398 /* SPOnboardingViewController.xib */; };
 		B56A695922F9CD1500B90398 /* SPOnboardingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56A695722F9CD1500B90398 /* SPOnboardingViewController.swift */; };
 		B56A695B22F9CD4E00B90398 /* UINavigationBar+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56A695A22F9CD4E00B90398 /* UINavigationBar+Simplenote.swift */; };
@@ -428,7 +424,6 @@
 		BA0AF10D2BE996600050EEBD /* KeychainManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B59560DF251A46D500A06788 /* KeychainManager.swift */; };
 		BA0AF10E2BE996630050EEBD /* KeychainPasswordItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37FD30471FC4CFA2008D0B78 /* KeychainPasswordItem.swift */; };
 		BA0ED16E26D708AC002533B6 /* Color+Widgets.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA0ED16D26D708AC002533B6 /* Color+Widgets.swift */; };
-		BA0F5E0426B62A8B0098C605 /* RemoteError.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA0F5E0326B62A8B0098C605 /* RemoteError.swift */; };
 		BA113E4D269E860500F3E3B4 /* markdown-light.css in Resources */ = {isa = PBXBuildFile; fileRef = BA113E4C269E860500F3E3B4 /* markdown-light.css */; };
 		BA122DBA265EF402003D3BC5 /* SimplenoteConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5095DC824632E3300812711 /* SimplenoteConstants.swift */; };
 		BA122DBB265EF40E003D3BC5 /* UIColor+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = B575736B232D454300443C2E /* UIColor+Helpers.swift */; };
@@ -441,7 +436,6 @@
 		BA122DCA265F2E2D003D3BC5 /* UIColorSimplenoteTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA122DC9265F2E2D003D3BC5 /* UIColorSimplenoteTests.swift */; };
 		BA12B06F26B0D0150026F31D /* SPManagedObject+Widget.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA12B06C26B0D0150026F31D /* SPManagedObject+Widget.swift */; };
 		BA12B07026B0D0150026F31D /* SPManagedObject+Widget.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA12B06C26B0D0150026F31D /* SPManagedObject+Widget.swift */; };
-		BA18532826488DBC00D9A347 /* SignupRemoteTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA18532726488DBC00D9A347 /* SignupRemoteTests.swift */; };
 		BA2015BB2B57384F005E59AA /* AutomatticTracks in Frameworks */ = {isa = PBXBuildFile; productRef = BA2015BA2B57384F005E59AA /* AutomatticTracks */; };
 		BA289B5C2BE4371A000E6794 /* ListWidgetIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA289B5A2BE4371A000E6794 /* ListWidgetIntentHandler.swift */; };
 		BA289B5F2BE43728000E6794 /* NoteWidgetIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA289B5D2BE43728000E6794 /* NoteWidgetIntentHandler.swift */; };
@@ -476,10 +470,8 @@
 		BA55124E2600210B00D8F882 /* TimerFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA55124D2600210B00D8F882 /* TimerFactory.swift */; };
 		BA55B05A25F067DF0042582B /* NoticePresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA55B05925F067DF0042582B /* NoticePresenter.swift */; };
 		BA55B06325F068650042582B /* NoticeController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA55B06225F068650042582B /* NoticeController.swift */; };
-		BA5768E3269A803F008B510E /* Remote.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA5768E2269A803F008B510E /* Remote.swift */; };
 		BA5768EC269BE4D0008B510E /* AccountDeletionController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA5768EB269BE4D0008B510E /* AccountDeletionController.swift */; };
 		BA5C1C0725BF9D6C006E3820 /* SPDragBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA5C1C0625BF9D6C006E3820 /* SPDragBar.swift */; };
-		BA5E5B7D264A148C00D0EE19 /* URLRequest+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA5E5B7C264A148C00D0EE19 /* URLRequest+Simplenote.swift */; };
 		BA608EF526BB6E0200A9D94E /* ListWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA608EF426BB6E0200A9D94E /* ListWidget.swift */; };
 		BA608EF726BB6E7400A9D94E /* ListWidgetProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA608EF626BB6E7400A9D94E /* ListWidgetProvider.swift */; };
 		BA608EF926BB6F4C00A9D94E /* ListWidgetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA608EF826BB6F4C00A9D94E /* ListWidgetView.swift */; };
@@ -828,7 +820,6 @@
 		A61471B725D70C190065D849 /* PopoverViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PopoverViewController.swift; path = Classes/PopoverViewController.swift; sourceTree = "<group>"; };
 		A628BEB425ECD97900121B64 /* SignupVerificationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SignupVerificationViewController.swift; path = Classes/SignupVerificationViewController.swift; sourceTree = "<group>"; };
 		A628BEB525ECD97900121B64 /* SignupVerificationViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = SignupVerificationViewController.xib; path = Classes/SignupVerificationViewController.xib; sourceTree = "<group>"; };
-		A628BEC225ED703A00121B64 /* RemoteConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = RemoteConstants.swift; path = Classes/RemoteConstants.swift; sourceTree = "<group>"; };
 		A6344AD8255952C70072FA07 /* NoteContentPreviewTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteContentPreviewTests.swift; sourceTree = "<group>"; };
 		A645FA6F254C5E69008A1519 /* NoteContentHelperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteContentHelperTests.swift; sourceTree = "<group>"; };
 		A64DE6E8255D1C9F001D0526 /* ContentSlice.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ContentSlice.swift; path = Classes/ContentSlice.swift; sourceTree = "<group>"; };
@@ -876,13 +867,8 @@
 		A6C0DFE625C18E3300B9BE39 /* NoteEditorTagListViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NoteEditorTagListViewController.xib; sourceTree = "<group>"; };
 		A6C2721725AF0C1E00593731 /* TagListViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TagListViewCell.swift; sourceTree = "<group>"; };
 		A6C3D8B6256687970042F584 /* SPObjectManager+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "SPObjectManager+Simplenote.swift"; path = "Classes/SPObjectManager+Simplenote.swift"; sourceTree = "<group>"; };
-		A6C7647F25E9131C00A39067 /* SignupRemote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SignupRemote.swift; path = Classes/SignupRemote.swift; sourceTree = "<group>"; };
-		A6CC0B0625B8287F00F12A85 /* AccountRemote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountRemote.swift; sourceTree = "<group>"; };
 		A6CC0B0F25B83FE400F12A85 /* AccountVerificationControllerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountVerificationControllerTests.swift; sourceTree = "<group>"; };
 		A6CC0B1E25B840A400F12A85 /* MockAccountVerificationRemote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockAccountVerificationRemote.swift; sourceTree = "<group>"; };
-		A6CC0B2C25B84FF200F12A85 /* AccountVerificationRemoteTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountVerificationRemoteTests.swift; sourceTree = "<group>"; };
-		A6CC0B3525B8502800F12A85 /* MockURLSession.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockURLSession.swift; sourceTree = "<group>"; };
-		A6CC0B4325B8505700F12A85 /* MockURLSessionDataTask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockURLSessionDataTask.swift; sourceTree = "<group>"; };
 		A6CDD9C725F0163D00E0BC4D /* MagicLinkAuthenticator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MagicLinkAuthenticator.swift; path = Classes/MagicLinkAuthenticator.swift; sourceTree = "<group>"; };
 		A6CDF8FF256B9CB900CF2F27 /* ViewSpinner.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ViewSpinner.swift; path = Classes/ViewSpinner.swift; sourceTree = "<group>"; };
 		A6D5AE6425483F8A00326C76 /* NSTextStorage+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSTextStorage+Simplenote.swift"; sourceTree = "<group>"; };
@@ -943,6 +929,7 @@
 		B518899D1E0D5EF800E71B83 /* SPContactsManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SPContactsManager.swift; path = Classes/SPContactsManager.swift; sourceTree = "<group>"; };
 		B518899F1E0D5F2200E71B83 /* Contacts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Contacts.framework; path = System/Library/Frameworks/Contacts.framework; sourceTree = SDKROOT; };
 		B51889A31E0DB01E00E71B83 /* ContactsUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ContactsUI.framework; path = System/Library/Frameworks/ContactsUI.framework; sourceTree = SDKROOT; };
+		B51D445D2C52CDA800F296A7 /* SPUser+UserProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SPUser+UserProtocol.swift"; sourceTree = "<group>"; };
 		B51F6DD02460C3EE0074DDD9 /* AuthenticationValidator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationValidator.swift; sourceTree = "<group>"; };
 		B51F6DD22460D12B0074DDD9 /* AuthenticationValidatorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationValidatorTests.swift; sourceTree = "<group>"; };
 		B51F6DD42460D7540074DDD9 /* NSPredicate+Email.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSPredicate+Email.swift"; sourceTree = "<group>"; };
@@ -998,6 +985,7 @@
 		B54A11C12C135EA2002AC8AA /* UIButton+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIButton+Simplenote.swift"; sourceTree = "<group>"; };
 		B54A11C32C136225002AC8AA /* MagicLinkRequestedView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MagicLinkRequestedView.swift; sourceTree = "<group>"; };
 		B54B04D72407169500401FBB /* SPAppDelegate+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SPAppDelegate+Extensions.swift"; sourceTree = "<group>"; };
+		B54C1B542C4EE350001E9E18 /* UIAlertController+Auth.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIAlertController+Auth.swift"; sourceTree = "<group>"; };
 		B54D9C542909B21700D0E0EC /* Simplenote 6.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Simplenote 6.xcdatamodel"; sourceTree = "<group>"; };
 		B54D9C562909BA2600D0E0EC /* StoreManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoreManager.swift; sourceTree = "<group>"; };
 		B54D9C582909CC4400D0E0EC /* StoreProduct.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoreProduct.swift; sourceTree = "<group>"; };
@@ -1022,7 +1010,6 @@
 		B55E428B22A1A4550018C0CE /* SPSortOrderViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SPSortOrderViewController.swift; path = Classes/SPSortOrderViewController.swift; sourceTree = "<group>"; };
 		B5651239243BC063001EFE77 /* fa */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fa; path = fa.lproj/Localizable.strings; sourceTree = "<group>"; };
 		B566A1DD189AA74600DC3F2D /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; };
-		B5699B082C1246C40096D6B7 /* LoginRemote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginRemote.swift; sourceTree = "<group>"; };
 		B56A695622F9CD1500B90398 /* SPOnboardingViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = SPOnboardingViewController.xib; path = Classes/SPOnboardingViewController.xib; sourceTree = "<group>"; };
 		B56A695722F9CD1500B90398 /* SPOnboardingViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SPOnboardingViewController.swift; path = Classes/SPOnboardingViewController.swift; sourceTree = "<group>"; };
 		B56A695A22F9CD4E00B90398 /* UINavigationBar+Simplenote.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "UINavigationBar+Simplenote.swift"; path = "Classes/UINavigationBar+Simplenote.swift"; sourceTree = "<group>"; };
@@ -1154,13 +1141,11 @@
 		BA0890A626BB9BE20035CA48 /* ListWidgetHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListWidgetHeaderView.swift; sourceTree = "<group>"; };
 		BA0890A826BB9BF80035CA48 /* NewNoteButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewNoteButton.swift; sourceTree = "<group>"; };
 		BA0ED16D26D708AC002533B6 /* Color+Widgets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Color+Widgets.swift"; sourceTree = "<group>"; };
-		BA0F5E0326B62A8B0098C605 /* RemoteError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoteError.swift; sourceTree = "<group>"; };
 		BA113E4C269E860500F3E3B4 /* markdown-light.css */ = {isa = PBXFileReference; lastKnownFileType = text.css; path = "markdown-light.css"; sourceTree = "<group>"; };
 		BA122DC5265EF90C003D3BC5 /* NewNoteWidgetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewNoteWidgetView.swift; sourceTree = "<group>"; };
 		BA122DC9265F2E2D003D3BC5 /* UIColorSimplenoteTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIColorSimplenoteTests.swift; sourceTree = "<group>"; };
 		BA12B06C26B0D0150026F31D /* SPManagedObject+Widget.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "SPManagedObject+Widget.swift"; sourceTree = "<group>"; };
 		BA16C6A82BC4968400C9079F /* Simplenote 7.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Simplenote 7.xcdatamodel"; sourceTree = "<group>"; };
-		BA18532726488DBC00D9A347 /* SignupRemoteTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignupRemoteTests.swift; sourceTree = "<group>"; };
 		BA289B5A2BE4371A000E6794 /* ListWidgetIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListWidgetIntentHandler.swift; sourceTree = "<group>"; };
 		BA289B5D2BE43728000E6794 /* NoteWidgetIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteWidgetIntentHandler.swift; sourceTree = "<group>"; };
 		BA289B632BE43963000E6794 /* OpenNewNoteIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenNewNoteIntentHandler.swift; sourceTree = "<group>"; };
@@ -1185,10 +1170,8 @@
 		BA55124D2600210B00D8F882 /* TimerFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimerFactory.swift; sourceTree = "<group>"; };
 		BA55B05925F067DF0042582B /* NoticePresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoticePresenter.swift; sourceTree = "<group>"; };
 		BA55B06225F068650042582B /* NoticeController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoticeController.swift; sourceTree = "<group>"; };
-		BA5768E2269A803F008B510E /* Remote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Remote.swift; sourceTree = "<group>"; };
 		BA5768EB269BE4D0008B510E /* AccountDeletionController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountDeletionController.swift; sourceTree = "<group>"; };
 		BA5C1C0625BF9D6C006E3820 /* SPDragBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPDragBar.swift; sourceTree = "<group>"; };
-		BA5E5B7C264A148C00D0EE19 /* URLRequest+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URLRequest+Simplenote.swift"; sourceTree = "<group>"; };
 		BA608EF426BB6E0200A9D94E /* ListWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListWidget.swift; sourceTree = "<group>"; };
 		BA608EF626BB6E7400A9D94E /* ListWidgetProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListWidgetProvider.swift; sourceTree = "<group>"; };
 		BA608EF826BB6F4C00A9D94E /* ListWidgetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListWidgetView.swift; sourceTree = "<group>"; };
@@ -1415,6 +1398,7 @@
 				46A3C9BE17DFA81A002865AE /* UIKit.framework in Frameworks */,
 				46A3C9BF17DFA81A002865AE /* Foundation.framework in Frameworks */,
 				4352BA0867E0E416EB5FF6B9 /* Pods_Automattic_Simplenote.framework in Frameworks */,
+				B51D445B2C52CB4000F296A7 /* SimplenoteEndpoints in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1734,7 +1718,6 @@
 			children = (
 				A6CC0B1D25B8408900F12A85 /* Helpers */,
 				A6CC0B0F25B83FE400F12A85 /* AccountVerificationControllerTests.swift */,
-				A6CC0B2C25B84FF200F12A85 /* AccountVerificationRemoteTests.swift */,
 			);
 			path = Verification;
 			sourceTree = "<group>";
@@ -1747,15 +1730,6 @@
 			path = Helpers;
 			sourceTree = "<group>";
 		};
-		A6CC0B3425B8501B00F12A85 /* Network */ = {
-			isa = PBXGroup;
-			children = (
-				A6CC0B3525B8502800F12A85 /* MockURLSession.swift */,
-				A6CC0B4325B8505700F12A85 /* MockURLSessionDataTask.swift */,
-			);
-			path = Network;
-			sourceTree = "<group>";
-		};
 		A6E1E79C24BDDF30008A44BC /* Card */ = {
 			isa = PBXGroup;
 			children = (
@@ -1841,11 +1815,18 @@
 				B52F35D022F3254800724793 /* Theme.swift */,
 				B5AB169B22FB2DF300B4EBA5 /* UIKitConstants.swift */,
 				B5095DC824632E3300812711 /* SimplenoteConstants.swift */,
-				A628BEC225ED703A00121B64 /* RemoteConstants.swift */,
 			);
 			name = Settings;
 			sourceTree = "<group>";
 		};
+		B51D445C2C52CD8D00F296A7 /* Authentication */ = {
+			isa = PBXGroup;
+			children = (
+				B51D445D2C52CDA800F296A7 /* SPUser+UserProtocol.swift */,
+			);
+			name = Authentication;
+			sourceTree = "<group>";
+		};
 		B51F6DCF2460C3D80074DDD9 /* Onboarding */ = {
 			isa = PBXGroup;
 			children = (
@@ -1995,7 +1976,6 @@
 				A6344AD8255952C70072FA07 /* NoteContentPreviewTests.swift */,
 				A694ABB225D1687200CC3A2D /* NoteScrollPositionCacheTests.swift */,
 				BAB0179A260AD591007A9CC3 /* PublishControllerTests.swift */,
-				BA18532726488DBC00D9A347 /* SignupRemoteTests.swift */,
 			);
 			name = Tools;
 			sourceTree = "<group>";
@@ -2063,7 +2043,6 @@
 				A6C0DFB425C1581D00B9BE39 /* UIScrollView+Simplenote.swift */,
 				A6A8968D25D5779D00A7B390 /* FileManager+Simplenote.swift */,
 				BAE08625261282D1009D40CD /* Note+Publish.swift */,
-				BA5E5B7C264A148C00D0EE19 /* URLRequest+Simplenote.swift */,
 				BAFDBBD726B88BD200119615 /* Date+Simplenote.swift */,
 				BAB27BD526BA425C00AE4ACC /* Color+Simplenote.swift */,
 				BAA59E78269F9FE30068BD3D /* Date+Simplenote.swift */,
@@ -2081,6 +2060,7 @@
 				B56A695D22F9D53300B90398 /* SPAuthError.swift */,
 				B56A695C22F9D53300B90398 /* SPAuthHandler.swift */,
 				B5C99A502C45B94600728813 /* AuthenticationMode.swift */,
+				B54C1B542C4EE350001E9E18 /* UIAlertController+Auth.swift */,
 				B56A695F22F9D53400B90398 /* SPAuthViewController.swift */,
 				B56A695E22F9D53300B90398 /* SPAuthViewController.xib */,
 				B5AB169722FA124F00B4EBA5 /* SPSheetController.swift */,
@@ -2180,7 +2160,6 @@
 		B5B85BA6235173D900AD5221 /* Helpers */ = {
 			isa = PBXGroup;
 			children = (
-				A6CC0B3425B8501B00F12A85 /* Network */,
 				B5421F3B23CE7A14004DDC19 /* Constants.swift */,
 				B5421F3D23CE7A1C004DDC19 /* MockupStorage.swift */,
 				B5421F3E23CE7A1C004DDC19 /* MockupStorage+Sample.swift */,
@@ -2216,7 +2195,6 @@
 		B5BE053E1AB751FD002417BF /* Tools */ = {
 			isa = PBXGroup;
 			children = (
-				BA57692A269D2103008B510E /* Remotes */,
 				B51F6DCF2460C3D80074DDD9 /* Onboarding */,
 				B5CBEF3F22D3AD92009DBE67 /* MigrationsHandler.swift */,
 				B5D3FCCF201F96AC00A813B7 /* StatusChecker.h */,
@@ -2437,18 +2415,6 @@
 			path = Tools;
 			sourceTree = "<group>";
 		};
-		BA57692A269D2103008B510E /* Remotes */ = {
-			isa = PBXGroup;
-			children = (
-				B5699B082C1246C40096D6B7 /* LoginRemote.swift */,
-				A6C7647F25E9131C00A39067 /* SignupRemote.swift */,
-				A6CC0B0625B8287F00F12A85 /* AccountRemote.swift */,
-				BA5768E2269A803F008B510E /* Remote.swift */,
-				BA0F5E0326B62A8B0098C605 /* RemoteError.swift */,
-			);
-			name = Remotes;
-			sourceTree = "<group>";
-		};
 		BA75D87C26C0842000883FFA /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
@@ -2700,6 +2666,7 @@
 		E29ADD4117848E8500E55842 /* Simplenote */ = {
 			isa = PBXGroup;
 			children = (
+				B51D445C2C52CD8D00F296A7 /* Authentication */,
 				467D9C7A1788D10400785EF3 /* Categories */,
 				A690032F253D85C40087D0D2 /* Controllers */,
 				B5C7BF92230C592B000DEC91 /* Credentials */,
@@ -2913,6 +2880,7 @@
 				B50D2FB524E6DFAC00163FC3 /* SimplenoteSearch */,
 				B59CACFB2541E05400958330 /* SimplenoteInterlinks */,
 				BA2015BA2B57384F005E59AA /* AutomatticTracks */,
+				B51D445A2C52CB4000F296A7 /* SimplenoteEndpoints */,
 			);
 			productName = Simplenote;
 			productReference = 46A3C9D717DFA81A002865AE /* Simplenote.app */;
@@ -3132,6 +3100,7 @@
 				3F762E8D2677F19C0088CD45 /* XCRemoteSwiftPackageReference "XCUITestHelpers" */,
 				3F4BA07C26CDF295000619B1 /* XCRemoteSwiftPackageReference "ScreenObject" */,
 				BA2015B92B573761005E59AA /* XCRemoteSwiftPackageReference "Automattic-Tracks-iOS" */,
+				B51D44592C52CB4000F296A7 /* XCRemoteSwiftPackageReference "SimplenoteEndpoints-Swift" */,
 			);
 			productRefGroup = E29ADD3917848E8500E55842 /* Products */;
 			projectDirPath = "";
@@ -3566,7 +3535,6 @@
 				B56E763622BD565700C5AA47 /* UIView+Simplenote.swift in Sources */,
 				B5E4082D235DE41A00D4E1DF /* UIColor+Studio.swift in Sources */,
 				A6CDF900256B9CB900CF2F27 /* ViewSpinner.swift in Sources */,
-				BA5E5B7D264A148C00D0EE19 /* URLRequest+Simplenote.swift in Sources */,
 				375D24B721E01131007AB25A /* stack.c in Sources */,
 				373AD30821C4739500A4EA89 /* NSMutableAttributedString+Styling.m in Sources */,
 				B524AE112352CC7900EA11D4 /* UIScreen+Simplenote.swift in Sources */,
@@ -3589,7 +3557,6 @@
 				B5757368232BED0700443C2E /* UIBezierPath+Simplenote.swift in Sources */,
 				B5476BB723D89AF7000E7723 /* SPSectionHeaderView.swift in Sources */,
 				B5377349252E2A4200BC78C5 /* Value1TableViewCell.swift in Sources */,
-				BA0F5E0426B62A8B0098C605 /* RemoteError.swift in Sources */,
 				B53C5A5A230330CD00DA2143 /* SPNoteListViewController+Extensions.swift in Sources */,
 				A6C0DFB525C1581D00B9BE39 /* UIScrollView+Simplenote.swift in Sources */,
 				375D24B621E01131007AB25A /* html_blocks.c in Sources */,
@@ -3627,7 +3594,6 @@
 				B52BB75022CFD18F0042C162 /* UIActivity+Simplenote.swift in Sources */,
 				F9E197D42283D05C0092B3E1 /* CrashLogging.swift in Sources */,
 				BA9B59022685549F00DAD1ED /* StorageSettings.swift in Sources */,
-				B5699B092C1246C40096D6B7 /* LoginRemote.swift in Sources */,
 				DE7E545B214E34C8008D9928 /* NSString+Count.swift in Sources */,
 				A6E6CE0025A4B0A9005A92DB /* PinLockVerifyController.swift in Sources */,
 				BA55124E2600210B00D8F882 /* TimerFactory.swift in Sources */,
@@ -3643,6 +3609,7 @@
 				46A3C98F17DFA81A002865AE /* SPNoteListViewController.m in Sources */,
 				B5BD6AF51BF66093004ECE33 /* SPMarkdownPreviewViewController.m in Sources */,
 				B5F3FFFF23F44679007A7C59 /* SPSortBar.swift in Sources */,
+				B54C1B552C4EE350001E9E18 /* UIAlertController+Auth.swift in Sources */,
 				BA4499C525ED95E5000C563E /* NoticeAction.swift in Sources */,
 				A6E02778256E9487002054DF /* PinLockSetupController.swift in Sources */,
 				B513F2B42319A8D50021CFA4 /* SPNoteTableViewCell.swift in Sources */,
@@ -3660,7 +3627,6 @@
 				BA289B732BE45A3C000E6794 /* IntentsConstants.swift in Sources */,
 				BAF4A96F26DB085D00C51C1D /* NSURLComponents+Simplenote.swift in Sources */,
 				B5E951E124FEDAD4004B10B8 /* UIPasteboard+Note.swift in Sources */,
-				A6C7648025E9131C00A39067 /* SignupRemote.swift in Sources */,
 				A681C73C2541AC8D00F369C2 /* HuggableTableView.swift in Sources */,
 				46A3C99917DFA81A002865AE /* SPTransitionController.m in Sources */,
 				B56A695B22F9CD4E00B90398 /* UINavigationBar+Simplenote.swift in Sources */,
@@ -3680,6 +3646,7 @@
 				B5AEC38423FAC5D600D24221 /* DateFormatter+Simplenote.swift in Sources */,
 				B5DF734622A5713600602CE7 /* SortMode.swift in Sources */,
 				BA55B05A25F067DF0042582B /* NoticePresenter.swift in Sources */,
+				B51D445E2C52CDA800F296A7 /* SPUser+UserProtocol.swift in Sources */,
 				46A3C99D17DFA81A002865AE /* SPAddCollaboratorsViewController.m in Sources */,
 				B52646AA22D3E04C00EBF299 /* UIViewController+Simplenote.swift in Sources */,
 				B55E428C22A1A4550018C0CE /* SPSortOrderViewController.swift in Sources */,
@@ -3689,7 +3656,6 @@
 				E215C79E180B228800AD36B5 /* SPTextField.m in Sources */,
 				A6DE79CE2552E6CC00BC69C6 /* TagListViewController.swift in Sources */,
 				B513F2B82319A9A40021CFA4 /* UITableViewCell+Simplenote.swift in Sources */,
-				A628BEC325ED703A00121B64 /* RemoteConstants.swift in Sources */,
 				B51F6DD52460D7540074DDD9 /* NSPredicate+Email.swift in Sources */,
 				B5C2EDF0255AFB6C00C09B32 /* PassthruView.swift in Sources */,
 				A6F4882325A8889E0050CFA8 /* UITextField+Tag.swift in Sources */,
@@ -3739,7 +3705,6 @@
 				375D24B121E01131007AB25A /* html5_blocks.c in Sources */,
 				B504D4DE23D2014200AEED27 /* IndexPath+Simplenote.swift in Sources */,
 				B5C99A512C45B94600728813 /* AuthenticationMode.swift in Sources */,
-				A6CC0B0725B8287F00F12A85 /* AccountRemote.swift in Sources */,
 				A61471B925D70C190065D849 /* PopoverViewController.swift in Sources */,
 				B536988D25646C9400817E30 /* CGRect+Simplenote.swift in Sources */,
 				B5E96B611BDE5ACA00D707F5 /* SPMarkdownParser.m in Sources */,
@@ -3748,7 +3713,6 @@
 				B59560E0251A46D500A06788 /* KeychainManager.swift in Sources */,
 				46A3C9AF17DFA81A002865AE /* NSString+Condensing.m in Sources */,
 				A6F487AF25A79D550050CFA8 /* BiometricAuthentication.swift in Sources */,
-				BA5768E3269A803F008B510E /* Remote.swift in Sources */,
 				A6F4881325A884CE0050CFA8 /* UITextInput+Simplenote.swift in Sources */,
 				B50F47A41D1D78EA00822748 /* SPRatingsHelper.m in Sources */,
 				371A8630213DF00E002E9120 /* SPPinLockManager.swift in Sources */,
@@ -3763,8 +3727,6 @@
 				A6CC0B1025B83FE400F12A85 /* AccountVerificationControllerTests.swift in Sources */,
 				A694ABB325D1687200CC3A2D /* NoteScrollPositionCacheTests.swift in Sources */,
 				A6E6CE7525A5B4A3005A92DB /* MockPinLockManager.swift in Sources */,
-				A6CC0B4425B8505700F12A85 /* MockURLSessionDataTask.swift in Sources */,
-				A6CC0B3625B8502800F12A85 /* MockURLSession.swift in Sources */,
 				B52F35D322F356F500724793 /* UserDefaults+Tests.swift in Sources */,
 				B511AEE9255A0A5E005B2159 /* InterlinkResultsControllerTests.swift in Sources */,
 				374F5EF521BF057E00B57E8B /* NSMutableAttributedStringStylingTests.swift in Sources */,
@@ -3777,13 +3739,11 @@
 				BAB017AB260ADDEB007A9CC3 /* MockTimerFactory.swift in Sources */,
 				B55AC57A22D27B9100D8CEB2 /* OptionsTests.swift in Sources */,
 				B543C7DF23CF6AB400003A80 /* NotesListControllerTests.swift in Sources */,
-				A6CC0B2D25B84FF200F12A85 /* AccountVerificationRemoteTests.swift in Sources */,
 				B5421F4023CE7A1C004DDC19 /* MockupStorage+Sample.swift in Sources */,
 				A6F4883225A891A70050CFA8 /* TagTextFieldInputValidatorTests.swift in Sources */,
 				A6E6CE9125A5B970005A92DB /* PinLockRemoveControllerTests.swift in Sources */,
 				B57401A025B7D9960058960E /* EmailVerificationTests.swift in Sources */,
 				A6E6CEC925A6053A005A92DB /* MockApplication.swift in Sources */,
-				BA18532826488DBC00D9A347 /* SignupRemoteTests.swift in Sources */,
 				BA3FB8CF25FEA0C500EA9A1B /* NoticeControllerTests.swift in Sources */,
 				BAB32C63269E4190005C72B2 /* RemoteResult+TestHelpers.swift in Sources */,
 				A645FA70254C5E69008A1519 /* NoteContentHelperTests.swift in Sources */,
@@ -6278,6 +6238,14 @@
 				minimumVersion = 1.3.0;
 			};
 		};
+		B51D44592C52CB4000F296A7 /* XCRemoteSwiftPackageReference "SimplenoteEndpoints-Swift" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "git@github.com:Automattic/SimplenoteEndpoints-Swift.git";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 1.0.0;
+			};
+		};
 		B59CACFA2541E05400958330 /* XCRemoteSwiftPackageReference "SimplenoteInterlinks-Swift" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "git@github.com:Automattic/SimplenoteInterlinks-Swift.git";
@@ -6335,6 +6303,11 @@
 			package = B50D2FB424E6DFAC00163FC3 /* XCRemoteSwiftPackageReference "SimplenoteSearch-Swift" */;
 			productName = SimplenoteSearch;
 		};
+		B51D445A2C52CB4000F296A7 /* SimplenoteEndpoints */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = B51D44592C52CB4000F296A7 /* XCRemoteSwiftPackageReference "SimplenoteEndpoints-Swift" */;
+			productName = SimplenoteEndpoints;
+		};
 		B59CACFB2541E05400958330 /* SimplenoteInterlinks */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = B59CACFA2541E05400958330 /* XCRemoteSwiftPackageReference "SimplenoteInterlinks-Swift" */;
diff --git a/Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved
index cd06d10ef..090b42b39 100644
--- a/Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,4 +1,5 @@
 {
+  "originHash" : "5c7dc5a8c3fa899620d4a2168cf121438ee740cb5c2b5fac978ee6263951dbe7",
   "pins" : [
     {
       "identity" : "automattic-tracks-ios",
@@ -27,6 +28,15 @@
         "version" : "8.18.0"
       }
     },
+    {
+      "identity" : "simplenoteendpoints-swift",
+      "kind" : "remoteSourceControl",
+      "location" : "git@github.com:Automattic/SimplenoteEndpoints-Swift.git",
+      "state" : {
+        "revision" : "3d1c0a5db39ca798a7de10e7faeef8ae66e941e6",
+        "version" : "1.0.0"
+      }
+    },
     {
       "identity" : "simplenotefoundation-swift",
       "kind" : "remoteSourceControl",
@@ -82,5 +92,5 @@
       }
     }
   ],
-  "version" : 2
+  "version" : 3
 }
diff --git a/Simplenote/AccountRemote.swift b/Simplenote/AccountRemote.swift
deleted file mode 100644
index d91a16121..000000000
--- a/Simplenote/AccountRemote.swift
+++ /dev/null
@@ -1,54 +0,0 @@
-import Foundation
-
-// MARK: - AccountVerificationRemote
-//
-class AccountRemote: Remote {
-    // MARK: Performing tasks
-
-    /// Send verification request for specified email address
-    ///
-    func verify(email: String, completion: @escaping (_ result: Result<Data?, RemoteError>) -> Void) {
-        let request = verificationURLRequest(with: email)
-
-        performDataTask(with: request, completion: completion)
-    }
-
-    /// Send account deletion request for user
-    ///
-    func requestDelete(_ user: SPUser, completion: @escaping (_ result: Result<Data?, RemoteError>) -> Void) {
-        let request = deleteRequest(with: user)
-        performDataTask(with: request, completion: completion)
-    }
-
-    // MARK: URL Requests
-
-    private func verificationURLRequest(with email: String) -> URLRequest {
-        let base64EncodedEmail = email.data(using: .utf8)!.base64EncodedString()
-        let verificationURL = URL(string: SimplenoteConstants.verificationURL)!
-
-        var request = URLRequest(url: verificationURL.appendingPathComponent(base64EncodedEmail),
-                                 cachePolicy: .reloadIgnoringLocalAndRemoteCacheData,
-                                 timeoutInterval: RemoteConstants.timeout)
-        request.httpMethod = RemoteConstants.Method.GET
-
-        return request
-    }
-
-    private func deleteRequest(with user: SPUser) -> URLRequest {
-        let url = URL(string: SimplenoteConstants.accountDeletionURL)!
-
-        var request = URLRequest(url: url,
-                                 cachePolicy: .reloadIgnoringLocalAndRemoteCacheData,
-                                 timeoutInterval: RemoteConstants.timeout)
-        request.httpMethod = RemoteConstants.Method.POST
-        request.setValue("application/json", forHTTPHeaderField: "Content-Type")
-
-        let body = [
-            "username": user.email.lowercased(),
-            "token": user.authToken
-        ]
-        request.httpBody = try? JSONEncoder().encode(body)
-
-        return request
-    }
-}
diff --git a/Simplenote/Classes/MagicLinkAuthenticator.swift b/Simplenote/Classes/MagicLinkAuthenticator.swift
index b5ba213f2..50046956e 100644
--- a/Simplenote/Classes/MagicLinkAuthenticator.swift
+++ b/Simplenote/Classes/MagicLinkAuthenticator.swift
@@ -1,4 +1,5 @@
 import Foundation
+import SimplenoteEndpoints
 
 
 // MARK: - Notifications
diff --git a/Simplenote/Classes/RemoteConstants.swift b/Simplenote/Classes/RemoteConstants.swift
deleted file mode 100644
index 4a081c0c2..000000000
--- a/Simplenote/Classes/RemoteConstants.swift
+++ /dev/null
@@ -1,12 +0,0 @@
-import Foundation
-
-// MARK: Remote Constants
-//
-struct RemoteConstants {
-    struct Method {
-        static let GET = "GET"
-        static let POST = "POST"
-    }
-
-    static let timeout: TimeInterval = 30
-}
diff --git a/Simplenote/Classes/SPAuthError.swift b/Simplenote/Classes/SPAuthError.swift
index dbea55c53..66c80ef8b 100644
--- a/Simplenote/Classes/SPAuthError.swift
+++ b/Simplenote/Classes/SPAuthError.swift
@@ -1,4 +1,6 @@
 import Foundation
+import SimplenoteEndpoints
+
 
 // MARK: - SPAuthError
 //
@@ -11,17 +13,38 @@ enum SPAuthError: Error {
     case unverifiedEmail
     case tooManyAttempts
     case generic
+    case requestNotFound
+    case invalidCode
     case unknown(statusCode: Int, response: String?, error: Error?)
 }
 
+
 // MARK: - SPAuthError Convenience Initializers
 //
 extension SPAuthError {
 
-    /// Returns the SPAuthError matching a given Simperium Login Error Code
+    /// Returns an AuthError matching a RemoteError (Login) Counterpart
+    ///
+    init(loginRemoteError: RemoteError) {
+        self = SPAuthError(loginErrorCode: loginRemoteError.statusCode, response: loginRemoteError.response, error: loginRemoteError.networkError)
+    }
+
+    /// Returns an AuthError matching a RemoteError (Signup) Counterpart
+    ///
+    init(signupRemoteError: RemoteError) {
+        self = SPAuthError(signupErrorCode: signupRemoteError.statusCode, response: signupRemoteError.response, error: signupRemoteError.networkError)
+    }
+
+    /// Returns the AuthError matching a given Simperium Login Error Code
     ///
     init(loginErrorCode: Int, response: String?, error: Error?) {
         switch loginErrorCode {
+        case .zero:
+            self = .network
+        case 400 where response == Constants.requestNotFound:
+            self = .requestNotFound
+        case 400 where response == Constants.invalidCode:
+            self = .invalidCode
         case 401 where response == Constants.compromisedPassword:
             self = .compromisedPassword
         case 401:
@@ -35,10 +58,12 @@ extension SPAuthError {
         }
     }
 
-    /// Returns the SPAuthError matching a given Simperium Signup Error Code
+    /// Returns the AuthError matching a given a Signup Error Code
     ///
     init(signupErrorCode: Int, response: String?, error: Error?) {
         switch signupErrorCode {
+        case .zero:
+            self = .network
         case 401:
             self = .signupBadCredentials
         case 409:
@@ -51,6 +76,7 @@ extension SPAuthError {
     }
 }
 
+
 // MARK: - SPAuthError Public Methods
 //
 extension SPAuthError {
@@ -90,6 +116,10 @@ extension SPAuthError {
             return NSLocalizedString("You must verify your email before being able to login.", comment: "Error for un verified email")
         case .tooManyAttempts:
             return NSLocalizedString("Too many login attempts. Try again later.", comment: "Error message for too many login attempts")
+        case .requestNotFound:
+            return NSLocalizedString("Your authentication code has expired. Please request a new one", comment: "Error message for Invalid Login Code")
+        case .invalidCode:
+            return NSLocalizedString("The code you've entered is not correct. Please try again", comment: "Error message for Invalid Login Code")
         default:
             return NSLocalizedString("We're having problems. Please try again soon.", comment: "Generic error")
         }
@@ -99,4 +129,6 @@ extension SPAuthError {
 private struct Constants {
     static let compromisedPassword = "compromised password"
     static let requiresVerification = "verification required"
+    static let requestNotFound = "request-not-found"
+    static let invalidCode = "invalid-code"
 }
diff --git a/Simplenote/Classes/SPAuthHandler.swift b/Simplenote/Classes/SPAuthHandler.swift
index 899b30b54..5d0fcdd9c 100644
--- a/Simplenote/Classes/SPAuthHandler.swift
+++ b/Simplenote/Classes/SPAuthHandler.swift
@@ -1,5 +1,6 @@
 import Foundation
 import SafariServices
+import SimplenoteEndpoints
 
 // MARK: - SPAuthHandler
 //
@@ -55,15 +56,13 @@ class SPAuthHandler {
 
     /// Requests an Authentication Email
     ///
-    func requestLoginEmail(username: String, onCompletion: @escaping (SPAuthError?) -> Void) {
+    @MainActor
+    func requestLoginEmail(username: String) async throws {
         let remote = LoginRemote()
-        remote.requestLoginEmail(email: username) { (result) in
-            switch result {
-            case .success:
-                onCompletion(nil)
-            case .failure(let error):
-                onCompletion(self.authenticationError(for: error))
-            }
+        do {
+            try await remote.requestLoginEmail(email: username)
+        } catch let remoteError as RemoteError {
+            throw SPAuthError(loginRemoteError: remoteError)
         }
     }
 
@@ -76,8 +75,8 @@ class SPAuthHandler {
             let confirmation = try await remote.requestLoginConfirmation(email: username, authCode: code.uppercased())
             simperiumService.authenticate(withUsername: confirmation.username, token: confirmation.syncToken)
             
-        } catch let error as RemoteError {
-            throw authenticationError(for: error)
+        } catch let remoteError as RemoteError {
+            throw SPAuthError(loginRemoteError: remoteError)
         }
     }
 
@@ -90,27 +89,17 @@ class SPAuthHandler {
     ///     - onCompletion: Closure to be executed on completion
     ///
     func signupWithCredentials(username: String, onCompletion: @escaping (SPAuthError?) -> Void) {
-        SignupRemote().signup(with: username) { (result) in
+        SignupRemote().requestSignup(email: username) { (result) in
             switch result {
             case .success:
                 onCompletion(nil)
-            case .failure(let error):
-                onCompletion(self.authenticationError(for: error))
+            case .failure(let remoteError):
+                let error = SPAuthError(signupRemoteError: remoteError)
+                onCompletion(error)
             }
         }
     }
 
-    private func authenticationError(for remoteError: RemoteError) -> SPAuthError {
-        switch remoteError {
-        case .network:
-            return .network
-        case .tooManyAttempts:
-            return .tooManyAttempts
-        case .requestError(let statusCode, let error):
-            return SPAuthError(signupErrorCode: statusCode, response: error?.localizedDescription, error: error)
-        }
-    }
-
     /// Presents the Password Reset (Web) Interface
     ///
     func presentPasswordReset(from sourceViewController: UIViewController, username: String) {
diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index c3f50f191..e3a323041 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -2,6 +2,8 @@ import Foundation
 import UIKit
 import SafariServices
 import SwiftUI
+import SimplenoteEndpoints
+
 
 // MARK: - SPAuthViewController
 //
@@ -433,24 +435,52 @@ extension SPAuthViewController {
         guard ensureWarningsAreOnScreenWhenNeeded() else {
             return
         }
-        
+
+        Task { @MainActor in
+            await requestLogInCodeAsync()
+        }
+    }
+    
+    @MainActor
+    private func requestLogInCodeAsync() async {
         lockdownInterface()
 
-        controller.requestLoginEmail(username: email) { error in
-            switch error {
-            case .none:
-                self.presentCodeInterface()
-                SPTracker.trackLoginLinkRequested()
-                
-            case .tooManyAttempts:
-                self.presentPasswordInterfaceWithRateLimitingHeader()
-                
-            case .some(let error):
-                self.handleError(error: error)
-            }
+        do {
+            try await controller.requestLoginEmail(username: email)
+            self.presentCodeInterface()
+            SPTracker.trackLoginLinkRequested()
+            
+        } catch SPAuthError.tooManyAttempts {
+            self.presentPasswordInterfaceWithRateLimitingHeader()
 
-            self.unlockInterface()
+        } catch {
+            let error = error as? SPAuthError ?? .generic
+            self.handleError(error: error)
         }
+        
+        self.unlockInterface()
+    }
+
+    /// Requests a new Login Code, without pushing any secondary UI on success
+    ///
+    @IBAction func requestLogInCodeAndDontPush() {
+        Task { @MainActor in
+            await self.requestLogInCodeAndDontPushAsync()
+        }
+    }
+
+    /// Requests a new Login Code, without pushing any secondary UI on success. Asynchronous API!
+    ///
+    @MainActor
+    private func requestLogInCodeAndDontPushAsync() async {
+        do {
+            try await controller.requestLoginEmail(username: email)
+        } catch {
+            let error = error as? SPAuthError ?? .generic
+            self.handleError(error: error)
+        }
+        
+        SPTracker.trackLoginLinkRequested()
     }
     
     @IBAction func performLogInWithCode() {
@@ -517,7 +547,7 @@ extension SPAuthViewController {
     }
     
     @IBAction func presentPasswordInterface() {
-        presentPasswordInterfaceWithHeader(header: nil)
+        presentPasswordInterfaceWithHeader(header: AuthenticationStrings.loginWithEmailEmailHeader)
     }
     
     @IBAction func presentPasswordInterfaceWithRateLimitingHeader() {
@@ -613,6 +643,8 @@ private extension SPAuthViewController {
             presentPasswordCompromisedError(error: error)
         case .unverifiedEmail:
             presentUserUnverifiedError(error: error, email: email)
+        case .requestNotFound:
+            presentLoginCodeExpiredError()
         case .unknown(let statusCode, let response, let error) where debugEnabled:
             let details = NSAttributedString.stringFromNetworkError(statusCode: statusCode, response: response, error: error)
             presentDebugDetails(details: details)
@@ -640,6 +672,14 @@ private extension SPAuthViewController {
 
         present(alertController, animated: true, completion: nil)
     }
+    
+    func presentLoginCodeExpiredError() {
+        let alertController = UIAlertController.buildLoginCodeNotFoundAlert {
+            self.navigationController?.popViewController(animated: true)
+        }
+        
+        present(alertController, animated: true, completion: nil)
+    }
 
     func presentUserUnverifiedError(error: SPAuthError, email: String) {
         let alertController = UIAlertController(title: error.title, message: error.message, preferredStyle: .alert)
@@ -854,6 +894,7 @@ private enum AuthenticationStrings {
     static let acceptActionText             = NSLocalizedString("Accept", comment: "Accept Action")
     static let cancelActionText             = NSLocalizedString("Cancel", comment: "Cancel Action")
     static let loginActionText              = NSLocalizedString("Log In", comment: "Log In Action")
+    static let loginWithEmailEmailHeader    = NSLocalizedString("Enter the password for the account {{EMAIL}}", comment: "Header for Login With Password. Please preserve the {{EMAIL}} substring")
     static let loginWithEmailLimitHeader    = NSLocalizedString("Log in with email failed, please enter your password", comment: "Header for Enter Password UI, when the user performed too many requests")
     static let compromisedAlertCancel       = NSLocalizedString("Cancel", comment: "Cancel action for password alert")
     static let compromisedAlertReset        = NSLocalizedString("Change Password", comment: "Change password action")
diff --git a/Simplenote/Classes/SPSettingsViewController+Extensions.swift b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
index fb9bcead3..7c0bb73a9 100644
--- a/Simplenote/Classes/SPSettingsViewController+Extensions.swift
+++ b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
@@ -1,4 +1,6 @@
 import UIKit
+import SimplenoteEndpoints
+
 
 // MARK: - Subscriber UI
 //
@@ -188,12 +190,7 @@ extension SPSettingsViewController {
     }
 
     private func handleError(_ error: RemoteError) {
-        switch error {
-        case .network:
-            NoticeController.shared.present(NoticeFactory.networkError())
-        default:
-            presentRequestErrorAlert()
-        }
+        presentRequestErrorAlert()
     }
 
     private func presentSuccessAlert(for user: SPUser) {
diff --git a/Simplenote/Classes/SignupRemote.swift b/Simplenote/Classes/SignupRemote.swift
deleted file mode 100644
index 8a947250a..000000000
--- a/Simplenote/Classes/SignupRemote.swift
+++ /dev/null
@@ -1,24 +0,0 @@
-import Foundation
-
-// MARK: - SignupRemote
-//
-class SignupRemote: Remote {
-    func signup(with email: String, completion: @escaping (_ result: Result<Data?, RemoteError>) -> Void) {
-        let urlRequest = request(with: email)
-
-        performDataTask(with: urlRequest, completion: completion)
-    }
-
-    private func request(with email: String) -> URLRequest {
-        let url = URL(string: SimplenoteConstants.signupURL)!
-
-        var request = URLRequest(url: url,
-                                 cachePolicy: .reloadIgnoringLocalAndRemoteCacheData,
-                                 timeoutInterval: RemoteConstants.timeout)
-        request.httpMethod = RemoteConstants.Method.POST
-        request.setValue("application/json", forHTTPHeaderField: "Content-Type")
-        request.httpBody = try? JSONEncoder().encode(["username": email.lowercased()])
-
-        return request
-    }
-}
diff --git a/Simplenote/Controllers/AccountDeletionController.swift b/Simplenote/Controllers/AccountDeletionController.swift
index c5251a05d..ac248de09 100644
--- a/Simplenote/Controllers/AccountDeletionController.swift
+++ b/Simplenote/Controllers/AccountDeletionController.swift
@@ -1,4 +1,5 @@
 import Foundation
+import SimplenoteEndpoints
 
 @objc
 class AccountDeletionController: NSObject {
diff --git a/Simplenote/LoginRemote.swift b/Simplenote/LoginRemote.swift
deleted file mode 100644
index b69fce3f6..000000000
--- a/Simplenote/LoginRemote.swift
+++ /dev/null
@@ -1,46 +0,0 @@
-import Foundation
-
-// MARK: - LoginRemote
-//
-class LoginRemote: Remote {
-
-    func requestLoginEmail(email: String, completion: @escaping (_ result: Result<Data?, RemoteError>) -> Void) {
-        let request = requestForLoginRequest(email: email)
-        performDataTask(with: request, completion: completion)
-    }
-
-    func requestLoginConfirmation(email: String, authCode: String) async throws -> LoginConfirmationResponse {
-        let request = requestForLoginCompletion(email: email, authCode: authCode)
-        return try await performDataTask(with: request, type: LoginConfirmationResponse.self)
-    }
-}
-
-
-// MARK: - LoginConfirmationResponse
-//
-struct LoginConfirmationResponse: Decodable {
-    let username: String
-    let syncToken: String
-}
-
-
-// MARK: - Private API(s)
-//
-private extension LoginRemote {
-
-    func requestForLoginRequest(email: String) -> URLRequest {
-        let url = URL(string: SimplenoteConstants.loginRequestURL)!
-        return requestForURL(url, method: RemoteConstants.Method.POST, httpBody: [
-            "request_source": SimplenoteConstants.simplenotePlatformName,
-            "username": email.lowercased()
-        ])
-    }
-
-    func requestForLoginCompletion(email: String, authCode: String) -> URLRequest {
-        let url = URL(string: SimplenoteConstants.loginCompletionURL)!
-        return requestForURL(url, method: RemoteConstants.Method.POST, httpBody: [
-            "auth_code": authCode,
-            "username": email
-        ])
-    }
-}
diff --git a/Simplenote/Remote.swift b/Simplenote/Remote.swift
deleted file mode 100644
index 5c32883ea..000000000
--- a/Simplenote/Remote.swift
+++ /dev/null
@@ -1,73 +0,0 @@
-import Foundation
-
-class Remote {
-    private let urlSession: URLSession
-
-    init(urlSession: URLSession = URLSession.shared) {
-        self.urlSession = urlSession
-    }
-
-    /// Send  task for remote
-    /// Sublcassing Notes: To be able to send a task it is required to first setup the URL request for the task to use
-    ///
-    func performDataTask(with request: URLRequest, completion: @escaping (_ result: Result<Data?, RemoteError>) -> Void) {
-        let dataTask = urlSession.dataTask(with: request) { (data, response, dataTaskError) in
-            DispatchQueue.main.async {
-                
-                if let error = RemoteError(statusCode: response?.responseStatusCode ?? .zero, error: dataTaskError) {
-                    completion(.failure(error))
-                    return
-                }
-
-                completion(.success(data))
-            }
-        }
-
-        dataTask.resume()
-    }
-
-    /// Performs a URLSession Data Task
-    ///
-    func performDataTask(with request: URLRequest) async throws -> Data {
-        let (data, response) = try await urlSession.data(for: request)
-
-        if let error = RemoteError(statusCode: response.responseStatusCode) {
-            throw error
-        }
-        
-        return data
-    }
-    
-    /// Performs a URLSession Data Task, and decodes a given Type
-    ///
-    func performDataTask<T: Decodable>(with request: URLRequest, type: T.Type) async throws -> T {
-        let data = try await performDataTask(with: request)
-
-        let decoder = JSONDecoder()
-        decoder.keyDecodingStrategy = .convertFromSnakeCase
-        return try decoder.decode(type, from: data)
-    }
-    
-    /// Builds a URLRequest for the specified URL / Method / params
-    ///
-    func requestForURL(_ url: URL, method: String, httpBody: [String: String]?) -> URLRequest {
-        var request = URLRequest(url: url, cachePolicy: .reloadIgnoringLocalAndRemoteCacheData, timeoutInterval: RemoteConstants.timeout)
-
-        request.httpMethod = method
-        request.setValue("application/json", forHTTPHeaderField: "Content-Type")
-        
-        if let httpBody {
-            request.httpBody = try? JSONEncoder().encode(httpBody)
-        }
-
-        return request
-    }
-}
-
-
-extension URLResponse {
-    
-    var responseStatusCode: Int {
-        (self as? HTTPURLResponse)?.statusCode ?? .zero
-    }
-}
diff --git a/Simplenote/RemoteError.swift b/Simplenote/RemoteError.swift
deleted file mode 100644
index 4366d98e1..000000000
--- a/Simplenote/RemoteError.swift
+++ /dev/null
@@ -1,38 +0,0 @@
-import Foundation
-
-enum RemoteError: Error {
-    case network
-    case tooManyAttempts
-    case requestError(Int, Error?)
-}
-
-
-extension RemoteError {
-    
-    init?(statusCode: Int, error: Error? = nil) {
-        if statusCode / 100 == 2 {
-            return nil
-        }
-        
-        switch statusCode {
-        case 429:
-            self = .tooManyAttempts
-        default:
-            self = statusCode > 0 ? .requestError(statusCode, error) : .network
-        }
-    }
-}
-
-
-extension RemoteError: Equatable {
-    static func == (lhs: RemoteError, rhs: RemoteError) -> Bool {
-        switch (lhs, rhs) {
-        case (.network, .network):
-            return true
-        case (.requestError(let lhsStatus, let lhsError), .requestError(let rhsStatus, let rhsError)):
-            return lhsStatus == rhsStatus && lhsError?.localizedDescription == rhsError?.localizedDescription
-        default:
-            return false
-        }
-    }
-}
diff --git a/Simplenote/SPUser+UserProtocol.swift b/Simplenote/SPUser+UserProtocol.swift
new file mode 100644
index 000000000..b555a4e96
--- /dev/null
+++ b/Simplenote/SPUser+UserProtocol.swift
@@ -0,0 +1,8 @@
+import Foundation
+import SimplenoteEndpoints
+import Simperium
+
+
+// MARK: - Simperium's SPUser Conformance
+//
+extension SPUser: UserProtocol { }
diff --git a/Simplenote/UIAlertController+Auth.swift b/Simplenote/UIAlertController+Auth.swift
new file mode 100644
index 000000000..73702271f
--- /dev/null
+++ b/Simplenote/UIAlertController+Auth.swift
@@ -0,0 +1,22 @@
+import Foundation
+
+
+// MARK: - UIAlertController Helpers
+//
+extension UIAlertController {
+    
+    /// Builds an alert indicating that the Login Code has Expired
+    ///
+    static func buildLoginCodeNotFoundAlert(onRequestCode: @escaping () -> Void) -> UIAlertController {
+        let title = NSLocalizedString("Sorry!", comment: "Email TextField Placeholder")
+        let message = NSLocalizedString("The authentication code you've requested has expired. Please request a new one", comment: "Email TextField Placeholder")
+        let acceptText = NSLocalizedString("Accept", comment: "Accept Message")
+
+        let alertController = UIAlertController(title: title, message: message, preferredStyle: .alert)
+        alertController.addDefaultActionWithTitle(acceptText) { _ in
+            onRequestCode()
+        }
+        
+        return alertController
+    }
+}
diff --git a/Simplenote/URLRequest+Simplenote.swift b/Simplenote/URLRequest+Simplenote.swift
deleted file mode 100644
index 5adddd4cf..000000000
--- a/Simplenote/URLRequest+Simplenote.swift
+++ /dev/null
@@ -1,13 +0,0 @@
-import Foundation
-
-extension URLRequest {
-    func decodeHtmlBody<T: Decodable>() throws -> T? {
-          guard let _ = httpBody else {
-              return nil
-          }
-
-          return try httpBody.map {
-            try JSONDecoder().decode(T.self, from: $0)
-          }
-      }
-}
diff --git a/Simplenote/Verification/AccountVerificationController.swift b/Simplenote/Verification/AccountVerificationController.swift
index 4bab434a6..3f11cc042 100644
--- a/Simplenote/Verification/AccountVerificationController.swift
+++ b/Simplenote/Verification/AccountVerificationController.swift
@@ -1,4 +1,5 @@
 import Foundation
+import SimplenoteEndpoints
 
 // MARK: - AccountVerificationController
 //
diff --git a/SimplenoteTests/Network/MockURLSession.swift b/SimplenoteTests/Network/MockURLSession.swift
deleted file mode 100644
index 70b5042d2..000000000
--- a/SimplenoteTests/Network/MockURLSession.swift
+++ /dev/null
@@ -1,15 +0,0 @@
-import Foundation
-
-// MARK: - MockURLSession
-//
-class MockURLSession: URLSession {
-    var data: (Data?, URLResponse?, Error?)?
-    var lastRequest: URLRequest?
-
-    override func dataTask(with request: URLRequest, completionHandler: @escaping (Data?, URLResponse?, Error?) -> Void) -> URLSessionDataTask {
-        lastRequest = request
-        return MockURLSessionDataTask {
-            completionHandler(self.data?.0, self.data?.1, self.data?.2)
-        }
-    }
-}
diff --git a/SimplenoteTests/Network/MockURLSessionDataTask.swift b/SimplenoteTests/Network/MockURLSessionDataTask.swift
deleted file mode 100644
index 32a97ea9a..000000000
--- a/SimplenoteTests/Network/MockURLSessionDataTask.swift
+++ /dev/null
@@ -1,15 +0,0 @@
-import Foundation
-
-// MARK: - MockURLSessionDataTask
-//
-class MockURLSessionDataTask: URLSessionDataTask {
-    private let completion: () -> Void
-
-    init(completion: @escaping () -> Void) {
-        self.completion = completion
-    }
-
-    override func resume() {
-        completion()
-    }
-}
diff --git a/SimplenoteTests/RemoteResult+TestHelpers.swift b/SimplenoteTests/RemoteResult+TestHelpers.swift
index 585b9ae16..ba37ff02f 100644
--- a/SimplenoteTests/RemoteResult+TestHelpers.swift
+++ b/SimplenoteTests/RemoteResult+TestHelpers.swift
@@ -1,4 +1,5 @@
 import Foundation
+import SimplenoteEndpoints
 @testable import Simplenote
 
 extension Remote {
@@ -7,6 +8,6 @@ extension Remote {
             return .success(nil)
         }
 
-        return .failure(RemoteError.requestError(0, nil))
+        return .failure(RemoteError(statusCode: 0, response: nil, networkError: nil))
     }
 }
diff --git a/SimplenoteTests/SignupRemoteTests.swift b/SimplenoteTests/SignupRemoteTests.swift
deleted file mode 100644
index 239dbb818..000000000
--- a/SimplenoteTests/SignupRemoteTests.swift
+++ /dev/null
@@ -1,75 +0,0 @@
-import XCTest
-@testable import Simplenote
-
-class SignupRemoteTests: XCTestCase {
-    private lazy var urlSession = MockURLSession()
-    private lazy var signupRemote = SignupRemote(urlSession: urlSession)
-
-    func testSuccessWhenStatusCodeIs2xx() {
-        for _ in 0..<5 {
-            test(withStatusCode: Int.random(in: 200..<300), email: "email@gmail.com", expectedResult: .success(nil))
-        }
-    }
-
-    func testFailureWhenStatusCodeIs4xxOr5xx() {
-        for _ in 0..<5 {
-            let statusCode = Int.random(in: 400..<600)
-            test(withStatusCode: statusCode, email: "email@gmail.com", expectedResult: .failure(RemoteError.requestError(statusCode, nil)))
-        }
-    }
-
-    func testRequestSetsEmailToCorrectCase() throws {
-        signupRemote.signup(with: "EMAIL@gmail.com", completion: { _ in })
-
-        let expecation = "email@gmail.com"
-        let body: Dictionary<String, String> = try XCTUnwrap(urlSession.lastRequest?.decodeHtmlBody())
-        let decodedEmail = try XCTUnwrap(body["username"])
-
-        XCTAssertEqual(expecation, decodedEmail)
-    }
-
-    func testRequestSetsEmailToCorrectCaseWithSpecialCharacters() throws {
-        signupRemote.signup(with: "EMAIL123456@#$%^@gmail.com", completion: { _ in })
-
-        let expecation = "email123456@#$%^@gmail.com"
-        let body: Dictionary<String, String> = try XCTUnwrap(urlSession.lastRequest?.decodeHtmlBody())
-        let decodedEmail = try XCTUnwrap(body["username"])
-
-        XCTAssertEqual(expecation, decodedEmail)
-    }
-
-    func testRequestSetsEmailToCorrectCaseWithMixedCase() throws {
-        signupRemote.signup(with: "eMaIl@gmail.com", completion: { _ in })
-
-        let expecation = "email@gmail.com"
-        let body: Dictionary<String, String> = try XCTUnwrap(urlSession.lastRequest?.decodeHtmlBody())
-        let decodedEmail = try XCTUnwrap(body["username"])
-
-        XCTAssertEqual(expecation, decodedEmail)
-    }
-
-    private func test(withStatusCode statusCode: Int?, email: String, expectedResult: Result<Data?, RemoteError>) {
-        urlSession.data = (nil,
-                           response(with: statusCode),
-                           nil)
-
-        let expectation = self.expectation(description: "Verify is called")
-
-        signupRemote.signup(with: email) { (result) in
-            XCTAssertEqual(result, expectedResult)
-            expectation.fulfill()
-        }
-
-        waitForExpectations(timeout: Constants.expectationTimeout, handler: nil)
-    }
-
-    private func response(with statusCode: Int?) -> HTTPURLResponse? {
-        guard let statusCode = statusCode else {
-            return nil
-        }
-        return HTTPURLResponse(url: URL(fileURLWithPath: "/"),
-                               statusCode: statusCode,
-                               httpVersion: nil,
-                               headerFields: nil)
-    }
-}
diff --git a/SimplenoteTests/Verification/AccountVerificationControllerTests.swift b/SimplenoteTests/Verification/AccountVerificationControllerTests.swift
index 39790a9ef..fe5b29921 100644
--- a/SimplenoteTests/Verification/AccountVerificationControllerTests.swift
+++ b/SimplenoteTests/Verification/AccountVerificationControllerTests.swift
@@ -1,4 +1,5 @@
 import XCTest
+import SimplenoteEndpoints
 @testable import Simplenote
 
 // MARK: - AccountVerificationControllerTests
diff --git a/SimplenoteTests/Verification/AccountVerificationRemoteTests.swift b/SimplenoteTests/Verification/AccountVerificationRemoteTests.swift
deleted file mode 100644
index 6443b0d14..000000000
--- a/SimplenoteTests/Verification/AccountVerificationRemoteTests.swift
+++ /dev/null
@@ -1,51 +0,0 @@
-import XCTest
-@testable import Simplenote
-
-// MARK: - AccountVerificationRemoteTests
-//
-class AccountVerificationRemoteTests: XCTestCase {
-    private lazy var urlSession = MockURLSession()
-    private lazy var remote = AccountRemote(urlSession: urlSession)
-
-    func testSuccessWhenStatusCodeIs2xx() {
-        for _ in 0..<5 {
-            test(withStatusCode: Int.random(in: 200..<300), expectedResult: .success(nil))
-        }
-    }
-
-    func testFailureWhenStatusCodeIs4xxOr5xx() {
-        for _ in 0..<5 {
-            let statusCode = Int.random(in: 400..<600)
-            test(withStatusCode: statusCode, expectedResult: .failure(RemoteError.requestError(statusCode, nil)))
-        }
-    }
-
-    func testFailureWhenNoResponse() {
-        test(withStatusCode: nil, expectedResult: .failure(RemoteError.network))
-    }
-
-    private func test(withStatusCode statusCode: Int?, expectedResult: Result<Data?, RemoteError>) {
-        urlSession.data = (nil,
-                           response(with: statusCode),
-                           nil)
-
-        let expectation = self.expectation(description: "Verify is called")
-
-        remote.verify(email: UUID().uuidString) { (result) in
-            XCTAssertEqual(result, expectedResult)
-            expectation.fulfill()
-        }
-
-        waitForExpectations(timeout: 3, handler: nil)
-    }
-
-    private func response(with statusCode: Int?) -> HTTPURLResponse? {
-        guard let statusCode = statusCode else {
-            return nil
-        }
-        return HTTPURLResponse(url: URL(fileURLWithPath: "/"),
-                               statusCode: statusCode,
-                               httpVersion: nil,
-                               headerFields: nil)
-    }
-}
diff --git a/SimplenoteTests/Verification/Helpers/MockAccountVerificationRemote.swift b/SimplenoteTests/Verification/Helpers/MockAccountVerificationRemote.swift
index f09f4f411..d4add1b4e 100644
--- a/SimplenoteTests/Verification/Helpers/MockAccountVerificationRemote.swift
+++ b/SimplenoteTests/Verification/Helpers/MockAccountVerificationRemote.swift
@@ -1,4 +1,5 @@
 import XCTest
+@testable import SimplenoteEndpoints
 @testable import Simplenote
 
 class MockAccountVerificationRemote: AccountRemote {

From befd01a0cbb50a8168655a0e556a87981ef8ea54 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 22 Jul 2024 10:42:53 +1000
Subject: [PATCH 358/547] Update `release-toolkit` to latest version 11.0.3

---
 Gemfile      |  2 +-
 Gemfile.lock | 64 +++++++++++++++++++++++++++-------------------------
 2 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/Gemfile b/Gemfile
index a2653bc3a..afbcb9832 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,7 @@ gem 'danger-dangermattic', '~> 1.0'
 gem 'fastlane', '~> 2'
 gem 'fastlane-plugin-appcenter', '~> 2.1.2'
 gem 'fastlane-plugin-sentry', '~> 1.6'
-gem 'fastlane-plugin-wpmreleasetoolkit', '~> 11.0.1'
+gem 'fastlane-plugin-wpmreleasetoolkit', '~> 11.0', '>= 11.0.1'
 
 group :screenshots, optional: true do
   gem 'rmagick', '~> 3.2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5f2447ee7..5e891f661 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,7 +5,7 @@ GEM
       base64
       nkf
       rexml
-    activesupport (7.1.3.2)
+    activesupport (7.1.3.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -15,8 +15,8 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
@@ -24,24 +24,24 @@ GEM
     ast (2.4.2)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.921.0)
-    aws-sdk-core (3.193.0)
+    aws-partitions (1.957.0)
+    aws-sdk-core (3.201.2)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.80.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.148.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
+    aws-sdk-kms (1.88.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.156.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.8)
+      aws-sigv4 (~> 1.5)
     aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.2.0)
-    bigdecimal (3.1.7)
+    bigdecimal (3.1.8)
     buildkit (1.6.0)
       sawyer (>= 0.6)
     chroma (0.2.0)
@@ -91,7 +91,7 @@ GEM
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
     cork (0.3.0)
       colored2 (~> 3.1)
@@ -129,7 +129,7 @@ GEM
     escape (0.0.4)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    excon (0.110.0)
+    excon (0.111.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -161,7 +161,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.3.1)
-    fastlane (2.220.0)
+    fastlane (2.221.1)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -205,7 +205,7 @@ GEM
     fastlane-plugin-appcenter (2.1.2)
     fastlane-plugin-sentry (1.22.0)
       os (~> 1.1, >= 1.1.4)
-    fastlane-plugin-wpmreleasetoolkit (11.0.1)
+    fastlane-plugin-wpmreleasetoolkit (11.0.3)
       activesupport (>= 6.1.7.1)
       buildkit (~> 1.5)
       chroma (= 0.2.0)
@@ -266,27 +266,27 @@ GEM
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.5)
+    http-cookie (1.0.6)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.14.4)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     java-properties (0.3.0)
     jmespath (1.6.2)
     json (2.7.2)
-    jwt (2.8.1)
+    jwt (2.8.2)
       base64
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     language_server-protocol (3.17.0.3)
-    mini_magick (4.12.0)
+    mini_magick (4.13.2)
     mini_mime (1.1.5)
-    minitest (5.22.3)
+    minitest (5.24.1)
     molinillo (0.8.0)
     multi_json (1.15.0)
-    multipart-post (2.4.0)
+    multipart-post (2.4.1)
     mutex_m (0.2.0)
     nanaimo (0.3.0)
     nap (1.1.0)
@@ -294,9 +294,9 @@ GEM
     netrc (0.11.0)
     nkf (0.2.0)
     no_proxy_fix (0.1.2)
-    nokogiri (1.16.4-arm64-darwin)
+    nokogiri (1.16.6-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.4-x86_64-linux)
+    nokogiri (1.16.6-x86_64-linux)
       racc (~> 1.4)
     octokit (6.1.1)
       faraday (>= 1, < 3)
@@ -305,16 +305,16 @@ GEM
     options (2.3.2)
     optparse (0.5.0)
     os (1.1.4)
-    parallel (1.24.0)
+    parallel (1.25.1)
     parser (3.3.1.0)
       ast (~> 2.4.1)
       racc
     plist (3.7.1)
-    progress_bar (1.3.3)
-      highline (>= 1.6, < 3)
+    progress_bar (1.3.4)
+      highline (>= 1.6)
       options (~> 2.3.0)
     public_suffix (4.0.7)
-    racc (1.7.3)
+    racc (1.8.0)
     rainbow (3.1.1)
     rake (13.2.1)
     rake-compiler (1.2.7)
@@ -326,7 +326,8 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.6)
+    rexml (3.2.9)
+      strscan
     rmagick (3.2.0)
     rouge (2.0.7)
     rubocop (1.63.4)
@@ -358,6 +359,7 @@ GEM
     simctl (1.6.10)
       CFPropertyList
       naturally
+    strscan (3.1.0)
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -397,8 +399,8 @@ DEPENDENCIES
   fastlane (~> 2)
   fastlane-plugin-appcenter (~> 2.1.2)
   fastlane-plugin-sentry (~> 1.6)
-  fastlane-plugin-wpmreleasetoolkit (~> 11.0.1)
+  fastlane-plugin-wpmreleasetoolkit (~> 11.0, >= 11.0.1)
   rmagick (~> 3.2.0)
 
 BUNDLED WITH
-   2.5.4
+   2.4.21

From 57b469db032d60ec19308880a26c73ec08846e2e Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 22 Jul 2024 10:48:12 +1000
Subject: [PATCH 359/547] Remove unused `Pluginfile` import from `Gemfile`

---
 Gemfile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index afbcb9832..085001d07 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,6 +13,3 @@ gem 'fastlane-plugin-wpmreleasetoolkit', '~> 11.0', '>= 11.0.1'
 group :screenshots, optional: true do
   gem 'rmagick', '~> 3.2.0'
 end
-
-plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
-eval_gemfile(plugins_path) if File.exist?(plugins_path)

From 53ea92eab996425106ad064778d45c5967d40bf1 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Sat, 27 Jul 2024 08:36:41 +1000
Subject: [PATCH 360/547] Move lane to generate strings to dedicated file

---
 fastlane/Fastfile              | 45 ++----------------------------
 fastlane/lanes/localization.rb | 51 ++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 43 deletions(-)
 create mode 100644 fastlane/lanes/localization.rb

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 2bca74ae3..518a918d1 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -16,6 +16,8 @@ SECRETS_ROOT = File.join(Dir.home, '.configure', 'simplenote-ios', 'secrets')
 APP_STORE_CONNECT_KEY_PATH = File.join(SECRETS_ROOT, 'app_store_connect_fastlane_api_key.json')
 $used_test_account_index = nil
 
+import 'lanes/localization'
+
 before_all do
   # Ensure we use the latest version of the toolkit
   check_for_toolkit_updates unless is_ci || ENV['FASTLANE_SKIP_TOOLKIT_UPDATE_CHECK']
@@ -47,32 +49,6 @@ GITHUB_REPO = 'Automattic/simplenote-ios'
 APP_STORE_BUNDLE_IDENTIFIER = 'com.codality.NotationalFlow'
 DEFAULT_BRANCH = 'trunk'
 
-# List of locales used for the app strings (GlotPress code => `*.lproj` folder name`)
-#
-# TODO: Replace with `LocaleHelper` once provided by release toolkit (https://github.com/wordpress-mobile/release-toolkit/pull/296)
-GLOTPRESS_TO_LPROJ_APP_LOCALE_CODES = {
-  'ar' => 'ar',             # Arabic
-  'cy' => 'cy',             # Welsh
-  'de' => 'de',             # German
-  'el' => 'el',             # Greek
-  'en' => 'en',             # English
-  'es' => 'es',             # Spanish
-  'fa' => 'fa',             # Persian
-  'fr' => 'fr',             # French
-  'he' => 'he',             # Hebrew
-  'id' => 'id',             # Indonesian
-  'it' => 'it',             # Italian
-  'ja' => 'ja',             # Japanese
-  'ko' => 'ko',             # Korean
-  'nl' => 'nl',             # Dutch
-  'pt-br' => 'pt-BR',       # Portuguese (Brazil)
-  'ru' => 'ru',             # Russian
-  'sv' => 'sv',             # Swedish
-  'tr' => 'tr',             # Turkish
-  'zh-cn' => 'zh-Hans-CN',  # Chinese (China)
-  'zh-tw' => 'zh-Hant-TW'   # Chinese (Taiwan)
-}.freeze
-
 ########################################################################
 # Environment
 ########################################################################
@@ -1128,23 +1104,6 @@ end
 # Localization Lanes
 ########################################################################
 
-desc 'Updates the main `Localizable.strings` file — that will be imported by GlotPress'
-lane :generate_strings_file_for_glotpress do
-  en_lproj_path = File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'en.lproj')
-  ios_generate_strings_file_from_code(
-    paths: ['Simplenote/', 'SimplenoteIntents/', 'SimplenoteShare/',
-            'SimplenoteWidgets/', 'Pods/Simperium/Simperium/',
-            'Pods/Simperium/Simperium-iOS'],
-    output_dir: en_lproj_path
-  )
-
-  git_commit(
-    path: en_lproj_path,
-    message: 'Freeze strings for localization',
-    allow_nothing_to_commit: true
-  )
-end
-
 ########################################################################
 # Helper Lanes
 ########################################################################
diff --git a/fastlane/lanes/localization.rb b/fastlane/lanes/localization.rb
new file mode 100644
index 000000000..95b54c8e2
--- /dev/null
+++ b/fastlane/lanes/localization.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+# List of locales used for the app strings (GlotPress code => `*.lproj` folder name`)
+#
+# TODO: Replace with `LocaleHelper` once provided by release toolkit (https://github.com/wordpress-mobile/release-toolkit/pull/296)
+GLOTPRESS_TO_LPROJ_APP_LOCALE_CODES = {
+  'ar' => 'ar',             # Arabic
+  'cy' => 'cy',             # Welsh
+  'de' => 'de',             # German
+  'el' => 'el',             # Greek
+  'en' => 'en',             # English
+  'es' => 'es',             # Spanish
+  'fa' => 'fa',             # Persian
+  'fr' => 'fr',             # French
+  'he' => 'he',             # Hebrew
+  'id' => 'id',             # Indonesian
+  'it' => 'it',             # Italian
+  'ja' => 'ja',             # Japanese
+  'ko' => 'ko',             # Korean
+  'nl' => 'nl',             # Dutch
+  'pt-br' => 'pt-BR',       # Portuguese (Brazil)
+  'ru' => 'ru',             # Russian
+  'sv' => 'sv',             # Swedish
+  'tr' => 'tr',             # Turkish
+  'zh-cn' => 'zh-Hans-CN',  # Chinese (China)
+  'zh-tw' => 'zh-Hant-TW'   # Chinese (Taiwan)
+}.freeze
+
+platform :ios do
+  desc 'Updates the main `Localizable.strings` file — that will be imported by GlotPress'
+  lane :generate_strings_file_for_glotpress do
+    en_lproj_path = File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'en.lproj')
+    ios_generate_strings_file_from_code(
+      paths: [
+        'Simplenote/',
+        'SimplenoteIntents/',
+        'SimplenoteShare/',
+        'SimplenoteWidgets/',
+        'Pods/Simperium/Simperium/',
+        'Pods/Simperium/Simperium-iOS'
+      ],
+      output_dir: en_lproj_path
+    )
+
+    git_commit(
+      path: en_lproj_path,
+      message: 'Freeze strings for localization',
+      allow_nothing_to_commit: true
+    )
+  end
+end

From 9e2b0b4136412b4fc07776dac8d3a5159c7b8780 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Sat, 27 Jul 2024 08:29:04 +1000
Subject: [PATCH 361/547] Move code freeze lane to dedicated file

---
 .rubocop.yml              |  3 +-
 fastlane/Fastfile         | 87 ---------------------------------------
 fastlane/lanes/release.rb | 53 ++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 88 deletions(-)
 create mode 100644 fastlane/lanes/release.rb

diff --git a/.rubocop.yml b/.rubocop.yml
index 4c0c39f28..b4e39abfd 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -16,8 +16,9 @@ Layout/LineLength:
   Max: 180
 
 Metrics/BlockLength:
-  Exclude:
+  Exclude: &xfiles
     - fastlane/Fastfile
+    - fastlane/lanes/*.rb
     - Rakefile
 
 Style/HashSyntax:
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 518a918d1..cb76c009e 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -70,57 +70,6 @@ def get_required_env(key)
 end
 
 platform :ios do
-  ########################################################################
-  # Release Lanes
-  ########################################################################
-  #####################################################################################
-  # code_freeze
-  # -----------------------------------------------------------------------------------
-  # This lane executes the steps planned on code freeze
-  # -----------------------------------------------------------------------------------
-  # Usage:
-  # bundle exec fastlane code_freeze [skip_confirm:<skip confirm>]
-  #
-  # Example:
-  # bundle exec fastlane code_freeze
-  # bundle exec fastlane code_freeze skip_confirm:true
-  #####################################################################################
-  desc 'Creates a new release branch from the current trunk'
-  lane :code_freeze do |options|
-    ios_codefreeze_prechecks(options)
-
-    ios_bump_version_release
-    new_version = ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
-
-    extract_release_notes_for_version(
-      version: new_version,
-      release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'RELEASE-NOTES.txt'),
-      extracted_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt')
-    )
-    ios_update_release_notes(new_version: new_version)
-
-    generate_strings_file_for_glotpress
-
-    UI.important('Pushing changes to remote, configuring the release on GitHub, and triggering the beta build')
-    unless options[:skip_confirm] || UI.confirm('Do you want to continue?')
-      UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.")
-    end
-
-    push_to_git_remote(tags: false)
-
-    copy_branch_protection(
-      repository: GITHUB_REPO,
-      from_branch: DEFAULT_BRANCH,
-      to_branch: "release/#{new_version}"
-    )
-    setfrozentag(
-      repository: GITHUB_REPO,
-      milestone: new_version
-    )
-
-    trigger_beta_build(branch_to_build: "release/#{new_version}")
-  end
-
   #####################################################################################
   # update_appstore_strings
   # -----------------------------------------------------------------------------------
@@ -557,42 +506,6 @@ platform :ios do
     )
   end
 
-  #####################################################################################
-  # trigger_beta_build
-  # -----------------------------------------------------------------------------------
-  # This lane triggers a beta build on CI
-  # -----------------------------------------------------------------------------------
-  # @option [String] branch_to_build The name of the branch we want the CI to build, e.g. `release/19.3`
-  #
-  # Usage:
-  # bundle exec fastlane trigger_beta_build [branch_to_build:<branch_name>]
-  #
-  #####################################################################################
-  lane :trigger_beta_build do |options|
-    trigger_buildkite_release_build(
-      branch: options[:branch_to_build],
-      beta: true
-    )
-  end
-
-  #####################################################################################
-  # trigger_release_build
-  # -----------------------------------------------------------------------------------
-  # This lane triggers a stable release build on CI
-  # -----------------------------------------------------------------------------------
-  # @option [String] branch_to_build The name of the branch we want the CI to build, e.g. `release/19.3`
-  #
-  # Usage:
-  # bundle exec fastlane trigger_release_build [branch_to_build:<branch_name>]
-  #
-  #####################################################################################
-  lane :trigger_release_build do |options|
-    trigger_buildkite_release_build(
-      branch: options[:branch_to_build],
-      beta: false
-    )
-  end
-
   #####################################################################################
   # build_and_upload_installable_build
   # -----------------------------------------------------------------------------------
diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
new file mode 100644
index 000000000..2f952a80e
--- /dev/null
+++ b/fastlane/lanes/release.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+# Lanes related to the Release Process (Code Freeze, Betas, Final Build, App Store Submission…)
+platform :ios do
+  lane :code_freeze do |options|
+    ios_codefreeze_prechecks(options)
+
+    ios_bump_version_release
+    new_version = ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
+
+    extract_release_notes_for_version(
+      version: new_version,
+      release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'RELEASE-NOTES.txt'),
+      extracted_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt')
+    )
+    ios_update_release_notes(new_version: new_version)
+
+    generate_strings_file_for_glotpress
+
+    UI.important('Pushing changes to remote, configuring the release on GitHub, and triggering the beta build')
+    unless options[:skip_confirm] || UI.confirm('Do you want to continue?')
+      UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.")
+    end
+
+    push_to_git_remote(tags: false)
+
+    copy_branch_protection(
+      repository: GITHUB_REPO,
+      from_branch: DEFAULT_BRANCH,
+      to_branch: "release/#{new_version}"
+    )
+    setfrozentag(
+      repository: GITHUB_REPO,
+      milestone: new_version
+    )
+
+    trigger_beta_build(branch_to_build: "release/#{new_version}")
+  end
+
+  lane :trigger_beta_build do |options|
+    trigger_buildkite_release_build(
+      branch: options[:branch_to_build],
+      beta: true
+    )
+  end
+
+  lane :trigger_release_build do |options|
+    trigger_buildkite_release_build(
+      branch: options[:branch_to_build],
+      beta: false
+    )
+  end
+end

From 1d8f8b2ce9e847bea4c5130c5b846b4d934d388c Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 09:40:33 +1000
Subject: [PATCH 362/547] Move `new_beta` lane to `release.rb`

---
 fastlane/Fastfile         | 29 -----------------------------
 fastlane/lanes/release.rb | 13 +++++++++++++
 2 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index cb76c009e..8b58484e0 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -133,35 +133,6 @@ platform :ios do
     end
   end
 
-  #####################################################################################
-  # new_beta_release
-  # -----------------------------------------------------------------------------------
-  # This lane updates the release branch for a new beta release. It will update the
-  # current release branch by default. If you want to update a different branch
-  # (i.e. hotfix branch) pass the related version with the 'base_version' param
-  # (example: base_version:10.6.1 will work on the 10.6.1 branch)
-  # -----------------------------------------------------------------------------------
-  # Usage:
-  # bundle exec fastlane new_beta_release [skip_confirm:<skip confirm>] [base_version:<version>]
-  #
-  # Example:
-  # bundle exec fastlane new_beta_release
-  # bundle exec fastlane new_beta_release skip_confirm:true
-  # bundle exec fastlane new_beta_release base_version:10.6.1
-  #####################################################################################
-  desc 'Updates a release branch for a new beta release'
-  lane :new_beta_release do |options|
-    ios_betabuild_prechecks(options)
-    download_localized_strings_and_metadata_from_glotpress
-    ios_lint_localizations(
-      input_dir: 'Simplenote',
-      allow_retry: true
-    )
-    ios_bump_version_beta
-    version = ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
-    trigger_beta_build(branch_to_build: "release/#{version}")
-  end
-
   #####################################################################################
   # new_hotfix_release
   # -----------------------------------------------------------------------------------
diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 2f952a80e..52f30167b 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 # Lanes related to the Release Process (Code Freeze, Betas, Final Build, App Store Submission…)
+
 platform :ios do
   lane :code_freeze do |options|
     ios_codefreeze_prechecks(options)
@@ -37,6 +38,18 @@
     trigger_beta_build(branch_to_build: "release/#{new_version}")
   end
 
+  lane :new_beta_release do |options|
+    ios_betabuild_prechecks(options)
+    download_localized_strings_and_metadata_from_glotpress
+    ios_lint_localizations(
+      input_dir: 'Simplenote',
+      allow_retry: true
+    )
+    ios_bump_version_beta
+    version = ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
+    trigger_beta_build(branch_to_build: "release/#{version}")
+  end
+
   lane :trigger_beta_build do |options|
     trigger_buildkite_release_build(
       branch: options[:branch_to_build],

From 490b7f815e3e0171765dbac3190896b84a4e2d50 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 09:43:54 +1000
Subject: [PATCH 363/547] Use `set_milestone_frozen_marker` instead of
 `setfrozentag`

---
 fastlane/Fastfile         | 2 +-
 fastlane/lanes/release.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 8b58484e0..1fc8e0b5c 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -221,7 +221,7 @@ platform :ios do
       repository: GITHUB_REPO,
       branch: "release/#{version}"
     )
-    setfrozentag(
+    set_milestone_frozen_marker(
       repository: GITHUB_REPO,
       milestone: version,
       freeze: false
diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 52f30167b..bf0e001fb 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -30,7 +30,7 @@
       from_branch: DEFAULT_BRANCH,
       to_branch: "release/#{new_version}"
     )
-    setfrozentag(
+    set_milestone_frozen_marker(
       repository: GITHUB_REPO,
       milestone: new_version
     )

From e391823e7a34f64261a3a9222736bdc62926b30d Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 09:55:54 +1000
Subject: [PATCH 364/547] Introduce `EnvManager`

---
 fastlane/Fastfile           | 67 ++++++++++++----------------------
 fastlane/example.env        | 17 +++++++++
 fastlane/lib/env_manager.rb | 71 +++++++++++++++++++++++++++++++++++++
 3 files changed, 111 insertions(+), 44 deletions(-)
 create mode 100644 fastlane/example.env
 create mode 100644 fastlane/lib/env_manager.rb

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 1fc8e0b5c..8bcf97857 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -8,31 +8,20 @@ fastlane_require 'buildkit'
 
 UI.user_error!('Please run fastlane via `bundle exec`') unless FastlaneCore::Helper.bundler?
 
-USER_ENV_FILE_PATH = File.join(Dir.home, '.simplenoteios-env.default')
-PROJECT_ENV_FILE_PATH = File.join(
-  Dir.home, '.configure', 'simplenote-ios', 'secrets', 'project.env'
-)
 SECRETS_ROOT = File.join(Dir.home, '.configure', 'simplenote-ios', 'secrets')
 APP_STORE_CONNECT_KEY_PATH = File.join(SECRETS_ROOT, 'app_store_connect_fastlane_api_key.json')
 $used_test_account_index = nil
 
 import 'lanes/localization'
+import 'lanes/release'
+
+require_relative 'lib/env_manager'
 
 before_all do
   # Ensure we use the latest version of the toolkit
   check_for_toolkit_updates unless is_ci || ENV['FASTLANE_SKIP_TOOLKIT_UPDATE_CHECK']
 
-  # Check that the env files exist
-  unless is_ci || File.file?(USER_ENV_FILE_PATH)
-    error_message = <<~ERROR
-      ~/.simplenoteios-env.default not found. Please copy env/user.env-example to #{USER_ENV_FILE_PATH} and fill in the values") using the following command:
-
-      \tcp #{PROJECT_ROOT_FOLDER}/fastlane/env/user.env-example #{USER_ENV_FILE_PATH}
-    ERROR
-    UI.user_error!(error_message)
-  end
-
-  UI.user_error!('project.env not found: Make sure your configuration is up to date with `rake dependencies`') unless File.file?(PROJECT_ENV_FILE_PATH)
+  EnvManager.set_up(env_file_name: 'simplenote-ios')
 
   setup_ci
 end
@@ -52,9 +41,6 @@ DEFAULT_BRANCH = 'trunk'
 ########################################################################
 # Environment
 ########################################################################
-Dotenv.load(USER_ENV_FILE_PATH)
-Dotenv.load(PROJECT_ENV_FILE_PATH)
-
 ENV['PROJECT_NAME'] = 'Simplenote'
 ENV['PROJECT_ROOT_FOLDER'] = PROJECT_ROOT_FOLDER
 ENV['APP_STORE_STRINGS_FILE_NAME'] = 'AppStoreStrings.pot'
@@ -62,13 +48,6 @@ ENV['PUBLIC_CONFIG_FILE'] = VERSION_FILE_PATH
 ENV['DOWNLOAD_METADATA'] = './fastlane/download_metadata.swift'
 ENV['FL_RELEASE_TOOLKIT_DEFAULT_BRANCH'] = 'trunk'
 
-# Use this instead of getting values from ENV directly
-# It will throw an error if the requested value is missing
-def get_required_env(key)
-  UI.user_error!("Environment variable '#{key}' is not set. Have you setup #{USER_ENV_FILE_PATH} correctly?") unless ENV.key?(key)
-  ENV.fetch(key)
-end
-
 platform :ios do
   #####################################################################################
   # update_appstore_strings
@@ -353,7 +332,7 @@ platform :ios do
       export_method: 'enterprise',
       clean: true,
       output_directory: OUTPUT_DIRECTORY_PATH,
-      export_team_id: get_required_env('INT_EXPORT_TEAM_ID'),
+      export_team_id: EnvManager.get_required_env!('INT_EXPORT_TEAM_ID'),
       export_options: {
         method: 'enterprise',
         provisioningProfiles: simplenote_provisioning_profiles(
@@ -366,7 +345,7 @@ platform :ios do
     File.rename(File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote.ipa'), File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote Internal.ipa'))
 
     appcenter_upload(
-      api_token: get_required_env('APPCENTER_API_TOKEN'),
+      api_token: EnvManager.get_required_env!('APPCENTER_API_TOKEN'),
       owner_name: 'automattic',
       owner_type: 'organization',
       app_name: 'Simplenote',
@@ -375,7 +354,7 @@ platform :ios do
     )
 
     sentry_upload_dsym(
-      auth_token: get_required_env('SENTRY_API_TOKEN'),
+      auth_token: EnvManager.get_required_env!('SENTRY_AUTH_TOKEN'),
       org_slug: 'a8c',
       project_slug: 'simplenote-ios',
       dsym_path: lane_context[SharedValues::DSYM_OUTPUT_PATH]
@@ -413,7 +392,7 @@ platform :ios do
       clean: true,
       export_options: {
         method: 'app-store',
-        export_team_id: get_required_env('EXT_EXPORT_TEAM_ID'),
+        export_team_id: EnvManager.get_required_env!('EXT_EXPORT_TEAM_ID'),
         provisioningProfiles: simplenote_provisioning_profiles
       }
     )
@@ -428,7 +407,7 @@ platform :ios do
 
     sentry_upload_dsym(
       dsym_path: dsym_path,
-      auth_token: get_required_env('SENTRY_AUTH_TOKEN'),
+      auth_token: EnvManager.get_required_env!('SENTRY_AUTH_TOKEN'),
       org_slug: 'a8c',
       project_slug: 'simplenote-ios'
     )
@@ -503,7 +482,7 @@ platform :ios do
       export_method: 'enterprise',
       clean: true,
       output_directory: OUTPUT_DIRECTORY_PATH,
-      export_team_id: get_required_env('INT_EXPORT_TEAM_ID'),
+      export_team_id: EnvManager.get_required_env!('INT_EXPORT_TEAM_ID'),
       export_options: {
         method: 'enterprise',
         provisioningProfiles: simplenote_provisioning_profiles(
@@ -516,7 +495,7 @@ platform :ios do
     File.rename(File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote.ipa'), File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote Alpha.ipa'))
 
     appcenter_upload(
-      api_token: get_required_env('APPCENTER_API_TOKEN'),
+      api_token: EnvManager.get_required_env!('APPCENTER_API_TOKEN'),
       owner_name: 'automattic',
       owner_type: 'organization',
       app_name: 'Simplenote-Installable-Builds',
@@ -526,7 +505,7 @@ platform :ios do
     )
 
     sentry_upload_dsym(
-      auth_token: get_required_env('SENTRY_AUTH_TOKEN'),
+      auth_token: EnvManager.get_required_env!('SENTRY_AUTH_TOKEN'),
       org_slug: 'a8c',
       project_slug: 'simplenote-ios',
       dsym_path: lane_context[SharedValues::DSYM_OUTPUT_PATH]
@@ -790,7 +769,7 @@ platform :ios do
     if is_ci
       sanitize_test_accounts
       find_free_test_account
-      run_ui_tests(options.merge({ test_account: get_required_env('UI_TESTS_ACCOUNT_EMAIL').sub('X', $used_test_account_index.to_s) }))
+      run_ui_tests(options.merge({ test_account: EnvManager.get_required_env!('UI_TESTS_ACCOUNT_EMAIL').sub('X', $used_test_account_index.to_s) }))
       deoccupy_test_account
     else
       UI.user_error!('This lane should be run only from CI')
@@ -811,7 +790,7 @@ platform :ios do
       UI.message "\t#{identifier}"
     end
 
-    team_id = get_required_env('EXT_EXPORT_TEAM_ID')
+    team_id = EnvManager.get_required_env!('EXT_EXPORT_TEAM_ID')
 
     # Register the user's device
     register_device(
@@ -892,7 +871,7 @@ end
 private_lane :appstore_code_signing do |options|
   update_code_signing(
     type: 'appstore',
-    team_id: get_required_env('EXT_EXPORT_TEAM_ID'),
+    team_id: EnvManager.get_required_env!('EXT_EXPORT_TEAM_ID'),
     readonly: options.fetch(:readonly, true),
     app_identifiers: simplenote_app_identifiers,
     api_key_path: APP_STORE_CONNECT_KEY_PATH,
@@ -916,7 +895,7 @@ def update_code_signing_enterprise(readonly:, app_identifiers:)
   update_code_signing(
     type: 'enterprise',
     # Enterprise builds belong to the "internal" team
-    team_id: get_required_env('INT_EXPORT_TEAM_ID'),
+    team_id: EnvManager.get_required_env!('INT_EXPORT_TEAM_ID'),
     readonly: readonly,
     app_identifiers: app_identifiers,
     api_key_path: api_key_path
@@ -928,10 +907,10 @@ def update_code_signing(type:, team_id:, readonly:, app_identifiers:, api_key_pa
   # NOTE: It might be neccessary to add `force: true` alongside `readonly: true` in order to regenerate some provisioning profiles.
   # If this turns out to be a hard requirement, we should consider updating the method with logic to toggle the two setting based on whether we're fetching or renewing.
 
-  # Fail early if secrets not available via `get_required_env`.
+  # Fail early if secrets not available via `EnvManager.get_required_env!`.
   # Otherwise, Fastlane will prompt to type them.
-  access_key = get_required_env('MATCH_S3_ACCESS_KEY')
-  secret_access_key = get_required_env('MATCH_S3_SECRET_ACCESS_KEY')
+  access_key = EnvManager.get_required_env!('MATCH_S3_ACCESS_KEY')
+  secret_access_key = EnvManager.get_required_env!('MATCH_S3_SECRET_ACCESS_KEY')
 
   match(
     storage_mode: 's3',
@@ -1064,7 +1043,7 @@ end
 #   fetch_test_accounts_hash
 #     => {"0"=>"4079", "1"=>"free", "2"=>"free", "3"=>"free"}
 def fetch_test_accounts_hash
-  uri = URI.parse(get_required_env('UI_TESTS_ACCOUNTS_JSON_URL'))
+  uri = URI.parse(EnvManager.get_required_env!('UI_TESTS_ACCOUNTS_JSON_URL'))
   response = Net::HTTP.get_response(uri)
   accounts_state = response.body.chomp
   JSON.parse(accounts_state)
@@ -1081,7 +1060,7 @@ def find_free_test_account
 
   UI.user_error!('Could not find free UI Test account. Quitting.') if $used_test_account_index.nil?
   UI.message("Free account index: #{$used_test_account_index}")
-  change_test_account_availability(get_required_env('BUILDKITE_BUILD_NUMBER').to_s)
+  change_test_account_availability(ENV['BUILDKITE_BUILD_NUMBER'].to_s)
 end
 
 # Replace a value in a key which is equal to $used_test_account_index global variable
@@ -1111,7 +1090,7 @@ def sanitize_test_accounts
 end
 
 def job_running?(job_number)
-  client = Buildkit.new(token: get_required_env('BUILDKITE_TOKEN'))
+  client = Buildkit.new(token: EnvManager.get_required_env!('BUILDKITE_TOKEN'))
   build = client.build('automattic', 'simplenote-ios', job_number)
 
   state = build['state']
@@ -1125,7 +1104,7 @@ end
 
 def submit_accounts_hash(accounts_hash)
   UI.message("Writing new accounts state: #{accounts_hash}")
-  uri = URI.parse(get_required_env('UI_TESTS_ACCOUNTS_JSON_URL'))
+  uri = URI.parse(EnvManager.get_required_env!('UI_TESTS_ACCOUNTS_JSON_URL'))
   request = Net::HTTP::Post.new(uri)
   request.body = accounts_hash.to_json
 
diff --git a/fastlane/example.env b/fastlane/example.env
new file mode 100644
index 000000000..4d561bbe6
--- /dev/null
+++ b/fastlane/example.env
@@ -0,0 +1,17 @@
+# You don't need to fill in these values for Fastlane to run.
+#
+# However, if a lane requires some of these environment values and they are not set here, it will fail.
+GITHUB_TOKEN=
+BUILDKITE_TOKEN=
+
+MATCH_S3_ACCESS_KEY=
+MATCH_S3_SECRET_ACCESS_KEY=
+
+APP_STORE_CONNECT_API_KEY_KEY_ID=
+APP_STORE_CONNECT_API_KEY_ISSUER_ID=
+APP_STORE_CONNECT_API_KEY_KEY=
+
+APPCENTER_API_TOKEN=
+SENTRY_AUTH_TOKEN=
+
+UI_TESTS_ACCOUNT_EMAIL=
diff --git a/fastlane/lib/env_manager.rb b/fastlane/lib/env_manager.rb
new file mode 100644
index 000000000..d1b8705cd
--- /dev/null
+++ b/fastlane/lib/env_manager.rb
@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require 'dotenv'
+# TODO: It would be nice to decouple this from Fastlane.
+# To give a good UX in the current use case, however, it's best to access the Fastlane UI methods directly.
+require 'fastlane'
+
+# Manages loading of environment variables from a .env and accessing them in a user-friendly way.
+class EnvManager
+  @env_path = nil
+  @env_example_path = nil
+  @print_error_lambda = nil
+
+  # Set up by loading the .env file with the given name.
+  #
+  # TODO: We could go one step and guess the name based on the repo URL.
+  def self.set_up(
+    env_file_name:,
+    env_file_folder: File.join(Dir.home, '.a8c-apps'),
+    example_env_file_path: 'fastlane/example.env',
+    print_error_lambda: ->(message) { FastlaneCore::UI.user_error!(message) }
+  )
+    @env_path = File.join(env_file_folder, env_file_name)
+    @env_example_path = example_env_file_path
+    @print_error_lambda = print_error_lambda
+
+    # We don't check for @env_path to exist here
+    Dotenv.load(@env_path)
+  end
+
+  # Use this instead of getting values from `ENV` directly. It will throw an error if the requested value is missing or empty.
+  def self.get_required_env!(key)
+    unless ENV.key?(key)
+      message = "Environment variable '#{key}' is not set."
+
+      if running_on_ci?
+        @print_error_lambda.call(message)
+      elsif File.exist?(@env_path)
+        @print_error_lambda.call("#{message} Consider adding it to #{@env_path}.")
+      else
+        env_file_dir = File.dirname(@env_path)
+        env_file_name = File.basename(@env_path)
+
+        @print_error_lambda.call <<~MSG
+          #{env_file_name} not found in #{env_file_dir} while looking for env var #{key}.
+
+          Please copy #{@env_example_path} to #{@env_path} and fill in the value for #{key}.
+
+          mkdir -p #{env_file_dir} && cp #{@env_example_path} #{@env_path}
+        MSG
+      end
+    end
+
+    value = ENV.fetch(key)
+
+    UI.user_error!("Env var for key #{key} is set but empty. Please set a value for #{key}.") if value.to_s.empty?
+
+    value
+  end
+
+  # Use this to ensure all env vars a lane requires are set.
+  #
+  # The best place to call this is at the start of a lane, to fail early.
+  def self.require_env_vars!(*keys)
+    keys.each { |key| get_required_env!(key) }
+  end
+
+  def self.running_on_ci?
+    ENV['CI'] == 'true'
+  end
+end

From cab110a34a65c12949484d12696da9f20b004cf6 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 09:59:19 +1000
Subject: [PATCH 365/547] Remove obsolete lane to register device

Devs can self-serve this using internal tooling nowadays
---
 fastlane/Fastfile | 49 -----------------------------------------------
 1 file changed, 49 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 8bcf97857..f660a424b 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -775,55 +775,6 @@ platform :ios do
       UI.user_error!('This lane should be run only from CI')
     end
   end
-
-  desc 'Registers a Device in the developer console'
-  lane :register_new_device do |options|
-    device_name = UI.input('Device Name: ') if options[:device_name].nil?
-    device_id = UI.input('Device ID: ') if options[:device_id].nil?
-    # Currently, Simplenote has an odd setup with a dedicated app id for development builds
-    all_bundle_ids =
-      simplenote_app_identifiers +
-      simplenote_app_identifiers(root_bundle_id: "#{APP_STORE_BUNDLE_IDENTIFIER}.Development")
-
-    UI.message "Registering #{device_name} with ID #{device_id} and registering it with any provisioning profiles associated with these bundle identifiers:"
-    all_bundle_ids.each do |identifier|
-      UI.message "\t#{identifier}"
-    end
-
-    team_id = EnvManager.get_required_env!('EXT_EXPORT_TEAM_ID')
-
-    # Register the user's device
-    register_device(
-      name: device_name,
-      udid: device_id,
-      team_id: team_id,
-      api_key_path: APP_STORE_CONNECT_KEY_PATH
-    )
-
-    # We're about to use `add_development_certificates_to_provisioning_profiles` and `add_all_devices_to_provisioning_profiles`.
-    # These actions use Developer Portal APIs that don't yet support authentication via API key (-.-').
-    # Let's preemptively ask for and set the email here to avoid being asked twice for it if not set.
-
-    require 'credentials_manager'
-
-    # If Fastlane cannot instantiate a user, it will ask the caller for the email.
-    # Once we have it, we can set it as `FASTLANE_USER` in the environment (which has lifecycle limited to this call) so that the next commands will already have access to it.
-    # Note that if the user is already available to `AccountManager`, setting it in the environment is redundant, but Fastlane
-    # doesn't provide a way to check it so we have to do it anyway.
-    ENV['FASTLANE_USER'] = CredentialsManager::AccountManager.new.user
-
-    # Add all development certificates to the provisioning profiles (just in case – this is an easy step to miss)
-    add_development_certificates_to_provisioning_profiles(
-      team_id: team_id,
-      app_identifier: all_bundle_ids
-    )
-
-    # Add all devices to the provisioning profiles
-    add_all_devices_to_provisioning_profiles(
-      team_id: team_id,
-      app_identifier: all_bundle_ids
-    )
-  end
 end
 
 ########################################################################

From e6b47c0991e13ad19fa2dac5adf20e8cd280f138 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 10:00:17 +1000
Subject: [PATCH 366/547] Replace unnecessarily reads from env of team ids with
 direct definition

---
 fastlane/Fastfile | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index f660a424b..5b2e5f1e4 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -38,6 +38,9 @@ GITHUB_REPO = 'Automattic/simplenote-ios'
 APP_STORE_BUNDLE_IDENTIFIER = 'com.codality.NotationalFlow'
 DEFAULT_BRANCH = 'trunk'
 
+TEAM_ID_APP_STORE_CONNECT = 'PZYM8XX95Q'
+TEAM_ID_ENTERPRISE = '99KV9Z6BKV'
+
 ########################################################################
 # Environment
 ########################################################################
@@ -332,7 +335,7 @@ platform :ios do
       export_method: 'enterprise',
       clean: true,
       output_directory: OUTPUT_DIRECTORY_PATH,
-      export_team_id: EnvManager.get_required_env!('INT_EXPORT_TEAM_ID'),
+      export_team_id: TEAM_ID_ENTERPRISE,
       export_options: {
         method: 'enterprise',
         provisioningProfiles: simplenote_provisioning_profiles(
@@ -392,7 +395,7 @@ platform :ios do
       clean: true,
       export_options: {
         method: 'app-store',
-        export_team_id: EnvManager.get_required_env!('EXT_EXPORT_TEAM_ID'),
+        export_team_id: TEAM_ID_APP_STORE_CONNECT,
         provisioningProfiles: simplenote_provisioning_profiles
       }
     )
@@ -482,7 +485,7 @@ platform :ios do
       export_method: 'enterprise',
       clean: true,
       output_directory: OUTPUT_DIRECTORY_PATH,
-      export_team_id: EnvManager.get_required_env!('INT_EXPORT_TEAM_ID'),
+      export_team_id: TEAM_ID_ENTERPRISE,
       export_options: {
         method: 'enterprise',
         provisioningProfiles: simplenote_provisioning_profiles(
@@ -822,7 +825,7 @@ end
 private_lane :appstore_code_signing do |options|
   update_code_signing(
     type: 'appstore',
-    team_id: EnvManager.get_required_env!('EXT_EXPORT_TEAM_ID'),
+    team_id: TEAM_ID_APP_STORE_CONNECT,
     readonly: options.fetch(:readonly, true),
     app_identifiers: simplenote_app_identifiers,
     api_key_path: APP_STORE_CONNECT_KEY_PATH,
@@ -846,7 +849,7 @@ def update_code_signing_enterprise(readonly:, app_identifiers:)
   update_code_signing(
     type: 'enterprise',
     # Enterprise builds belong to the "internal" team
-    team_id: EnvManager.get_required_env!('INT_EXPORT_TEAM_ID'),
+    team_id: TEAM_ID_ENTERPRISE,
     readonly: readonly,
     app_identifiers: app_identifiers,
     api_key_path: api_key_path

From 2771552ceca495c267b02970e5f7276b57d99ff9 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 10:33:53 +1000
Subject: [PATCH 367/547] Remove `project.env` from `configure`

---
 .configure | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.configure b/.configure
index 7f10aae64..5498e1b3e 100644
--- a/.configure
+++ b/.configure
@@ -18,11 +18,6 @@
       "destination": "~/.configure/simplenote-ios/secrets/google_cloud_keys.json",
       "encrypt": true
     },
-    {
-      "file": "iOS/simplenote/project.env",
-      "destination": "~/.configure/simplenote-ios/secrets/project.env",
-      "encrypt": true
-    },
     {
       "file": "iOS/app_store_connect_fastlane_api_key.json",
       "destination": "~/.configure/simplenote-ios/secrets/app_store_connect_fastlane_api_key.json",

From 7351555c3ed9076d3c5cadf3108ab8f6600e4c98 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 10:42:58 +1000
Subject: [PATCH 368/547] Replace `ios_codefreeze_prechecks` with individual
 checks

---
 fastlane/lanes/release.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index bf0e001fb..24ee9861d 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -4,7 +4,8 @@
 
 platform :ios do
   lane :code_freeze do |options|
-    ios_codefreeze_prechecks(options)
+    ensure_git_status_clean
+    Fastlane::Helper::GitHelper.checkout_and_pull(DEFAULT_BRANCH)
 
     ios_bump_version_release
     new_version = ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)

From cbbd28d27c76f82afa324dd421ccf282d6b35171 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 10:48:16 +1000
Subject: [PATCH 369/547] Use `skip_confirm:` named argument in code freeze
 lane

---
 fastlane/lanes/release.rb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 24ee9861d..2bf04bf2d 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -3,8 +3,9 @@
 # Lanes related to the Release Process (Code Freeze, Betas, Final Build, App Store Submission…)
 
 platform :ios do
-  lane :code_freeze do |options|
+  lane :code_freeze do |skip_confirm: false|
     ensure_git_status_clean
+
     Fastlane::Helper::GitHelper.checkout_and_pull(DEFAULT_BRANCH)
 
     ios_bump_version_release
@@ -20,9 +21,7 @@
     generate_strings_file_for_glotpress
 
     UI.important('Pushing changes to remote, configuring the release on GitHub, and triggering the beta build')
-    unless options[:skip_confirm] || UI.confirm('Do you want to continue?')
-      UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.")
-    end
+    UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.") unless skip_confirm || UI.confirm('Do you want to continue?')
 
     push_to_git_remote(tags: false)
 

From eec335aac3498554b103dc7ff6c5853a07ae9660 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 10:54:08 +1000
Subject: [PATCH 370/547] Introduce version calculators and adopt in code
 freeze lane

---
 fastlane/Fastfile         | 59 +++++++++++++++++++++++++++++++++++++++
 fastlane/lanes/release.rb | 44 +++++++++++++++++++++++++----
 2 files changed, 98 insertions(+), 5 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 5b2e5f1e4..af42ac79f 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -51,6 +51,11 @@ ENV['PUBLIC_CONFIG_FILE'] = VERSION_FILE_PATH
 ENV['DOWNLOAD_METADATA'] = './fastlane/download_metadata.swift'
 ENV['FL_RELEASE_TOOLKIT_DEFAULT_BRANCH'] = 'trunk'
 
+VERSION_CALCULATOR = Fastlane::Wpmreleasetoolkit::Versioning::MarketingVersionCalculator.new
+VERSION_FORMATTER = Fastlane::Wpmreleasetoolkit::Versioning::FourPartVersionFormatter.new
+BUILD_CODE_FORMATTER = Fastlane::Wpmreleasetoolkit::Versioning::FourPartBuildCodeFormatter.new
+PUBLIC_VERSION_FILE = Fastlane::Wpmreleasetoolkit::Versioning::IOSVersionFile.new(xcconfig_path: VERSION_FILE_PATH)
+
 platform :ios do
   #####################################################################################
   # update_appstore_strings
@@ -1097,3 +1102,57 @@ def generate_installable_build_number
     "#{branch}-#{commit}"
   end
 end
+
+# Returns the release version of the app in the format `1.2` or `1.2.3` if it is a hotfix
+#
+def release_version_current
+  current_version = VERSION_FORMATTER.parse(PUBLIC_VERSION_FILE.read_release_version)
+  VERSION_FORMATTER.release_version(current_version)
+end
+
+#  Returns the next release version of the app in the format `1.2` or `1.2.3` if it is a hotfix
+#
+def release_version_next
+  current_version = VERSION_FORMATTER.parse(PUBLIC_VERSION_FILE.read_release_version)
+  next_calculated_release_version = VERSION_CALCULATOR.next_release_version(version: current_version)
+  VERSION_FORMATTER.release_version(next_calculated_release_version)
+end
+
+# Returns the current build code of the app
+#
+def build_code_current
+  # We use the four part (1.2.3.4) build code format, so the version calculator can be used to calculate the next four-part version
+  version = VERSION_FORMATTER.parse(PUBLIC_VERSION_FILE.read_build_code(attribute_name: 'VERSION_LONG'))
+  BUILD_CODE_FORMATTER.build_code(version: version)
+end
+
+# Returns the build code of the app for the code freeze.
+# It is the release version name with build number (last of the four components) set to 0.
+#
+def build_code_code_freeze
+  # We use the four part (1.2.3.4) build code format, so the version calculator can be used to calculate the next four-part version
+  release_version_current = VERSION_FORMATTER.parse(INTERNAL_VERSION_FILE.read_release_version)
+  build_code_code_freeze = VERSION_CALCULATOR.next_release_version(version: release_version_current)
+  BUILD_CODE_FORMATTER.build_code(version: build_code_code_freeze)
+end
+
+# Returns the build code of the app for the code freeze.
+# It is the release version name with build number (last of the four components) set to 0.
+#
+def build_code_hotfix(release_version:)
+  version = VERSION_FORMATTER.parse(release_version)
+  BUILD_CODE_FORMATTER.build_code(version: version)
+end
+
+# Returns the next build code of the app
+#
+def build_code_next
+  # We use the four part (1.2.3.4) build code format, so the version calculator can be used to calculate the next four-part version
+  build_code_current = VERSION_FORMATTER.parse(PUBLIC_VERSION_FILE.read_build_code(attribute_name: 'VERSION_LONG'))
+  build_code_next = VERSION_CALCULATOR.next_build_number(version: build_code_current)
+  BUILD_CODE_FORMATTER.build_code(version: build_code_next)
+end
+
+def release_branch_name(release_version: release_version_current)
+  "release/#{release_version}"
+end
diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 2bf04bf2d..8552bd79c 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -8,8 +8,34 @@
 
     Fastlane::Helper::GitHelper.checkout_and_pull(DEFAULT_BRANCH)
 
-    ios_bump_version_release
-    new_version = ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
+    computed_release_branch_name = release_branch_name(release_version: release_version_next)
+
+    message = <<~MESSAGE
+      Code Freeze:
+      • New release branch from #{DEFAULT_BRANCH}: #{computed_release_branch_name}
+
+      • Current release version and build code: #{release_version_current} (#{build_code_current}).
+      • New release version and build code: #{release_version_next} (#{build_code_code_freeze}).
+    MESSAGE
+
+    UI.important(message)
+
+    UI.user_error!('Aborted by user request') unless skip_confirm || UI.confirm('Do you want to continue?')
+
+    UI.message 'Creating release branch...'
+    Fastlane::Helper::GitHelper.create_branch(computed_release_branch_name, from: DEFAULT_BRANCH)
+    UI.success "Done! New release branch is: #{git_branch}"
+
+    UI.message 'Bumping release version and build code...'
+    PUBLIC_VERSION_FILE.write(
+      version_short: release_version_next,
+      version_long: build_code_code_freeze
+    )
+    UI.success "Done! New Release Version: #{release_version_current}. New Build Code: #{build_code_current}."
+
+    commit_version_and_build_files
+
+    new_version = release_version_current
 
     extract_release_notes_for_version(
       version: new_version,
@@ -20,7 +46,7 @@
 
     generate_strings_file_for_glotpress
 
-    UI.important('Pushing changes to remote, configuring the release on GitHub, and triggering the beta build')
+    UI.important('Pushing changes to remote, configuring the release on GitHub, and triggering the beta build...')
     UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.") unless skip_confirm || UI.confirm('Do you want to continue?')
 
     push_to_git_remote(tags: false)
@@ -28,14 +54,14 @@
     copy_branch_protection(
       repository: GITHUB_REPO,
       from_branch: DEFAULT_BRANCH,
-      to_branch: "release/#{new_version}"
+      to_branch: computed_release_branch_name
     )
     set_milestone_frozen_marker(
       repository: GITHUB_REPO,
       milestone: new_version
     )
 
-    trigger_beta_build(branch_to_build: "release/#{new_version}")
+    trigger_beta_build(branch_to_build: computed_release_branch_name)
   end
 
   lane :new_beta_release do |options|
@@ -64,3 +90,11 @@
     )
   end
 end
+
+def commit_version_and_build_files
+  git_commit(
+    path: [PUBLIC_CONFIG_FILE],
+    message: 'Bump version number',
+    allow_nothing_to_commit: false
+  )
+end

From 1ca6bec81eb1d303bc29d8e88efc293c1a65c14c Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 11:01:22 +1000
Subject: [PATCH 371/547] Update release-toolkit to latest version

---
 Gemfile.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 5e891f661..006e2ecdc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -24,8 +24,8 @@ GEM
     ast (2.4.2)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.957.0)
-    aws-sdk-core (3.201.2)
+    aws-partitions (1.958.0)
+    aws-sdk-core (3.201.3)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
@@ -37,7 +37,7 @@ GEM
       aws-sdk-core (~> 3, >= 3.201.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.8.0)
+    aws-sigv4 (1.9.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.2.0)
@@ -153,7 +153,7 @@ GEM
     faraday-httpclient (1.0.1)
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
-    faraday-net_http (1.0.1)
+    faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
@@ -161,7 +161,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.3.1)
-    fastlane (2.221.1)
+    fastlane (2.222.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -205,7 +205,7 @@ GEM
     fastlane-plugin-appcenter (2.1.2)
     fastlane-plugin-sentry (1.22.0)
       os (~> 1.1, >= 1.1.4)
-    fastlane-plugin-wpmreleasetoolkit (11.0.3)
+    fastlane-plugin-wpmreleasetoolkit (11.1.0)
       activesupport (>= 6.1.7.1)
       buildkit (~> 1.5)
       chroma (= 0.2.0)
@@ -294,9 +294,9 @@ GEM
     netrc (0.11.0)
     nkf (0.2.0)
     no_proxy_fix (0.1.2)
-    nokogiri (1.16.6-arm64-darwin)
+    nokogiri (1.16.7-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.6-x86_64-linux)
+    nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
     octokit (6.1.1)
       faraday (>= 1, < 3)

From 09b63b753a8dd1140c7d00e5ea10224198a9b774 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 11:01:54 +1000
Subject: [PATCH 372/547] Add command to check CocoaPods are using stable
 versions

---
 fastlane/Fastfile         |  6 +++---
 fastlane/lanes/release.rb | 11 +++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index af42ac79f..0838d4290 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -12,11 +12,11 @@ SECRETS_ROOT = File.join(Dir.home, '.configure', 'simplenote-ios', 'secrets')
 APP_STORE_CONNECT_KEY_PATH = File.join(SECRETS_ROOT, 'app_store_connect_fastlane_api_key.json')
 $used_test_account_index = nil
 
-import 'lanes/localization'
-import 'lanes/release'
-
 require_relative 'lib/env_manager'
 
+import 'lanes/localization.rb'
+import 'lanes/release.rb'
+
 before_all do
   # Ensure we use the latest version of the toolkit
   check_for_toolkit_updates unless is_ci || ENV['FASTLANE_SKIP_TOOLKIT_UPDATE_CHECK']
diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 8552bd79c..3734f6559 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -8,6 +8,8 @@
 
     Fastlane::Helper::GitHelper.checkout_and_pull(DEFAULT_BRANCH)
 
+    check_pods_references
+
     computed_release_branch_name = release_branch_name(release_version: release_version_next)
 
     message = <<~MESSAGE
@@ -98,3 +100,12 @@ def commit_version_and_build_files
     allow_nothing_to_commit: false
   )
 end
+
+def check_pods_references
+  # This will also print the result to STDOUT
+  result = ios_check_beta_deps(lockfile: File.join(PROJECT_ROOT_FOLDER, 'Podfile.lock'))
+
+  style = result[:pods].nil? || result[:pods].empty? ? 'success' : 'warning'
+  message = "### Checking Internal Dependencies are all on a **stable** version\n\n#{result[:message]}"
+  buildkite_annotate(context: 'pods-check', style: style, message: message) if is_ci
+end

From a29666351f35387076951124410503cdec5a8ffd Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 11:13:27 +1000
Subject: [PATCH 373/547] DRY one release branch name computation

---
 fastlane/lanes/release.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 3734f6559..3cff5462b 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -74,8 +74,7 @@
       allow_retry: true
     )
     ios_bump_version_beta
-    version = ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
-    trigger_beta_build(branch_to_build: "release/#{version}")
+    trigger_beta_build(branch_to_build: release_branch_name)
   end
 
   lane :trigger_beta_build do |options|

From 0806546d34cad00770dfd16b5e65a4ef733bb902 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 11:18:58 +1000
Subject: [PATCH 374/547] Move method to trigger Buildkite release build to
 `release.rb`

---
 fastlane/Fastfile         | 23 ++++++-----------------
 fastlane/lanes/release.rb | 24 ++++++++++++++----------
 2 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 0838d4290..7bdbb5064 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -34,13 +34,18 @@ end
 PROJECT_ROOT_FOLDER = File.dirname(File.expand_path(__dir__))
 VERSION_FILE_PATH = File.join(PROJECT_ROOT_FOLDER, 'config', 'Version.Public.xcconfig')
 OUTPUT_DIRECTORY_PATH = File.join(PROJECT_ROOT_FOLDER, 'build', 'results')
-GITHUB_REPO = 'Automattic/simplenote-ios'
 APP_STORE_BUNDLE_IDENTIFIER = 'com.codality.NotationalFlow'
 DEFAULT_BRANCH = 'trunk'
 
 TEAM_ID_APP_STORE_CONNECT = 'PZYM8XX95Q'
 TEAM_ID_ENTERPRISE = '99KV9Z6BKV'
 
+ORGANIZATION = 'automattic'
+PROJECT_SLUG = 'simplenote-ios'
+GITHUB_REPO = "#{ORGANIZATION}/#{PROJECT_SLUG}".freeze
+BUILDKITE_ORGANIZATION = ORGANIZATION
+BUILDKITE_PIPELINE = PROJECT_SLUG
+
 ########################################################################
 # Environment
 ########################################################################
@@ -930,22 +935,6 @@ end
 # Helper Lanes
 ########################################################################
 
-# Triggers a Release Build on Buildkite
-#
-# @param [String] branch The branch to build
-# @param [Boolean] beta Indicate if we should build a beta or regular release
-#
-def trigger_buildkite_release_build(branch:, beta:)
-  push_to_git_remote(tags: false)
-  buildkite_trigger_build(
-    buildkite_organization: 'automattic',
-    buildkite_pipeline: 'simplenote-ios',
-    branch: branch,
-    environment: { BETA_RELEASE: beta },
-    pipeline_file: 'release-build.yml'
-  )
-end
-
 def fastlane_directory
   __dir__
 end
diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 3cff5462b..8f4ceb57d 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -77,18 +77,12 @@
     trigger_beta_build(branch_to_build: release_branch_name)
   end
 
-  lane :trigger_beta_build do |options|
-    trigger_buildkite_release_build(
-      branch: options[:branch_to_build],
-      beta: true
-    )
+  lane :trigger_beta_build do |branch_to_build:|
+    trigger_buildkite_release_build(branch: branch_to_build, beta: true)
   end
 
-  lane :trigger_release_build do |options|
-    trigger_buildkite_release_build(
-      branch: options[:branch_to_build],
-      beta: false
-    )
+  lane :trigger_release_build do |branch_to_build:|
+    trigger_buildkite_release_build(branch: branch_to_build, beta: false)
   end
 end
 
@@ -108,3 +102,13 @@ def check_pods_references
   message = "### Checking Internal Dependencies are all on a **stable** version\n\n#{result[:message]}"
   buildkite_annotate(context: 'pods-check', style: style, message: message) if is_ci
 end
+
+def trigger_buildkite_release_build(branch:, beta:)
+  buildkite_trigger_build(
+    buildkite_organization: BUILDKITE_ORGANIZATION,
+    buildkite_pipeline: BUILDKITE_PIPELINE,
+    branch: branch,
+    environment: { BETA_RELEASE: beta },
+    pipeline_file: 'release-build.yml'
+  )
+end

From aad3f367e3653299c7c9d7f5111a1f87c127047a Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 11:34:27 +1000
Subject: [PATCH 375/547] Remove unnecessary comments and double quotes from
 Buildkite pipelines

---
 .buildkite/release-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/release-build.yml b/.buildkite/release-build.yml
index ee622ae51..8d01e4da1 100644
--- a/.buildkite/release-build.yml
+++ b/.buildkite/release-build.yml
@@ -1,6 +1,6 @@
 steps:
   - label: ":testflight: Simplenote iOS Release Build (App Store Connect)"
-    command: ".buildkite/commands/release-build.sh"
+    command: .buildkite/commands/release-build.sh
     priority: 1
     env:
       IMAGE_ID: $IMAGE_ID

From 51591e8370db9ecbcc30b9bffa2404ba87e76178 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 11:42:06 +1000
Subject: [PATCH 376/547] Double quote a var access in `release-build.sh`

---
 .buildkite/commands/release-build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/commands/release-build.sh b/.buildkite/commands/release-build.sh
index 1b7c2c3d0..f3a7246ab 100755
--- a/.buildkite/commands/release-build.sh
+++ b/.buildkite/commands/release-build.sh
@@ -14,4 +14,4 @@ bundle exec fastlane build_and_upload_to_app_store_connect \
   skip_confirm:true \
   skip_prechecks:true \
   create_release:true \
-  beta_release:${1:-true} # use first call param, default to true for safety
+  "beta_release:${1:-true}" # use first call param, default to true for safety

From d9634622ccb15583550e57f1ab38282d6c401e6a Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 11:48:24 +1000
Subject: [PATCH 377/547] Extract lane to build for ASC into dedicated file

---
 fastlane/Fastfile       | 71 +----------------------------------------
 fastlane/lanes/build.rb | 59 ++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 70 deletions(-)
 create mode 100644 fastlane/lanes/build.rb

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 7bdbb5064..17334ee02 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -16,6 +16,7 @@ require_relative 'lib/env_manager'
 
 import 'lanes/localization.rb'
 import 'lanes/release.rb'
+import 'lanes/build.rb'
 
 before_all do
   # Ensure we use the latest version of the toolkit
@@ -374,76 +375,6 @@ platform :ios do
     )
   end
 
-  #####################################################################################
-  # build_and_upload_to_app_store_connect
-  # -----------------------------------------------------------------------------------
-  # This lane builds the app and upload it for external distribution
-  # -----------------------------------------------------------------------------------
-  # Usage:
-  # bundle exec fastlane build_and_upload_to_app_store_connect [skip_confirm:<skip confirm>] [create_release:<Create release on GH>] [beta_release:<intermediate beta?>]
-  #
-  # Example:
-  # bundle exec fastlane build_and_upload_to_app_store_connect
-  # bundle exec fastlane build_and_upload_to_app_store_connect skip_confirm:true
-  #####################################################################################
-  desc 'Builds and uploads for distribution'
-  lane :build_and_upload_to_app_store_connect do |options|
-    unless options[:skip_prechecks]
-      ios_build_prechecks(
-        skip_confirm: options[:skip_confirm],
-        external: true
-      )
-      ios_build_preflight
-    end
-
-    appstore_code_signing
-
-    gym(
-      scheme: 'Simplenote',
-      workspace: 'Simplenote.xcworkspace',
-      configuration: 'Distribution AppStore',
-      clean: true,
-      export_options: {
-        method: 'app-store',
-        export_team_id: TEAM_ID_APP_STORE_CONNECT,
-        provisioningProfiles: simplenote_provisioning_profiles
-      }
-    )
-
-    testflight(
-      skip_waiting_for_build_processing: true,
-      api_key_path: APP_STORE_CONNECT_KEY_PATH
-    )
-
-    sh('rm ../Simplenote.ipa')
-    dsym_path = File.join(File.dirname(Dir.pwd), 'Simplenote.app.dSYM.zip')
-
-    sentry_upload_dsym(
-      dsym_path: dsym_path,
-      auth_token: EnvManager.get_required_env!('SENTRY_AUTH_TOKEN'),
-      org_slug: 'a8c',
-      project_slug: 'simplenote-ios'
-    )
-
-    sh("rm #{dsym_path}")
-
-    if options[:create_release]
-      archive_zip_path = File.join(File.dirname(Dir.pwd), 'Simplenote.xarchive.zip')
-      zip(path: lane_context[SharedValues::XCODEBUILD_ARCHIVE], output_path: archive_zip_path)
-
-      version = options[:beta_release] ? ios_get_build_version : ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
-      create_release(
-        repository: GITHUB_REPO,
-        version: version,
-        release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt'),
-        release_assets: archive_zip_path.to_s,
-        prerelease: options[:beta_release]
-      )
-
-      sh("rm #{archive_zip_path}")
-    end
-  end
-
   # Upload the localized metadata (from `fastlane/metadata/`) to App Store Connect
   #
   # @option [Boolean] with_screenshots (default: false) If true, will also upload the latest screenshot files to ASC
diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb
new file mode 100644
index 000000000..d0cc804b0
--- /dev/null
+++ b/fastlane/lanes/build.rb
@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+desc 'Builds and uploads for distribution via App Store Connect'
+lane :build_and_upload_to_app_store_connect do |options|
+  unless options[:skip_prechecks]
+    ios_build_prechecks(
+      skip_confirm: options[:skip_confirm],
+      external: true
+    )
+    ios_build_preflight
+  end
+
+  appstore_code_signing
+
+  gym(
+    scheme: 'Simplenote',
+    workspace: 'Simplenote.xcworkspace',
+    configuration: 'Distribution AppStore',
+    clean: true,
+    export_options: {
+      method: 'app-store',
+      export_team_id: TEAM_ID_APP_STORE_CONNECT,
+      provisioningProfiles: simplenote_provisioning_profiles
+    }
+  )
+
+  testflight(
+    skip_waiting_for_build_processing: true,
+    api_key_path: APP_STORE_CONNECT_KEY_PATH
+  )
+
+  sh('rm ../Simplenote.ipa')
+  dsym_path = File.join(File.dirname(Dir.pwd), 'Simplenote.app.dSYM.zip')
+
+  sentry_upload_dsym(
+    dsym_path: dsym_path,
+    auth_token: EnvManager.get_required_env!('SENTRY_AUTH_TOKEN'),
+    org_slug: 'a8c',
+    project_slug: 'simplenote-ios'
+  )
+
+  sh("rm #{dsym_path}")
+
+  if options[:create_release]
+    archive_zip_path = File.join(File.dirname(Dir.pwd), 'Simplenote.xarchive.zip')
+    zip(path: lane_context[SharedValues::XCODEBUILD_ARCHIVE], output_path: archive_zip_path)
+
+    version = options[:beta_release] ? ios_get_build_version : ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
+    create_release(
+      repository: GITHUB_REPO,
+      version: version,
+      release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt'),
+      release_assets: archive_zip_path.to_s,
+      prerelease: options[:beta_release]
+    )
+
+    sh("rm #{archive_zip_path}")
+  end
+end

From 83b62309535a6c2081b619b4ceff8985356b75eb Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 11:51:04 +1000
Subject: [PATCH 378/547] Use named block arguments in build for ASC lane

---
 fastlane/lanes/build.rb | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb
index d0cc804b0..4c32d1b5e 100644
--- a/fastlane/lanes/build.rb
+++ b/fastlane/lanes/build.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 desc 'Builds and uploads for distribution via App Store Connect'
-lane :build_and_upload_to_app_store_connect do |options|
-  unless options[:skip_prechecks]
+lane :build_and_upload_to_app_store_connect do |beta_release:, skip_prechecks: false, skip_confirm: false, create_release: false|
+  unless skip_prechecks
     ios_build_prechecks(
-      skip_confirm: options[:skip_confirm],
+      skip_confirm: skip_confirm,
       external: true
     )
     ios_build_preflight
@@ -41,19 +41,19 @@
 
   sh("rm #{dsym_path}")
 
-  if options[:create_release]
-    archive_zip_path = File.join(File.dirname(Dir.pwd), 'Simplenote.xarchive.zip')
-    zip(path: lane_context[SharedValues::XCODEBUILD_ARCHIVE], output_path: archive_zip_path)
-
-    version = options[:beta_release] ? ios_get_build_version : ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
-    create_release(
-      repository: GITHUB_REPO,
-      version: version,
-      release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt'),
-      release_assets: archive_zip_path.to_s,
-      prerelease: options[:beta_release]
-    )
+  next unless create_release
 
-    sh("rm #{archive_zip_path}")
-  end
+  archive_zip_path = File.join(File.dirname(Dir.pwd), 'Simplenote.xarchive.zip')
+  zip(path: lane_context[SharedValues::XCODEBUILD_ARCHIVE], output_path: archive_zip_path)
+
+  version = beta_release ? ios_get_build_version : ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
+  create_release(
+    repository: GITHUB_REPO,
+    version: version,
+    release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt'),
+    release_assets: archive_zip_path.to_s,
+    prerelease: beta_release
+  )
+
+  sh("rm #{archive_zip_path}")
 end

From 6260e8cb38e94d0ce46e2083189b181584c80952 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 11:51:53 +1000
Subject: [PATCH 379/547] Remove calls to delete artifacts from build for ASC
 lane

---
 fastlane/lanes/build.rb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb
index 4c32d1b5e..9d37b2d9e 100644
--- a/fastlane/lanes/build.rb
+++ b/fastlane/lanes/build.rb
@@ -29,7 +29,6 @@
     api_key_path: APP_STORE_CONNECT_KEY_PATH
   )
 
-  sh('rm ../Simplenote.ipa')
   dsym_path = File.join(File.dirname(Dir.pwd), 'Simplenote.app.dSYM.zip')
 
   sentry_upload_dsym(
@@ -39,8 +38,6 @@
     project_slug: 'simplenote-ios'
   )
 
-  sh("rm #{dsym_path}")
-
   next unless create_release
 
   archive_zip_path = File.join(File.dirname(Dir.pwd), 'Simplenote.xarchive.zip')
@@ -54,6 +51,4 @@
     release_assets: archive_zip_path.to_s,
     prerelease: beta_release
   )
-
-  sh("rm #{archive_zip_path}")
 end

From 6e78eefef145bdd7698e628e3934e185a23cb5cf Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 11:55:16 +1000
Subject: [PATCH 380/547] Remove `ios_build_preflight` and
 `ios_build_prechecks` from build lane

---
 fastlane/lanes/build.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb
index 9d37b2d9e..5635aa1e7 100644
--- a/fastlane/lanes/build.rb
+++ b/fastlane/lanes/build.rb
@@ -3,13 +3,13 @@
 desc 'Builds and uploads for distribution via App Store Connect'
 lane :build_and_upload_to_app_store_connect do |beta_release:, skip_prechecks: false, skip_confirm: false, create_release: false|
   unless skip_prechecks
-    ios_build_prechecks(
-      skip_confirm: skip_confirm,
-      external: true
-    )
-    ios_build_preflight
+    ensure_git_status_clean unless skip_prechecks || is_ci
+    sentry_check_cli_installed
   end
 
+  UI.important("Building version #{release_version_current} (#{build_code_current}) and uploading to TestFlight...")
+  UI.user_error!('Aborted by user request') unless skip_confirm || UI.confirm('Do you want to continue?')
+
   appstore_code_signing
 
   gym(

From d13ca5ba280b4ea37c0b2b01954a8f6a6db12c5c Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 12:01:12 +1000
Subject: [PATCH 381/547] Use `xcconfig` to define development team for release
 builds

---
 Simplenote.xcodeproj/project.pbxproj | 10 ++--------
 config/Project.Release.xcconfig      |  1 +
 config/Simplenote.release.xcconfig   |  1 +
 3 files changed, 4 insertions(+), 8 deletions(-)
 create mode 100644 config/Project.Release.xcconfig

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index 6154f0d96..d46d32506 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -768,6 +768,7 @@
 		3FA60139242C5AAD0068FC52 /* SimplenoteScreenshots.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SimplenoteScreenshots.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		3FA6013B242C5AAE0068FC52 /* SimplenoteScreenshots.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SimplenoteScreenshots.swift; sourceTree = "<group>"; };
 		3FA6013D242C5AAE0068FC52 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		3FD478242C572EE10071B8B9 /* Project.Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Project.Release.xcconfig; sourceTree = "<group>"; };
 		3FF314D226FC47720012E68E /* XCUIApplication+Assertions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "XCUIApplication+Assertions.swift"; sourceTree = "<group>"; };
 		3FFBDBEB26FBF132008AD052 /* UITestsFoundation.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = UITestsFoundation.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		3FFBDBED26FBF132008AD052 /* UITestsFoundation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UITestsFoundation.h; sourceTree = "<group>"; };
@@ -1631,6 +1632,7 @@
 				8C573B0D22CD1AD6005BC6F5 /* Version.Public.xcconfig */,
 				8C573B0A22CD1A61005BC6F5 /* Simplenote.debug.xcconfig */,
 				8C573B0B22CD1A6F005BC6F5 /* Simplenote.release.xcconfig */,
+				3FD478242C572EE10071B8B9 /* Project.Release.xcconfig */,
 			);
 			path = config;
 			sourceTree = "<group>";
@@ -4586,7 +4588,6 @@
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = PZYM8XX95Q;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
 				ENABLE_TESTABILITY = YES;
@@ -4897,7 +4898,6 @@
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = PZYM8XX95Q;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -5268,7 +5268,6 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = PZYM8XX95Q;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -5350,7 +5349,6 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution: Automattic, Inc. (PZYM8XX95Q)";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = PZYM8XX95Q;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -5438,7 +5436,6 @@
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = PZYM8XX95Q;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = "SimplenoteIntents/Supporting Files/Info.plist";
@@ -5552,7 +5549,6 @@
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = PZYM8XX95Q;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = "SimplenoteIntents/Supporting Files/Info.plist";
@@ -5639,7 +5635,6 @@
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 4.36.0.0;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = PZYM8XX95Q;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = SimplenoteWidgets/Info.plist;
@@ -5765,7 +5760,6 @@
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 4.36.0.0;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = PZYM8XX95Q;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = SimplenoteWidgets/Info.plist;
diff --git a/config/Project.Release.xcconfig b/config/Project.Release.xcconfig
new file mode 100644
index 000000000..7b29190ff
--- /dev/null
+++ b/config/Project.Release.xcconfig
@@ -0,0 +1 @@
+DEVELOPMENT_TEAM = PZYM8XX95Q
diff --git a/config/Simplenote.release.xcconfig b/config/Simplenote.release.xcconfig
index f77a796b2..b8b65be61 100644
--- a/config/Simplenote.release.xcconfig
+++ b/config/Simplenote.release.xcconfig
@@ -1,3 +1,4 @@
 #include "Version.public.xcconfig"
+#include "Project.Release.xcconfig"
 
 DISPLAY_NAME=Simplenote

From ac3c4b5d77111b7f28f144de67e65246923b08a6 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 12:04:28 +1000
Subject: [PATCH 382/547] Use `xcconfig` to specify provisioning profile for
 ASC builds

---
 Simplenote.xcodeproj/project.pbxproj | 8 --------
 config/Simplenote.release.xcconfig   | 2 ++
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index d46d32506..aad5b080c 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -4618,7 +4618,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.codality.NotationalFlow;
 				PRODUCT_NAME = Simplenote;
 				PROVISIONING_PROFILE = "";
-				PROVISIONING_PROFILE_SPECIFIER = "Simplenote Release";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "RELEASE $(SP_IOS_SDK)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Simplenote/Simplenote-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -4927,7 +4926,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.codality.NotationalFlow;
 				PRODUCT_NAME = Simplenote;
 				PROVISIONING_PROFILE = "";
-				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.codality.NotationalFlow";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "BUILD_APP_STORE $(SP_IOS_SDK)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Simplenote/Simplenote-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -5288,7 +5286,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.codality.NotationalFlow.Share;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
-				PROVISIONING_PROFILE_SPECIFIER = "Simplenote Release Share";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = APP_EXTENSION;
 				SWIFT_OBJC_BRIDGING_HEADER = "SimplenoteShare/Simplenote-Share-Bridging-Header.h";
@@ -5369,7 +5366,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.codality.NotationalFlow.Share;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
-				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.codality.NotationalFlow.Share";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = APP_EXTENSION;
 				SWIFT_OBJC_BRIDGING_HEADER = "SimplenoteShare/Simplenote-Share-Bridging-Header.h";
@@ -5449,7 +5445,6 @@
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.codality.NotationalFlow.Intents;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.codality.NotationalFlow.Intents";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = APP_EXTENSION;
 				SWIFT_OBJC_BRIDGING_HEADER = "SimplenoteIntents/Simplenote-Intents-Bridging-Header.h";
@@ -5562,7 +5557,6 @@
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.codality.NotationalFlow.Intents;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.codality.NotationalFlow.Intents";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = APP_EXTENSION;
 				SWIFT_OBJC_BRIDGING_HEADER = "SimplenoteIntents/Simplenote-Intents-Bridging-Header.h";
@@ -5649,7 +5643,6 @@
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.codality.NotationalFlow.Widgets;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.codality.NotationalFlow.Widgets";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = APP_EXTENSION;
 				SWIFT_OBJC_BRIDGING_HEADER = "SimplenoteWidgets/Simplenote-Widgets-Bridging-Header.h";
@@ -5774,7 +5767,6 @@
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.codality.NotationalFlow.Widgets;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.codality.NotationalFlow.Widgets";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = APP_EXTENSION;
 				SWIFT_OBJC_BRIDGING_HEADER = "SimplenoteWidgets/Simplenote-Widgets-Bridging-Header.h";
diff --git a/config/Simplenote.release.xcconfig b/config/Simplenote.release.xcconfig
index b8b65be61..26a784bda 100644
--- a/config/Simplenote.release.xcconfig
+++ b/config/Simplenote.release.xcconfig
@@ -2,3 +2,5 @@
 #include "Project.Release.xcconfig"
 
 DISPLAY_NAME=Simplenote
+
+PROVISIONING_PROFILE_SPECIFIER = match AppStore $(PRODUCT_BUNDLE_IDENTIFIER)

From 1892b8c455a05d3f704ff6eac9d301b28339e618 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 12:06:23 +1000
Subject: [PATCH 383/547] Extract logic to build for ASC in dedicated lane

---
 fastlane/lanes/build.rb | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb
index 5635aa1e7..9ff70b78f 100644
--- a/fastlane/lanes/build.rb
+++ b/fastlane/lanes/build.rb
@@ -10,19 +10,7 @@
   UI.important("Building version #{release_version_current} (#{build_code_current}) and uploading to TestFlight...")
   UI.user_error!('Aborted by user request') unless skip_confirm || UI.confirm('Do you want to continue?')
 
-  appstore_code_signing
-
-  gym(
-    scheme: 'Simplenote',
-    workspace: 'Simplenote.xcworkspace',
-    configuration: 'Distribution AppStore',
-    clean: true,
-    export_options: {
-      method: 'app-store',
-      export_team_id: TEAM_ID_APP_STORE_CONNECT,
-      provisioningProfiles: simplenote_provisioning_profiles
-    }
-  )
+  build_for_app_store_connect
 
   testflight(
     skip_waiting_for_build_processing: true,
@@ -52,3 +40,19 @@
     prerelease: beta_release
   )
 end
+
+lane :build_for_app_store_connect do |fetch_code_signig: true|
+  appstore_code_signing if fetch_code_signig
+
+  gym(
+    scheme: 'Simplenote',
+    workspace: 'Simplenote.xcworkspace',
+    configuration: 'Distribution AppStore',
+    clean: true,
+    export_options: {
+      method: 'app-store',
+      export_team_id: TEAM_ID_APP_STORE_CONNECT,
+      provisioningProfiles: simplenote_provisioning_profiles
+    }
+  )
+end

From 260fb61d7320c69dc52c6af9fcd59e2bfc1affa8 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 12:07:02 +1000
Subject: [PATCH 384/547] Use project file as source of truth for ASC code
 signing settings

---
 fastlane/lanes/build.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb
index 9ff70b78f..9e00621e2 100644
--- a/fastlane/lanes/build.rb
+++ b/fastlane/lanes/build.rb
@@ -49,10 +49,6 @@
     workspace: 'Simplenote.xcworkspace',
     configuration: 'Distribution AppStore',
     clean: true,
-    export_options: {
-      method: 'app-store',
-      export_team_id: TEAM_ID_APP_STORE_CONNECT,
-      provisioningProfiles: simplenote_provisioning_profiles
-    }
+    export_method: 'app-store'
   )
 end

From b277305326adb5a0836ec2260b57325673e70aee Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 12:08:31 +1000
Subject: [PATCH 385/547] DRY workspace definition

---
 fastlane/Fastfile       | 6 ++++--
 fastlane/lanes/build.rb | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 17334ee02..6db868864 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -47,6 +47,8 @@ GITHUB_REPO = "#{ORGANIZATION}/#{PROJECT_SLUG}".freeze
 BUILDKITE_ORGANIZATION = ORGANIZATION
 BUILDKITE_PIPELINE = PROJECT_SLUG
 
+WORKSPACE = 'Simplenote.xcworkspace'
+
 ########################################################################
 # Environment
 ########################################################################
@@ -342,7 +344,7 @@ platform :ios do
     gym(
       scheme: 'Simplenote',
       configuration: 'Distribution Internal',
-      workspace: 'Simplenote.xcworkspace',
+      workspace: WORKSPACE,
       export_method: 'enterprise',
       clean: true,
       output_directory: OUTPUT_DIRECTORY_PATH,
@@ -422,7 +424,7 @@ platform :ios do
     gym(
       scheme: 'Simplenote',
       configuration: 'Distribution Alpha',
-      workspace: 'Simplenote.xcworkspace',
+      workspace: WORKSPACE,
       export_method: 'enterprise',
       clean: true,
       output_directory: OUTPUT_DIRECTORY_PATH,
diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb
index 9e00621e2..efb814eaf 100644
--- a/fastlane/lanes/build.rb
+++ b/fastlane/lanes/build.rb
@@ -41,12 +41,12 @@
   )
 end
 
-lane :build_for_app_store_connect do |fetch_code_signig: true|
-  appstore_code_signing if fetch_code_signig
+lane :build_for_app_store_connect do |fetch_code_signing: true|
+  appstore_code_signing if fetch_code_signing
 
   gym(
     scheme: 'Simplenote',
-    workspace: 'Simplenote.xcworkspace',
+    workspace: WORKSPACE,
     configuration: 'Distribution AppStore',
     clean: true,
     export_method: 'app-store'

From 9960ee43599b90ffc937f49591d11a7c63ba6b35 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 12:29:23 +1000
Subject: [PATCH 386/547] Update Fastlane versioning object to reflect app's
 strategy

---
 fastlane/Fastfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 6db868864..ad49c227d 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -59,7 +59,7 @@ ENV['PUBLIC_CONFIG_FILE'] = VERSION_FILE_PATH
 ENV['DOWNLOAD_METADATA'] = './fastlane/download_metadata.swift'
 ENV['FL_RELEASE_TOOLKIT_DEFAULT_BRANCH'] = 'trunk'
 
-VERSION_CALCULATOR = Fastlane::Wpmreleasetoolkit::Versioning::MarketingVersionCalculator.new
+VERSION_CALCULATOR = Fastlane::Wpmreleasetoolkit::Versioning::SemanticVersionCalculator.new
 VERSION_FORMATTER = Fastlane::Wpmreleasetoolkit::Versioning::FourPartVersionFormatter.new
 BUILD_CODE_FORMATTER = Fastlane::Wpmreleasetoolkit::Versioning::FourPartBuildCodeFormatter.new
 PUBLIC_VERSION_FILE = Fastlane::Wpmreleasetoolkit::Versioning::IOSVersionFile.new(xcconfig_path: VERSION_FILE_PATH)
@@ -1032,7 +1032,7 @@ def release_version_current
   VERSION_FORMATTER.release_version(current_version)
 end
 
-#  Returns the next release version of the app in the format `1.2` or `1.2.3` if it is a hotfix
+# Returns the next release version of the app in the format `1.2` or `1.2.3` if it is a hotfix
 #
 def release_version_next
   current_version = VERSION_FORMATTER.parse(PUBLIC_VERSION_FILE.read_release_version)
@@ -1053,7 +1053,7 @@ end
 #
 def build_code_code_freeze
   # We use the four part (1.2.3.4) build code format, so the version calculator can be used to calculate the next four-part version
-  release_version_current = VERSION_FORMATTER.parse(INTERNAL_VERSION_FILE.read_release_version)
+  release_version_current = VERSION_FORMATTER.parse(PUBLIC_VERSION_FILE.read_release_version)
   build_code_code_freeze = VERSION_CALCULATOR.next_release_version(version: release_version_current)
   BUILD_CODE_FORMATTER.build_code(version: build_code_code_freeze)
 end

From 248a254c2aa305d93aa9060567eb2c83a9776527 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 12:32:02 +1000
Subject: [PATCH 387/547] Fix incorrect config file path

---
 fastlane/lanes/release.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 8f4ceb57d..d5f843904 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -88,7 +88,7 @@
 
 def commit_version_and_build_files
   git_commit(
-    path: [PUBLIC_CONFIG_FILE],
+    path: [VERSION_FILE_PATH],
     message: 'Bump version number',
     allow_nothing_to_commit: false
   )

From 737c86bdb2cf459e5a469ded6f0370ef957fc3a6 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 16:16:58 +1000
Subject: [PATCH 388/547] Bump version number

---
 config/Version.Public.xcconfig | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/config/Version.Public.xcconfig b/config/Version.Public.xcconfig
index 63d01d802..87ee4e31e 100644
--- a/config/Version.Public.xcconfig
+++ b/config/Version.Public.xcconfig
@@ -1,4 +1,2 @@
-VERSION_SHORT=4.51
-
-// Public long version example: VERSION_LONG=4.8.1.1
-VERSION_LONG=4.51.0.1
+VERSION_LONG = 4.52.0.0
+VERSION_SHORT = 4.52

From d3c5bdddeee47b83b08ad772a3daf49a9d727857 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 16:16:58 +1000
Subject: [PATCH 389/547] Update draft release notes for 4.52.

---
 Simplenote/Resources/release_notes.txt | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Simplenote/Resources/release_notes.txt b/Simplenote/Resources/release_notes.txt
index 37a8f4076..a9bcf28d6 100644
--- a/Simplenote/Resources/release_notes.txt
+++ b/Simplenote/Resources/release_notes.txt
@@ -1,3 +1,6 @@
-• Fixed issue where note cell appearance changes on press down instead of when the cell is selected
-• Fixed an issue where using the new note widget with the lock screen could create empty notes while the app was locked
-• Removed Sustainer plan information and upgrade UI
+- Extended support for iOS Shortcuts
+- Fixed issue where notes selection was lost when app backgrounded
+- Fixed an issue can activate the faceid switch without a passcode
+- Magic Link Login Support
+- Login UI has been overhauled
+

From c33a695e351e2dfdeabe441a0ad56736163bc562 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 16:16:58 +1000
Subject: [PATCH 390/547] Release Notes: add new section for next version
 (4.53)

---
 RELEASE-NOTES.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index ed8a89755..83a0ae689 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,3 +1,7 @@
+4.53
+-----
+
+
 4.52
 -----
 - Extended support for iOS Shortcuts

From 90165526e9ce341340315a419c1c39bafcd0a938 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 16:16:59 +1000
Subject: [PATCH 391/547] Freeze strings for localization

---
 Simplenote/en.lproj/Localizable.strings | Bin 33793 -> 72540 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Simplenote/en.lproj/Localizable.strings b/Simplenote/en.lproj/Localizable.strings
index 46c39dc752a5b1b0f497dad8c633df7b374e3e17..c12de2933068731f6a561d70406f7c4f2c7f3fc6 100644
GIT binary patch
literal 72540
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
HVf6n2k{`;#

literal 33793
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


From e7d2b4d27a0ba2d0a99452c8aeee228c68efc499 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 16:24:46 +1000
Subject: [PATCH 392/547] Default to current version for
 `update_appstore_strings`

---
 fastlane/Fastfile | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index ad49c227d..e44b7293e 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -65,20 +65,8 @@ BUILD_CODE_FORMATTER = Fastlane::Wpmreleasetoolkit::Versioning::FourPartBuildCod
 PUBLIC_VERSION_FILE = Fastlane::Wpmreleasetoolkit::Versioning::IOSVersionFile.new(xcconfig_path: VERSION_FILE_PATH)
 
 platform :ios do
-  #####################################################################################
-  # update_appstore_strings
-  # -----------------------------------------------------------------------------------
-  # This lane updates the AppStoreStrings.pot files with the latest content from
-  # the release_notes.txt file and the other text sources
-  # -----------------------------------------------------------------------------------
-  # Usage:
-  # bundle exec fastlane update_appstore_strings version:<release note version>
-  #
-  # Example:
-  # bundle exec fastlane update_appstore_strings version:1.1
-  #####################################################################################
   desc 'Updates the AppStoreStrings.pot file with the latest data'
-  lane :update_appstore_strings do |options|
+  lane :update_appstore_strings do |version: release_version_current|
     prj_folder = Pathname.new(File.join(Dir.pwd, '..')).expand_path.to_s
     source_metadata_folder = File.join(prj_folder, 'fastlane', 'appstoreres', 'metadata', 'source')
 
@@ -92,7 +80,7 @@ platform :ios do
     ios_update_metadata_source(
       po_file_path: File.join(prj_folder, 'Simplenote', 'Resources', 'AppStoreStrings.pot'),
       source_files: files,
-      release_version: options[:version]
+      release_version: version
     )
   end
 

From a8af526230a0868e6e5577ead9846a47cf22a840 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 16:25:11 +1000
Subject: [PATCH 393/547] Update metadata strings

---
 Simplenote/Resources/AppStoreStrings.pot | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Simplenote/Resources/AppStoreStrings.pot b/Simplenote/Resources/AppStoreStrings.pot
index 65aa660df..4e8da139b 100644
--- a/Simplenote/Resources/AppStoreStrings.pot
+++ b/Simplenote/Resources/AppStoreStrings.pot
@@ -66,10 +66,13 @@ msgctxt "app_store_keywords"
 msgid "notes,note,markdown,journal,sync,to-do,list,cloud,notebook,simple,notepad,tag,todo,writing,memo"
 msgstr ""
 
-msgctxt "v4.51-whats-new"
+msgctxt "v4.52-whats-new"
 msgid ""
-"• Fixed issue where note cell appearance changes on press down instead of when the cell is selected\n"
-"• Fixed an issue where using the new note widget with the lock screen could create empty notes while the app was locked\n"
-"• Removed Sustainer plan information and upgrade UI\n"
+"- Extended support for iOS Shortcuts\n"
+"- Fixed issue where notes selection was lost when app backgrounded\n"
+"- Fixed an issue can activate the faceid switch without a passcode\n"
+"- Magic Link Login Support\n"
+"- Login UI has been overhauled\n"
+"\n"
 msgstr ""
 

From 2e8280cf5dd5a7a6846e59f83d153701db550c54 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 17:43:47 +1000
Subject: [PATCH 394/547] Revert "Freeze strings for localization"

This reverts commit 90165526e9ce341340315a419c1c39bafcd0a938.
---
 Simplenote/en.lproj/Localizable.strings | Bin 72540 -> 33793 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Simplenote/en.lproj/Localizable.strings b/Simplenote/en.lproj/Localizable.strings
index c12de2933068731f6a561d70406f7c4f2c7f3fc6..46c39dc752a5b1b0f497dad8c633df7b374e3e17 100644
GIT binary patch
literal 33793
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

literal 72540
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
HVf6n2k{`;#


From 9aafb79a235adbbc365b7f0e0d51e2339a4c3457 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 17:48:09 +1000
Subject: [PATCH 395/547] Remove explicit file encoding from
 Localizable.strings

Experiment to see if it results in the localization remaining UTF-8
---
 Simplenote.xcodeproj/project.pbxproj | 38 ++++++++++++++--------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index aad5b080c..ccdf764e8 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -749,11 +749,11 @@
 		375D24AF21E01131007AB25A /* html_smartypants.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = html_smartypants.c; sourceTree = "<group>"; };
 		375D24B021E01131007AB25A /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = version.h; sourceTree = "<group>"; };
 		3762530520F54FFB00C1F239 /* SPAboutViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SPAboutViewController.swift; path = Classes/SPAboutViewController.swift; sourceTree = "<group>"; };
-		37CD04B91A60538B00C4A8E0 /* ko */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/Localizable.strings; sourceTree = "<group>"; };
-		37CD04BA1A6053CC00C4A8E0 /* fr */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = "<group>"; };
-		37CD04BB1A6053E900C4A8E0 /* es */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };
-		37CD04BC1A60540500C4A8E0 /* id */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = id; path = id.lproj/Localizable.strings; sourceTree = "<group>"; };
-		37CD04BD1A6054E900C4A8E0 /* ru */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = "<group>"; };
+		37CD04B91A60538B00C4A8E0 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/Localizable.strings; sourceTree = "<group>"; };
+		37CD04BA1A6053CC00C4A8E0 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = "<group>"; };
+		37CD04BB1A6053E900C4A8E0 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };
+		37CD04BC1A60540500C4A8E0 /* id */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = id; path = id.lproj/Localizable.strings; sourceTree = "<group>"; };
+		37CD04BD1A6054E900C4A8E0 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = "<group>"; };
 		37E10E7620B3368700864E43 /* WPAuthHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = WPAuthHandler.m; path = Classes/WPAuthHandler.m; sourceTree = "<group>"; };
 		37E10E7920B3477800864E43 /* WPAuthHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WPAuthHandler.h; path = Classes/WPAuthHandler.h; sourceTree = "<group>"; };
 		37E55A6621BF2B1800F14241 /* SPTextAttachment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPTextAttachment.swift; sourceTree = "<group>"; };
@@ -997,16 +997,16 @@
 		B550F93722BA814D00091939 /* NSUserActivity+Shortcuts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "NSUserActivity+Shortcuts.swift"; path = "Classes/NSUserActivity+Shortcuts.swift"; sourceTree = "<group>"; };
 		B5526335238881EE009AB3B2 /* Simplenote 5.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Simplenote 5.xcdatamodel"; sourceTree = "<group>"; };
 		B552AB8624B8E75E00E5E115 /* SPNoteEditorViewController+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "SPNoteEditorViewController+Extensions.swift"; path = "Classes/SPNoteEditorViewController+Extensions.swift"; sourceTree = "<group>"; };
-		B5536B861B8E46AC00FF190A /* cy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = cy; path = cy.lproj/Localizable.strings; sourceTree = "<group>"; };
-		B5536B871B8E47B400FF190A /* de */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
-		B5536B881B8E490200FF190A /* pt-BR */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Localizable.strings"; sourceTree = "<group>"; };
-		B5536B891B8E498900FF190A /* tr */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Localizable.strings; sourceTree = "<group>"; };
-		B5536B8A1B8E49C600FF190A /* ar */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Localizable.strings; sourceTree = "<group>"; };
-		B5536B8B1B8E4A1900FF190A /* zh-Hant-TW */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = "zh-Hant-TW"; path = "zh-Hant-TW.lproj/Localizable.strings"; sourceTree = "<group>"; };
-		B5536B8C1B8E4A5200FF190A /* el */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/Localizable.strings; sourceTree = "<group>"; };
-		B5536B8D1B8E4A7D00FF190A /* he */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/Localizable.strings; sourceTree = "<group>"; };
-		B5536B8E1B8E4AAC00FF190A /* nl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = "<group>"; };
-		B5536B8F1B8E4B8A00FF190A /* zh-Hans-CN */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = "zh-Hans-CN"; path = "zh-Hans-CN.lproj/Localizable.strings"; sourceTree = "<group>"; };
+		B5536B861B8E46AC00FF190A /* cy */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cy; path = cy.lproj/Localizable.strings; sourceTree = "<group>"; };
+		B5536B871B8E47B400FF190A /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
+		B5536B881B8E490200FF190A /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Localizable.strings"; sourceTree = "<group>"; };
+		B5536B891B8E498900FF190A /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Localizable.strings; sourceTree = "<group>"; };
+		B5536B8A1B8E49C600FF190A /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Localizable.strings; sourceTree = "<group>"; };
+		B5536B8B1B8E4A1900FF190A /* zh-Hant-TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant-TW"; path = "zh-Hant-TW.lproj/Localizable.strings"; sourceTree = "<group>"; };
+		B5536B8C1B8E4A5200FF190A /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/Localizable.strings; sourceTree = "<group>"; };
+		B5536B8D1B8E4A7D00FF190A /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/Localizable.strings; sourceTree = "<group>"; };
+		B5536B8E1B8E4AAC00FF190A /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = "<group>"; };
+		B5536B8F1B8E4B8A00FF190A /* zh-Hans-CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans-CN"; path = "zh-Hans-CN.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		B55AC57922D27B9100D8CEB2 /* OptionsTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OptionsTests.swift; sourceTree = "<group>"; };
 		B55E428B22A1A4550018C0CE /* SPSortOrderViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SPSortOrderViewController.swift; path = Classes/SPSortOrderViewController.swift; sourceTree = "<group>"; };
 		B5651239243BC063001EFE77 /* fa */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fa; path = fa.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -1291,9 +1291,9 @@
 		E219EAF617C5322400179B40 /* SPInteractiveTextStorage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SPInteractiveTextStorage.m; path = Classes/SPInteractiveTextStorage.m; sourceTree = "<group>"; };
 		E21F57B717C1244E001F02D3 /* SPEditorTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SPEditorTextView.h; path = Classes/SPEditorTextView.h; sourceTree = "<group>"; };
 		E21F57B817C1244E001F02D3 /* SPEditorTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SPEditorTextView.m; path = Classes/SPEditorTextView.m; sourceTree = "<group>"; };
-		E225E23E180DB1DF005A71A0 /* sv */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Localizable.strings; sourceTree = "<group>"; };
-		E225E23F180DB4DD005A71A0 /* ja */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = "<group>"; };
-		E225E240180DB61A005A71A0 /* it */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Localizable.strings; sourceTree = "<group>"; };
+		E225E23E180DB1DF005A71A0 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Localizable.strings; sourceTree = "<group>"; };
+		E225E23F180DB4DD005A71A0 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = "<group>"; };
+		E225E240180DB61A005A71A0 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Localizable.strings; sourceTree = "<group>"; };
 		E22A17CE17A2E1CE00383575 /* NSManagedObjectContext+CoreDataExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSManagedObjectContext+CoreDataExtensions.h"; path = "Classes/NSManagedObjectContext+CoreDataExtensions.h"; sourceTree = "<group>"; };
 		E22A17CF17A2E1CE00383575 /* NSManagedObjectContext+CoreDataExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSManagedObjectContext+CoreDataExtensions.m"; path = "Classes/NSManagedObjectContext+CoreDataExtensions.m"; sourceTree = "<group>"; };
 		E22A17D117A2E2A000383575 /* SPObjectManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SPObjectManager.h; path = Simplenote/Classes/SPObjectManager.h; sourceTree = SOURCE_ROOT; };
@@ -1317,7 +1317,7 @@
 		E26AC90F179DA25F00C4BFB6 /* SPSettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SPSettingsViewController.m; path = Classes/SPSettingsViewController.m; sourceTree = "<group>"; };
 		E277B5FF17A063020095CD24 /* SPTagEntryField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SPTagEntryField.h; path = Classes/SPTagEntryField.h; sourceTree = "<group>"; };
 		E277B60017A063020095CD24 /* SPTagEntryField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SPTagEntryField.m; path = Classes/SPTagEntryField.m; sourceTree = "<group>"; };
-		E280453D180DAE0200670073 /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
+		E280453D180DAE0200670073 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		E283709817D7B46300AB562D /* SPAcitivitySafari.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SPAcitivitySafari.h; path = Classes/SPAcitivitySafari.h; sourceTree = "<group>"; };
 		E283709917D7B46300AB562D /* SPAcitivitySafari.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SPAcitivitySafari.m; path = Classes/SPAcitivitySafari.m; sourceTree = "<group>"; };
 		E28A760D178CBE6D008659DE /* SPNoteEditorViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SPNoteEditorViewController.h; path = Classes/SPNoteEditorViewController.h; sourceTree = "<group>"; };

From feb0405fdeda168d8cdb78b8c2dfaa6edd1e3162 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 29 Jul 2024 18:29:46 +1000
Subject: [PATCH 396/547] Freeze strings for localization

---
 Simplenote/en.lproj/Localizable.strings | Bin 33793 -> 72540 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Simplenote/en.lproj/Localizable.strings b/Simplenote/en.lproj/Localizable.strings
index 46c39dc752a5b1b0f497dad8c633df7b374e3e17..c12de2933068731f6a561d70406f7c4f2c7f3fc6 100644
GIT binary patch
literal 72540
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
HVf6n2k{`;#

literal 33793
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


From c0ace58433313e3b8e50b23463565398a96326ab Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Wed, 31 Jul 2024 13:28:43 -0600
Subject: [PATCH 397/547] Limit character input on login code text field

---
 Simplenote/Classes/SPAuthViewController.swift | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index c3f50f191..82d79b24d 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -841,6 +841,18 @@ extension SPAuthViewController: SPTextInputViewDelegate {
         performPrimaryActionIfPossible()
         return false
     }
+
+    func textInput(_ textInput: SPTextInputView, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
+        guard textInput == codeInputView else {
+            return true
+        }
+
+        let maxLength = 6
+        let currentString = (textInput.text ?? "") as NSString
+        let newString = currentString.replacingCharacters(in: range, with: string)
+
+        return newString.count <= maxLength
+    }
 }
 
 

From d1f61232971fef7b90df658b5ec4ff21cd01d834 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Wed, 31 Jul 2024 16:00:19 -0600
Subject: [PATCH 398/547] Validate deleting tag before completing

---
 Simplenote/TagListViewController.swift | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/Simplenote/TagListViewController.swift b/Simplenote/TagListViewController.swift
index cb3e01e01..3db5aac18 100644
--- a/Simplenote/TagListViewController.swift
+++ b/Simplenote/TagListViewController.swift
@@ -501,6 +501,13 @@ extension TagListViewController: TagListViewCellDelegate {
                                                 preferredStyle: .actionSheet)
 
         alertController.addDestructiveActionWithTitle(Localization.TagDeletionConfirmation.confirmationButton) { (_) in
+            guard self.shouldRemove(tag, at: indexPath) else {
+                self.present(UIAlertController.dismissableAlert(
+                    title: Localization.tagDeleteFailedTitle,
+                    message: Localization.tagDeleteFailedMessage), animated: true)
+                return
+            }
+
             switch source {
             case .accessory:
                 SPTracker.trackTagRowDeleted()
@@ -519,6 +526,17 @@ extension TagListViewController: TagListViewCellDelegate {
 
         present(alertController, animated: true, completion: nil)
     }
+
+    private func shouldRemove(_ tagToRemove: Tag, at indexPath: IndexPath) -> Bool {
+        // REF: https://github.com/Automattic/simplenote-ios/issues/1312
+        // If you initiate deleting a tag and the tag is deleted before you confirm then another tag is deleted
+        // This method confirms the selected tag is the same as the tag at index path before removing.
+        guard let tagAtIndexPath = tag(at: indexPath) else {
+            return false
+        }
+
+        return tagToRemove.simperiumKey == tagAtIndexPath.simperiumKey
+    }
 }
 
 // MARK: - Helper Methods
@@ -888,6 +906,9 @@ private struct Localization {
     static let tags = NSLocalizedString("Tags", comment: "Tags List Header")
     static let untaggedNotes = NSLocalizedString("Untagged Notes", comment: "Allows selecting notes with no tags")
 
+    static let tagDeleteFailedTitle = NSLocalizedString("Could not delete tag", comment: "Notifies user tag delete failed")
+    static let tagDeleteFailedMessage = NSLocalizedString("Please try again", comment: "Encourages trying delete again")
+
     struct TagDeletionConfirmation {
         static func title(with tagName: String) -> String {
             let template = NSLocalizedString("Are you sure you want to delete \"%1$@\"?", comment: "Title of deletion confirmation message for a tag. Parameters: %1$@ - tag name")

From dcb0709b95b6373b3854ae20da6e62036c1e4054 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 1 Aug 2024 13:07:19 -0600
Subject: [PATCH 399/547] Fix animation preview to be on the trailing edge
 regardless of direction

---
 Simplenote/Classes/SPNoteEditorViewController.m | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Simplenote/Classes/SPNoteEditorViewController.m b/Simplenote/Classes/SPNoteEditorViewController.m
index 05ca31329..57c4f9ab0 100644
--- a/Simplenote/Classes/SPNoteEditorViewController.m
+++ b/Simplenote/Classes/SPNoteEditorViewController.m
@@ -386,13 +386,15 @@ - (void)bounceMarkdownPreview
     [snapshot addSubview:fakeMarkdownPreviewSnapshot];
 
     // Offset the fake markdown preview off to the right of the screen
+    bool isLTR = [UIView userInterfaceLayoutDirectionForSemanticContentAttribute: self.view.semanticContentAttribute] == UIUserInterfaceLayoutDirectionLeftToRight;
+    int multiplier = isLTR ? 1 : -1;
     CGRect frame = snapshot.frame;
-    frame.origin.x = CGRectGetWidth(self.view.bounds);
+    frame.origin.x = CGRectGetWidth(self.view.bounds) * multiplier;
     fakeMarkdownPreviewSnapshot.frame = frame;
 
     self.noteEditorTextView.hidden = YES;
 
-    CGFloat bounceDistance = -40;
+    CGFloat bounceDistance = -40 * multiplier;
 
     // Do a nice bounce animation
     [UIView animateWithDuration:0.25 delay:0 options:UIViewAnimationOptionCurveEaseOut animations:^{

From 4167152bbad03b2834e8af554c61ee956bfba388 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 1 Aug 2024 13:19:02 -0600
Subject: [PATCH 400/547] Fixed animation direction for RTL languages when
 swiping markdown

---
 .../Classes/SPInteractivePushPopAnimationController.m       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Simplenote/Classes/SPInteractivePushPopAnimationController.m b/Simplenote/Classes/SPInteractivePushPopAnimationController.m
index 60d71a893..a7ee90c41 100644
--- a/Simplenote/Classes/SPInteractivePushPopAnimationController.m
+++ b/Simplenote/Classes/SPInteractivePushPopAnimationController.m
@@ -60,6 +60,10 @@ - (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
     CGPoint location = [panGestureRecognizer locationInView:navigationBar];
     CGPoint translation = [panGestureRecognizer translationInView:navigationBar];
     BOOL isLeftTranslation = translation.x < 0;
+    BOOL isRightTranslation = translation.x > 0;
+    BOOL isLTR = [UIView userInterfaceLayoutDirectionForSemanticContentAttribute: topViewController.view.semanticContentAttribute] == UIUserInterfaceLayoutDirectionLeftToRight;
+
+    BOOL isSwipeTranslation = isLTR ? isLeftTranslation : isRightTranslation;
 
     // Ignore touches within the navigation bar
     if (CGRectContainsPoint(navigationBar.bounds, location)) {
@@ -67,7 +71,7 @@ - (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
     }
 
     // TopViewController conforms to SPInteractivePushViewControllerProvider AND We're Swiping Right to Left: Support Push!
-    if ([topViewController conformsToProtocol:@protocol(SPInteractivePushViewControllerProvider)] && isLeftTranslation) {
+    if ([topViewController conformsToProtocol:@protocol(SPInteractivePushViewControllerProvider)] && isSwipeTranslation) {
         UIViewController <SPInteractivePushViewControllerProvider> *pushProviderController = (UIViewController <SPInteractivePushViewControllerProvider> *)topViewController;
         CGPoint locationInView = [panGestureRecognizer locationInView:pushProviderController.view];
         if (![pushProviderController interactivePushPopAnimationControllerShouldBeginPush:self touchPoint:locationInView]) {

From 1a65ff69bd78c4afefcd9a38e1294659338f6ad3 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 1 Aug 2024 13:49:57 -0600
Subject: [PATCH 401/547] Updated package tracks dependency to get updates to
 sentry build error

---
 Simplenote.xcodeproj/project.pbxproj                      | 2 +-
 .../xcshareddata/swiftpm/Package.resolved                 | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
index 6154f0d96..ad39f4e1f 100644
--- a/Simplenote.xcodeproj/project.pbxproj
+++ b/Simplenote.xcodeproj/project.pbxproj
@@ -6267,7 +6267,7 @@
 			repositoryURL = "https://github.com/Automattic/Automattic-Tracks-iOS";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 3.2.0;
+				minimumVersion = 3.5.0;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
diff --git a/Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 090b42b39..16c53eec3 100644
--- a/Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -6,8 +6,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/Automattic/Automattic-Tracks-iOS",
       "state" : {
-        "revision" : "b6979ef69b4b094c8809ba83661222dcd0d7667e",
-        "version" : "3.2.0"
+        "revision" : "4d7d7138a9f2b36c3fd4618aa488ed9e8de2f726",
+        "version" : "3.5.0"
       }
     },
     {
@@ -24,8 +24,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/getsentry/sentry-cocoa",
       "state" : {
-        "revision" : "3b9a8e69ca296bd8cd0e317ad7a448e5daf4a342",
-        "version" : "8.18.0"
+        "revision" : "5421f94cc859eb65f5ae3866165a053aa634431e",
+        "version" : "8.32.0"
       }
     },
     {

From d2a9dbf2efb864f3042618c804142fd39285e2e0 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 7 Aug 2024 16:46:04 +1000
Subject: [PATCH 402/547] Tidy for clarity: Use `build_app` alias instead of
 `gym`

---
 fastlane/lanes/build.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb
index efb814eaf..75f5b8fa5 100644
--- a/fastlane/lanes/build.rb
+++ b/fastlane/lanes/build.rb
@@ -44,7 +44,7 @@
 lane :build_for_app_store_connect do |fetch_code_signing: true|
   appstore_code_signing if fetch_code_signing
 
-  gym(
+  build_app(
     scheme: 'Simplenote',
     workspace: WORKSPACE,
     configuration: 'Distribution AppStore',

From f71ac6b85dfff4c72ff0a395ef1852b39f38c2d2 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 7 Aug 2024 16:50:54 +1000
Subject: [PATCH 403/547] Specify output folder and name when building for ASC

---
 fastlane/lanes/build.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb
index 75f5b8fa5..5393b13c2 100644
--- a/fastlane/lanes/build.rb
+++ b/fastlane/lanes/build.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+APP_STORE_CONNECT_OUTPUT_NAME = 'Simplenote-AppStore'
+
 desc 'Builds and uploads for distribution via App Store Connect'
 lane :build_and_upload_to_app_store_connect do |beta_release:, skip_prechecks: false, skip_confirm: false, create_release: false|
   unless skip_prechecks
@@ -49,6 +51,8 @@
     workspace: WORKSPACE,
     configuration: 'Distribution AppStore',
     clean: true,
-    export_method: 'app-store'
+    export_method: 'app-store',
+    output_directory: OUTPUT_DIRECTORY_PATH,
+    output_name: APP_STORE_CONNECT_OUTPUT_NAME
   )
 end

From 5dd998931a7483441b957ae8cceda930a6bafb1b Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Thu, 8 Aug 2024 12:58:08 +1000
Subject: [PATCH 404/547] Extract automation to upload to TestFlight into
 dedicated lane

---
 fastlane/lanes/build.rb | 59 ++++++++++++++++++++++++++++++-----------
 1 file changed, 43 insertions(+), 16 deletions(-)

diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb
index 5393b13c2..09cd0f81d 100644
--- a/fastlane/lanes/build.rb
+++ b/fastlane/lanes/build.rb
@@ -14,13 +14,53 @@
 
   build_for_app_store_connect
 
+  upload_to_app_store_connect(
+    beta_release: beta_release,
+    skip_prechecks: skip_prechecks,
+    create_release: create_release
+  )
+end
+
+lane :build_for_app_store_connect do |fetch_code_signing: true|
+  appstore_code_signing if fetch_code_signing
+
+  build_app(
+    scheme: 'Simplenote',
+    workspace: WORKSPACE,
+    configuration: 'Distribution AppStore',
+    clean: true,
+    export_method: 'app-store',
+    # "build" is where the xcarchive will go, "output" where the ipa and dSYM will go.
+    # We need to define both to have predictable artifact paths to use in other lanes and automation.
+    build_path: OUTPUT_DIRECTORY_PATH,
+    output_directory: OUTPUT_DIRECTORY_PATH,
+    output_name: APP_STORE_CONNECT_OUTPUT_NAME
+  )
+end
+
+lane :upload_to_app_store_connect do |beta_release:, skip_prechecks: false, create_release: false|
+  sentry_check_cli_installed unless skip_prechecks
+
+  ipa_path = File.join(OUTPUT_DIRECTORY_PATH, "#{APP_STORE_CONNECT_OUTPUT_NAME}.ipa")
+  UI.user_error!("Could not find ipa at #{ipa_path}!") unless File.exist?(ipa_path)
+
+  dsym_path = File.join(OUTPUT_DIRECTORY_PATH, "#{APP_STORE_CONNECT_OUTPUT_NAME}.app.dSYM.zip")
+  UI.user_error!("Could not find dSYM at #{dsym_path}!") unless File.exist?(ipa_path)
+
+  UI.important("Uploading ipa at #{ipa_path} to TestFlight...")
   testflight(
+    ipa: ipa_path,
     skip_waiting_for_build_processing: true,
     api_key_path: APP_STORE_CONNECT_KEY_PATH
   )
 
-  dsym_path = File.join(File.dirname(Dir.pwd), 'Simplenote.app.dSYM.zip')
+  if File.exist?(dsym_path)
+    UI.important("Uploading ipa at #{ipa_path} to TestFlight...")
+  else
+    UI.user_error!("Could not find ipa at #{ipa_path}!")
+  end
 
+  UI.important("Uploading dSYM at #{dsym_path} to Sentry...")
   sentry_upload_dsym(
     dsym_path: dsym_path,
     auth_token: EnvManager.get_required_env!('SENTRY_AUTH_TOKEN'),
@@ -30,9 +70,10 @@
 
   next unless create_release
 
-  archive_zip_path = File.join(File.dirname(Dir.pwd), 'Simplenote.xarchive.zip')
+  archive_zip_path = File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote.xarchive.zip')
   zip(path: lane_context[SharedValues::XCODEBUILD_ARCHIVE], output_path: archive_zip_path)
 
+  # TODO: Use Versioning module to get the version
   version = beta_release ? ios_get_build_version : ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
   create_release(
     repository: GITHUB_REPO,
@@ -42,17 +83,3 @@
     prerelease: beta_release
   )
 end
-
-lane :build_for_app_store_connect do |fetch_code_signing: true|
-  appstore_code_signing if fetch_code_signing
-
-  build_app(
-    scheme: 'Simplenote',
-    workspace: WORKSPACE,
-    configuration: 'Distribution AppStore',
-    clean: true,
-    export_method: 'app-store',
-    output_directory: OUTPUT_DIRECTORY_PATH,
-    output_name: APP_STORE_CONNECT_OUTPUT_NAME
-  )
-end

From be1d9e7588a90ba21f8f34fd6ad1c5871c2fa545 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Thu, 8 Aug 2024 13:01:40 +1000
Subject: [PATCH 405/547] Use `Versioning` module to read version for
 TestFlight upload

---
 fastlane/lanes/build.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb
index 09cd0f81d..7fb6d152b 100644
--- a/fastlane/lanes/build.rb
+++ b/fastlane/lanes/build.rb
@@ -73,8 +73,7 @@
   archive_zip_path = File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote.xarchive.zip')
   zip(path: lane_context[SharedValues::XCODEBUILD_ARCHIVE], output_path: archive_zip_path)
 
-  # TODO: Use Versioning module to get the version
-  version = beta_release ? ios_get_build_version : ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
+  version = beta_release ? build_code_current : release_version_current
   create_release(
     repository: GITHUB_REPO,
     version: version,

From 945e0aeeb95312c2841c208945d466c941302c8d Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Thu, 8 Aug 2024 13:13:05 +1000
Subject: [PATCH 406/547] Strip timestamp from xcarchive name

---
 fastlane/lanes/build.rb | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb
index 7fb6d152b..00d8eb383 100644
--- a/fastlane/lanes/build.rb
+++ b/fastlane/lanes/build.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 APP_STORE_CONNECT_OUTPUT_NAME = 'Simplenote-AppStore'
+XCARCHIVE_PATH = File.join(OUTPUT_DIRECTORY_PATH, "#{APP_STORE_CONNECT_OUTPUT_NAME}.xcarchive")
 
 desc 'Builds and uploads for distribution via App Store Connect'
 lane :build_and_upload_to_app_store_connect do |beta_release:, skip_prechecks: false, skip_confirm: false, create_release: false|
@@ -30,9 +31,14 @@
     configuration: 'Distribution AppStore',
     clean: true,
     export_method: 'app-store',
-    # "build" is where the xcarchive will go, "output" where the ipa and dSYM will go.
-    # We need to define both to have predictable artifact paths to use in other lanes and automation.
-    build_path: OUTPUT_DIRECTORY_PATH,
+    # The options below might seem redundant but are currently all necessary to have predictable artifact paths to use in other lanes.
+    #
+    # - archive_path sets the full path for the xcarchive.
+    # - output_directory and output_name set the path and basename for the ipa and dSYM.
+    #
+    # We could have use 'build_path: OUTPUT_DIRECTORY_PATH' for the xcarchive...
+    # ...but doing so would append a timestamp and unnecessarily complicate other logic to get the path
+    archive_path: XCARCHIVE_PATH,
     output_directory: OUTPUT_DIRECTORY_PATH,
     output_name: APP_STORE_CONNECT_OUTPUT_NAME
   )
@@ -70,15 +76,15 @@
 
   next unless create_release
 
-  archive_zip_path = File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote.xarchive.zip')
-  zip(path: lane_context[SharedValues::XCODEBUILD_ARCHIVE], output_path: archive_zip_path)
+  xcarchive_zip_path = File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote.xarchive.zip')
+  zip(path: XCARCHIVE_PATH, output_path: xcarchive_zip_path)
 
   version = beta_release ? build_code_current : release_version_current
   create_release(
     repository: GITHUB_REPO,
     version: version,
     release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt'),
-    release_assets: archive_zip_path.to_s,
+    release_assets: xcarchive_zip_path.to_s,
     prerelease: beta_release
   )
 end

From 9fe2ede6bfa7b311a3374447d37ea1a519451ed2 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Thu, 8 Aug 2024 13:20:25 +1000
Subject: [PATCH 407/547] Define all Fastlane consts before importing the
 lanes...

---
 fastlane/Fastfile       | 47 +++++++++++++++++++++--------------------
 fastlane/lanes/build.rb |  6 ------
 2 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index e44b7293e..bfd36bccd 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -8,12 +8,36 @@ fastlane_require 'buildkit'
 
 UI.user_error!('Please run fastlane via `bundle exec`') unless FastlaneCore::Helper.bundler?
 
+PROJECT_ROOT_FOLDER = File.dirname(File.expand_path(__dir__))
+VERSION_FILE_PATH = File.join(PROJECT_ROOT_FOLDER, 'config', 'Version.Public.xcconfig')
+OUTPUT_DIRECTORY_PATH = File.join(PROJECT_ROOT_FOLDER, 'build', 'results')
+APP_STORE_BUNDLE_IDENTIFIER = 'com.codality.NotationalFlow'
+DEFAULT_BRANCH = 'trunk'
+
+TEAM_ID_APP_STORE_CONNECT = 'PZYM8XX95Q'
+TEAM_ID_ENTERPRISE = '99KV9Z6BKV'
+
+ORGANIZATION = 'automattic'
+PROJECT_SLUG = 'simplenote-ios'
+GITHUB_REPO = "#{ORGANIZATION}/#{PROJECT_SLUG}".freeze
+BUILDKITE_ORGANIZATION = ORGANIZATION
+BUILDKITE_PIPELINE = PROJECT_SLUG
+
+WORKSPACE = 'Simplenote.xcworkspace'
+
+VERSION_CALCULATOR = Fastlane::Wpmreleasetoolkit::Versioning::SemanticVersionCalculator.new
+VERSION_FORMATTER = Fastlane::Wpmreleasetoolkit::Versioning::FourPartVersionFormatter.new
+BUILD_CODE_FORMATTER = Fastlane::Wpmreleasetoolkit::Versioning::FourPartBuildCodeFormatter.new
+PUBLIC_VERSION_FILE = Fastlane::Wpmreleasetoolkit::Versioning::IOSVersionFile.new(xcconfig_path: VERSION_FILE_PATH)
+
 SECRETS_ROOT = File.join(Dir.home, '.configure', 'simplenote-ios', 'secrets')
 APP_STORE_CONNECT_KEY_PATH = File.join(SECRETS_ROOT, 'app_store_connect_fastlane_api_key.json')
 $used_test_account_index = nil
 
 require_relative 'lib/env_manager'
 
+# Important: These need to be imported after all the constants have be defined because the access them.
+# A bit of a leaky abstraction but makes for lanes that are easier to write...
 import 'lanes/localization.rb'
 import 'lanes/release.rb'
 import 'lanes/build.rb'
@@ -31,24 +55,6 @@ error do |lane, _exception, _options|
   deoccupy_test_account if lane == :run_ui_tests
 end
 
-# Constants
-PROJECT_ROOT_FOLDER = File.dirname(File.expand_path(__dir__))
-VERSION_FILE_PATH = File.join(PROJECT_ROOT_FOLDER, 'config', 'Version.Public.xcconfig')
-OUTPUT_DIRECTORY_PATH = File.join(PROJECT_ROOT_FOLDER, 'build', 'results')
-APP_STORE_BUNDLE_IDENTIFIER = 'com.codality.NotationalFlow'
-DEFAULT_BRANCH = 'trunk'
-
-TEAM_ID_APP_STORE_CONNECT = 'PZYM8XX95Q'
-TEAM_ID_ENTERPRISE = '99KV9Z6BKV'
-
-ORGANIZATION = 'automattic'
-PROJECT_SLUG = 'simplenote-ios'
-GITHUB_REPO = "#{ORGANIZATION}/#{PROJECT_SLUG}".freeze
-BUILDKITE_ORGANIZATION = ORGANIZATION
-BUILDKITE_PIPELINE = PROJECT_SLUG
-
-WORKSPACE = 'Simplenote.xcworkspace'
-
 ########################################################################
 # Environment
 ########################################################################
@@ -59,11 +65,6 @@ ENV['PUBLIC_CONFIG_FILE'] = VERSION_FILE_PATH
 ENV['DOWNLOAD_METADATA'] = './fastlane/download_metadata.swift'
 ENV['FL_RELEASE_TOOLKIT_DEFAULT_BRANCH'] = 'trunk'
 
-VERSION_CALCULATOR = Fastlane::Wpmreleasetoolkit::Versioning::SemanticVersionCalculator.new
-VERSION_FORMATTER = Fastlane::Wpmreleasetoolkit::Versioning::FourPartVersionFormatter.new
-BUILD_CODE_FORMATTER = Fastlane::Wpmreleasetoolkit::Versioning::FourPartBuildCodeFormatter.new
-PUBLIC_VERSION_FILE = Fastlane::Wpmreleasetoolkit::Versioning::IOSVersionFile.new(xcconfig_path: VERSION_FILE_PATH)
-
 platform :ios do
   desc 'Updates the AppStoreStrings.pot file with the latest data'
   lane :update_appstore_strings do |version: release_version_current|
diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb
index 00d8eb383..58ecd6d4e 100644
--- a/fastlane/lanes/build.rb
+++ b/fastlane/lanes/build.rb
@@ -60,12 +60,6 @@
     api_key_path: APP_STORE_CONNECT_KEY_PATH
   )
 
-  if File.exist?(dsym_path)
-    UI.important("Uploading ipa at #{ipa_path} to TestFlight...")
-  else
-    UI.user_error!("Could not find ipa at #{ipa_path}!")
-  end
-
   UI.important("Uploading dSYM at #{dsym_path} to Sentry...")
   sentry_upload_dsym(
     dsym_path: dsym_path,

From 4d7a230a6b86901260e1043338f18458ab588fa1 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Thu, 8 Aug 2024 14:23:56 +1000
Subject: [PATCH 408/547] Split ASC build from upload in CI

---
 .buildkite/commands/release-build.sh  |  8 ++------
 .buildkite/commands/release-upload.sh | 20 ++++++++++++++++++++
 .buildkite/release-build.yml          | 22 +++++++++++++++++-----
 3 files changed, 39 insertions(+), 11 deletions(-)
 create mode 100755 .buildkite/commands/release-upload.sh

diff --git a/.buildkite/commands/release-build.sh b/.buildkite/commands/release-build.sh
index f3a7246ab..94de0e420 100755
--- a/.buildkite/commands/release-build.sh
+++ b/.buildkite/commands/release-build.sh
@@ -9,9 +9,5 @@ install_cocoapods
 echo "--- :closed_lock_with_key: Installing Secrets"
 bundle exec fastlane run configure_apply
 
-echo "--- :hammer_and_wrench: Build and Upload to App Store Connect"
-bundle exec fastlane build_and_upload_to_app_store_connect \
-  skip_confirm:true \
-  skip_prechecks:true \
-  create_release:true \
-  "beta_release:${1:-true}" # use first call param, default to true for safety
+echo "--- :hammer_and_wrench: Build for App Store Connect"
+bundle exec fastlane build_for_app_store_connect
diff --git a/.buildkite/commands/release-upload.sh b/.buildkite/commands/release-upload.sh
new file mode 100755
index 000000000..b52c1f38f
--- /dev/null
+++ b/.buildkite/commands/release-upload.sh
@@ -0,0 +1,20 @@
+#!/bin/bash -eu
+
+echo "--- :arrow_down: Downloading Artifacts"
+ARTIFACTS_DIR='build/results'
+STEP=testflight_build
+buildkite-agent artifact download "$ARTIFACTS_DIR/*.ipa" . --step $STEP
+buildkite-agent artifact download "$ARTIFACTS_DIR/*.zip" . --step $STEP
+
+echo "--- :rubygems: Setting up Gems"
+install_gems
+
+echo "--- :closed_lock_with_key: Installing Secrets"
+bundle exec fastlane run configure_apply
+
+echo "--- :hammer_and_wrench: Upload to App Store Connect"
+bundle exec fastlane upload_to_app_store_connect \
+  skip_confirm:true \
+  skip_prechecks:true \
+  create_release:true \
+  "beta_release:${1:-true}" # use first call param, default to true for safety
diff --git a/.buildkite/release-build.yml b/.buildkite/release-build.yml
index 8d01e4da1..23443a8c5 100644
--- a/.buildkite/release-build.yml
+++ b/.buildkite/release-build.yml
@@ -1,11 +1,23 @@
+env:
+  IMAGE_ID: $IMAGE_ID
+agents:
+  queue: mac
+
 steps:
-  - label: ":testflight: Simplenote iOS Release Build (App Store Connect)"
+  - label: ":testflight: Build Simplenote iOS for App Store Connect"
+    key: testflight_build
     command: .buildkite/commands/release-build.sh
     priority: 1
-    env:
-      IMAGE_ID: $IMAGE_ID
-    agents:
-      queue: mac
+    plugins: [$CI_TOOLKIT_PLUGIN]
+    artifact_paths:
+      - build/results/*.zip
+      - build/results/*.ipa
+      - build/results/*.xcarchive
+
+  - label: ":testflight: Upload Simplenote iOS to App Store Connect"
+    depends_on: testflight_build
+    command: .buildkite/commands/release-upload.sh
+    priority: 1
     plugins: [$CI_TOOLKIT_PLUGIN]
     notify:
     - slack: "#build-and-ship"

From 3f504a0cf49f6526ef8f0f5b838f6ca4c0e40229 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Thu, 8 Aug 2024 14:24:21 +1000
Subject: [PATCH 409/547] Manually bump build code to test release automation

---
 .buildkite/commands/release-upload.sh | 1 -
 config/Version.Public.xcconfig        | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.buildkite/commands/release-upload.sh b/.buildkite/commands/release-upload.sh
index b52c1f38f..bbee6c04d 100755
--- a/.buildkite/commands/release-upload.sh
+++ b/.buildkite/commands/release-upload.sh
@@ -14,7 +14,6 @@ bundle exec fastlane run configure_apply
 
 echo "--- :hammer_and_wrench: Upload to App Store Connect"
 bundle exec fastlane upload_to_app_store_connect \
-  skip_confirm:true \
   skip_prechecks:true \
   create_release:true \
   "beta_release:${1:-true}" # use first call param, default to true for safety
diff --git a/config/Version.Public.xcconfig b/config/Version.Public.xcconfig
index 87ee4e31e..bccd13189 100644
--- a/config/Version.Public.xcconfig
+++ b/config/Version.Public.xcconfig
@@ -1,2 +1,2 @@
-VERSION_LONG = 4.52.0.0
+VERSION_LONG = 4.52.0.1
 VERSION_SHORT = 4.52

From 4af91c1f5f67e5df4b8916754bdc3ae96030acd6 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Thu, 8 Aug 2024 16:21:50 +1000
Subject: [PATCH 410/547] Zip `xcarchive` in the same step it's generated

---
 .buildkite/release-build.yml |  1 -
 fastlane/lanes/build.rb      | 10 ++++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.buildkite/release-build.yml b/.buildkite/release-build.yml
index 23443a8c5..532dc8496 100644
--- a/.buildkite/release-build.yml
+++ b/.buildkite/release-build.yml
@@ -12,7 +12,6 @@ steps:
     artifact_paths:
       - build/results/*.zip
       - build/results/*.ipa
-      - build/results/*.xcarchive
 
   - label: ":testflight: Upload Simplenote iOS to App Store Connect"
     depends_on: testflight_build
diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb
index 58ecd6d4e..4b3893174 100644
--- a/fastlane/lanes/build.rb
+++ b/fastlane/lanes/build.rb
@@ -2,6 +2,7 @@
 
 APP_STORE_CONNECT_OUTPUT_NAME = 'Simplenote-AppStore'
 XCARCHIVE_PATH = File.join(OUTPUT_DIRECTORY_PATH, "#{APP_STORE_CONNECT_OUTPUT_NAME}.xcarchive")
+XCARCHIVE_ZIP_PATH = File.join(OUTPUT_DIRECTORY_PATH, "#{APP_STORE_CONNECT_OUTPUT_NAME}.xcarchive.zip")
 
 desc 'Builds and uploads for distribution via App Store Connect'
 lane :build_and_upload_to_app_store_connect do |beta_release:, skip_prechecks: false, skip_confirm: false, create_release: false|
@@ -42,6 +43,10 @@
     output_directory: OUTPUT_DIRECTORY_PATH,
     output_name: APP_STORE_CONNECT_OUTPUT_NAME
   )
+
+  # It's convenient to have a ZIP available for things like CI uploads
+  UI.message("Zipping #{XCARCHIVE_PATH} to #{XCARCHIVE_ZIP_PATH}...")
+  zip(path: XCARCHIVE_PATH, output_path: XCARCHIVE_ZIP_PATH)
 end
 
 lane :upload_to_app_store_connect do |beta_release:, skip_prechecks: false, create_release: false|
@@ -70,15 +75,12 @@
 
   next unless create_release
 
-  xcarchive_zip_path = File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote.xarchive.zip')
-  zip(path: XCARCHIVE_PATH, output_path: xcarchive_zip_path)
-
   version = beta_release ? build_code_current : release_version_current
   create_release(
     repository: GITHUB_REPO,
     version: version,
     release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt'),
-    release_assets: xcarchive_zip_path.to_s,
+    release_assets: XCARCHIVE_ZIP_PATH.to_s,
     prerelease: beta_release
   )
 end

From e1209d9796823885dbbc1728cd745dfe608efc87 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Thu, 8 Aug 2024 17:18:22 +1000
Subject: [PATCH 411/547] Manually bump build code to test release automation

---
 config/Version.Public.xcconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/Version.Public.xcconfig b/config/Version.Public.xcconfig
index bccd13189..562b49da8 100644
--- a/config/Version.Public.xcconfig
+++ b/config/Version.Public.xcconfig
@@ -1,2 +1,2 @@
-VERSION_LONG = 4.52.0.1
+VERSION_LONG = 4.52.0.2
 VERSION_SHORT = 4.52

From 36c7ced640e9c87ffd4483eed65d644d6def34e5 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Thu, 8 Aug 2024 19:57:54 +1000
Subject: [PATCH 412/547] Use clearer `upload_to_testflight` alias over
 `testflight`

---
 fastlane/lanes/build.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb
index 4b3893174..31b0c7e57 100644
--- a/fastlane/lanes/build.rb
+++ b/fastlane/lanes/build.rb
@@ -59,7 +59,7 @@
   UI.user_error!("Could not find dSYM at #{dsym_path}!") unless File.exist?(ipa_path)
 
   UI.important("Uploading ipa at #{ipa_path} to TestFlight...")
-  testflight(
+  upload_to_testflight(
     ipa: ipa_path,
     skip_waiting_for_build_processing: true,
     api_key_path: APP_STORE_CONNECT_KEY_PATH

From d60768d52da9fbb9ef59dbec4305285df472ef7b Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Thu, 8 Aug 2024 19:59:44 +1000
Subject: [PATCH 413/547] Configure TestFlight upload to also submit for beta
 review

---
 fastlane/lanes/build.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb
index 31b0c7e57..d4bc36f02 100644
--- a/fastlane/lanes/build.rb
+++ b/fastlane/lanes/build.rb
@@ -61,8 +61,11 @@
   UI.important("Uploading ipa at #{ipa_path} to TestFlight...")
   upload_to_testflight(
     ipa: ipa_path,
-    skip_waiting_for_build_processing: true,
-    api_key_path: APP_STORE_CONNECT_KEY_PATH
+    api_key_path: APP_STORE_CONNECT_KEY_PATH,
+    skip_waiting_for_build_processing: false,
+    distribute_external: true,
+    reject_build_waiting_for_review: true,
+    groups: ['Internal A8C Beta Testers', 'External Beta Testers']
   )
 
   UI.important("Uploading dSYM at #{dsym_path} to Sentry...")

From 41b400143d477577c0398694ee132d8b9ad8e0b1 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Thu, 8 Aug 2024 20:00:16 +1000
Subject: [PATCH 414/547] Manually bump build code

---
 config/Version.Public.xcconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/Version.Public.xcconfig b/config/Version.Public.xcconfig
index 562b49da8..84f2ffd58 100644
--- a/config/Version.Public.xcconfig
+++ b/config/Version.Public.xcconfig
@@ -1,2 +1,2 @@
-VERSION_LONG = 4.52.0.2
+VERSION_LONG = 4.52.0.3
 VERSION_SHORT = 4.52

From 15ca67dfd03411fbdfe08b51faceae7d79ea9337 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Thu, 8 Aug 2024 20:14:18 +1000
Subject: [PATCH 415/547] Extract `release_notes.txt` full path to a constant

---
 fastlane/Fastfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index bfd36bccd..3bd7adea0 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -34,6 +34,8 @@ SECRETS_ROOT = File.join(Dir.home, '.configure', 'simplenote-ios', 'secrets')
 APP_STORE_CONNECT_KEY_PATH = File.join(SECRETS_ROOT, 'app_store_connect_fastlane_api_key.json')
 $used_test_account_index = nil
 
+RELEASE_NOTES_SOURCE_PATH = File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt')
+
 require_relative 'lib/env_manager'
 
 # Important: These need to be imported after all the constants have be defined because the access them.
@@ -72,7 +74,7 @@ platform :ios do
     source_metadata_folder = File.join(prj_folder, 'fastlane', 'appstoreres', 'metadata', 'source')
 
     files = {
-      whats_new: File.join(prj_folder, 'Simplenote', 'Resources', 'release_notes.txt'),
+      whats_new: RELEASE_NOTES_SOURCE_PATH,
       app_store_subtitle: File.join(source_metadata_folder, 'subtitle.txt'),
       app_store_desc: File.join(source_metadata_folder, 'description.txt'),
       app_store_keywords: File.join(source_metadata_folder, 'keywords.txt')

From 5d7562a3e2d9344ba0126553885a7a808e179de8 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Thu, 8 Aug 2024 20:15:10 +1000
Subject: [PATCH 416/547] Pass required `changelog` to upload to TestFlight
 method

---
 fastlane/lanes/build.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb
index d4bc36f02..b85735de1 100644
--- a/fastlane/lanes/build.rb
+++ b/fastlane/lanes/build.rb
@@ -64,6 +64,7 @@
     api_key_path: APP_STORE_CONNECT_KEY_PATH,
     skip_waiting_for_build_processing: false,
     distribute_external: true,
+    changelog: RELEASE_NOTES_SOURCE_PATH,
     reject_build_waiting_for_review: true,
     groups: ['Internal A8C Beta Testers', 'External Beta Testers']
   )

From b6ede03c227e4d7b77dd42ef24dc2274ccd3d01a Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Thu, 8 Aug 2024 20:56:55 +1000
Subject: [PATCH 417/547] Update Installable build annotation logic

This was prompted by the QR code being broken in recent PRs.
---
 fastlane/Fastfile | 39 +++++++++++++--------------------------
 1 file changed, 13 insertions(+), 26 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 3bd7adea0..ba03ea285 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -22,6 +22,7 @@ PROJECT_SLUG = 'simplenote-ios'
 GITHUB_REPO = "#{ORGANIZATION}/#{PROJECT_SLUG}".freeze
 BUILDKITE_ORGANIZATION = ORGANIZATION
 BUILDKITE_PIPELINE = PROJECT_SLUG
+APPCENTER_OWNER_NAME = ORGANIZATION
 
 WORKSPACE = 'Simplenote.xcworkspace'
 
@@ -450,44 +451,30 @@ platform :ios do
 
     return if ENV['BUILDKITE_PULL_REQUEST'].nil?
 
-    post_installable_build_pr_comment(
-      app_name: 'simplenote-ios',
-      build_number: build_number,
-      url_slug: 'Simplenote-Installable-Builds'
-    )
+    post_installable_build_pr_comment
   end
 
   # Posts a comment on the current PR to inform where to download a given Installable Build that was just published to App Center.
   #
   # Use this only after `upload_to_app_center` as been called, as it announces how said App Center build can be installed.
   #
-  # @param [String] app_name The display name to use in the comment text to identify which app this Installable Build is about
-  # @param [String] build_number The App Center's build number for this build
-  # @param [String] url_slug The last component of the `install.appcenter.ms` URL used to install the app. Typically a sluggified version of the app name
-  #                          in App Center (e.g. `WPiOS-One-Offs`)
-  #
   # @called_by CI — especially, relies on `BUILDKITE_PULL_REQUEST` being defined
   #
-  def post_installable_build_pr_comment(app_name:, build_number:, url_slug:)
-    UI.message("Successfully built and uploaded installable build `#{build_number}` to App Center.")
+  def post_installable_build_pr_comment
+    pr = ENV.fetch('BUILDKITE_PULL_REQUEST', nil)
 
-    return if ENV['BUILDKITE_PULL_REQUEST'].nil?
+    return if pr.nil?
 
-    install_url = "https://install.appcenter.ms/orgs/automattic/apps/#{url_slug}/"
-    qr_code_url = "https://chart.googleapis.com/chart?chs=500x500&cht=qr&chl=#{CGI.escape(install_url)}&choe=UTF-8"
-    comment_body = <<~COMMENT_BODY
-      You can test the changes in <strong>#{app_name}</strong> from this Pull Request by:<ul>
-        <li><a href='#{install_url}'>Clicking here</a> or scanning the QR code below to access App Center</li>
-        <li>Then installing the build number <code>#{build_number}</code> on your iPhone</li>
-      </ul>
-      <img src='#{qr_code_url}' width='150' height='150' />
-      If you need access to App Center, please ask a maintainer to add you.
-    COMMENT_BODY
+    comment_body = prototype_build_details_comment(
+      app_display_name: 'Simplenote Prototype Build',
+      app_center_org_name: APPCENTER_OWNER_NAME,
+      fold: true
+    )
 
     comment_on_pr(
-      project: 'automattic/simplenote-ios',
-      pr_number: Integer(ENV.fetch('BUILDKITE_PULL_REQUEST', nil)),
-      reuse_identifier: "installable-build-link--#{url_slug}",
+      project: GITHUB_REPO,
+      pr_number: Integer(pr),
+      reuse_identifier: 'installable-build-link--Simplenote-Installable-Builds',
       body: comment_body
     )
   end

From 3932d2804935396fa63c4d24877e1fc1e9d12bd8 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio.lodi@automattic.com>
Date: Fri, 9 Aug 2024 06:59:54 +1000
Subject: [PATCH 418/547] Fix a couple of typos in documentation comments

Co-authored-by: Olivier Halligon <olivier.halligon@automattic.com>
---
 fastlane/Fastfile       | 2 +-
 fastlane/lanes/build.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index ba03ea285..5d72f1e5d 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -39,7 +39,7 @@ RELEASE_NOTES_SOURCE_PATH = File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resour
 
 require_relative 'lib/env_manager'
 
-# Important: These need to be imported after all the constants have be defined because the access them.
+# Important: These need to be imported after all the constants have be defined because they access them.
 # A bit of a leaky abstraction but makes for lanes that are easier to write...
 import 'lanes/localization.rb'
 import 'lanes/release.rb'
diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb
index b85735de1..e44966e0d 100644
--- a/fastlane/lanes/build.rb
+++ b/fastlane/lanes/build.rb
@@ -37,7 +37,7 @@
     # - archive_path sets the full path for the xcarchive.
     # - output_directory and output_name set the path and basename for the ipa and dSYM.
     #
-    # We could have use 'build_path: OUTPUT_DIRECTORY_PATH' for the xcarchive...
+    # We could have used 'build_path: OUTPUT_DIRECTORY_PATH' for the xcarchive...
     # ...but doing so would append a timestamp and unnecessarily complicate other logic to get the path
     archive_path: XCARCHIVE_PATH,
     output_directory: OUTPUT_DIRECTORY_PATH,

From 361cb27a390755adcbd34cdc4938a3aa9f472d4e Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Fri, 9 Aug 2024 07:00:53 +1000
Subject: [PATCH 419/547] Delete redundant
 `build_and_upload_to_app_store_connect` lane

---
 fastlane/lanes/build.rb | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb
index e44966e0d..4cc86273b 100644
--- a/fastlane/lanes/build.rb
+++ b/fastlane/lanes/build.rb
@@ -4,25 +4,6 @@
 XCARCHIVE_PATH = File.join(OUTPUT_DIRECTORY_PATH, "#{APP_STORE_CONNECT_OUTPUT_NAME}.xcarchive")
 XCARCHIVE_ZIP_PATH = File.join(OUTPUT_DIRECTORY_PATH, "#{APP_STORE_CONNECT_OUTPUT_NAME}.xcarchive.zip")
 
-desc 'Builds and uploads for distribution via App Store Connect'
-lane :build_and_upload_to_app_store_connect do |beta_release:, skip_prechecks: false, skip_confirm: false, create_release: false|
-  unless skip_prechecks
-    ensure_git_status_clean unless skip_prechecks || is_ci
-    sentry_check_cli_installed
-  end
-
-  UI.important("Building version #{release_version_current} (#{build_code_current}) and uploading to TestFlight...")
-  UI.user_error!('Aborted by user request') unless skip_confirm || UI.confirm('Do you want to continue?')
-
-  build_for_app_store_connect
-
-  upload_to_app_store_connect(
-    beta_release: beta_release,
-    skip_prechecks: skip_prechecks,
-    create_release: create_release
-  )
-end
-
 lane :build_for_app_store_connect do |fetch_code_signing: true|
   appstore_code_signing if fetch_code_signing
 

From 35b582ffa5311e524e3a9099e23140540c5964fa Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Mon, 12 Aug 2024 10:30:52 -1000
Subject: [PATCH 420/547] Updated shouldRemove tag method for clarity

---
 Simplenote/TagListViewController.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Simplenote/TagListViewController.swift b/Simplenote/TagListViewController.swift
index 3db5aac18..8779e97f0 100644
--- a/Simplenote/TagListViewController.swift
+++ b/Simplenote/TagListViewController.swift
@@ -501,7 +501,7 @@ extension TagListViewController: TagListViewCellDelegate {
                                                 preferredStyle: .actionSheet)
 
         alertController.addDestructiveActionWithTitle(Localization.TagDeletionConfirmation.confirmationButton) { (_) in
-            guard self.shouldRemove(tag, at: indexPath) else {
+            guard self.verifyTagIsAtIndexPath(tag, at: indexPath) else {
                 self.present(UIAlertController.dismissableAlert(
                     title: Localization.tagDeleteFailedTitle,
                     message: Localization.tagDeleteFailedMessage), animated: true)
@@ -527,7 +527,7 @@ extension TagListViewController: TagListViewCellDelegate {
         present(alertController, animated: true, completion: nil)
     }
 
-    private func shouldRemove(_ tagToRemove: Tag, at indexPath: IndexPath) -> Bool {
+    private func verifyTagIsAtIndexPath(_ tagToRemove: Tag, at indexPath: IndexPath) -> Bool {
         // REF: https://github.com/Automattic/simplenote-ios/issues/1312
         // If you initiate deleting a tag and the tag is deleted before you confirm then another tag is deleted
         // This method confirms the selected tag is the same as the tag at index path before removing.

From 78800f013e1a0ed400d4405cc50363be065ef8c5 Mon Sep 17 00:00:00 2001
From: Jorge Leandro Perez <jorge@lantean.co>
Date: Tue, 13 Aug 2024 15:14:11 -0300
Subject: [PATCH 421/547] Updates localizations

---
 Simplenote/ar.lproj/Localizable.strings       | 110 ++++++++++++-----
 Simplenote/cy.lproj/Localizable.strings       |   4 +-
 Simplenote/de.lproj/Localizable.strings       | 110 ++++++++++++-----
 Simplenote/el.lproj/Localizable.strings       |   6 +-
 Simplenote/es.lproj/Localizable.strings       | 110 ++++++++++++-----
 Simplenote/fa.lproj/Localizable.strings       |  11 +-
 Simplenote/fr.lproj/Localizable.strings       | 110 ++++++++++++-----
 Simplenote/he.lproj/Localizable.strings       | 110 ++++++++++++-----
 Simplenote/id.lproj/Localizable.strings       | 110 ++++++++++++-----
 Simplenote/it.lproj/Localizable.strings       | 110 ++++++++++++-----
 Simplenote/ja.lproj/Localizable.strings       | 110 ++++++++++++-----
 Simplenote/ko.lproj/Localizable.strings       | 110 ++++++++++++-----
 Simplenote/nl.lproj/Localizable.strings       | 110 ++++++++++++-----
 Simplenote/pt-BR.lproj/Localizable.strings    | 110 ++++++++++++-----
 Simplenote/ru.lproj/Localizable.strings       | 110 ++++++++++++-----
 Simplenote/sv.lproj/Localizable.strings       | 112 +++++++++++++-----
 Simplenote/tr.lproj/Localizable.strings       | 110 ++++++++++++-----
 .../zh-Hans-CN.lproj/Localizable.strings      | 110 ++++++++++++-----
 .../zh-Hant-TW.lproj/Localizable.strings      | 110 ++++++++++++-----
 19 files changed, 1324 insertions(+), 459 deletions(-)

diff --git a/Simplenote/ar.lproj/Localizable.strings b/Simplenote/ar.lproj/Localizable.strings
index 1465b5569..ab81a2921 100644
--- a/Simplenote/ar.lproj/Localizable.strings
+++ b/Simplenote/ar.lproj/Localizable.strings
@@ -1,15 +1,9 @@
-/* Translation-Revision-Date: 2022-11-24 00:43:04+0000 */
+/* Translation-Revision-Date: 2024-08-06 21:54:03+0000 */
 /* Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: ar */
 
-/* Monthly Subscription Option. Please preserve the special marker! */
-"%@ per Month" = "%@ شهريًا ";
-
-/* Yearly Subscription Option. Please preserve the special marker! */
-"%@ per Year" = "%@ سنويًا";
-
-/* Number of found search results */
+/* No comment provided by engineer. */
 "%d Result" = "%d من النتائج";
 
 /* Number of found search results */
@@ -73,6 +67,7 @@
 "About" = "نبذة عن";
 
 /* Accept Action
+   Accept Message
    Label of accept button on alert dialog */
 "Accept" = "قبول";
 
@@ -123,9 +118,18 @@
 /* Empty Trash Warning */
 "Are you sure you want to empty the trash? This cannot be undone." = "هل أنت متأكد من رغبتك في إفراغ سلة المهملات؟ يتعذر التراجع عن هذا.";
 
+/* Data Fetch error message */
+"Attempt to fetch current note content failed.  Please try again later." = "فشلت محاولة إحضار محتوى الملاحظات الحالي.  يرجى المحاولة مرة أخرى لاحقًا.";
+
 /* Data Fetch error message */
 "Attempt to fetch entities failed.  Please try again later." = "فشلت محاولة إحضار الكيانات.  يرجى المحاولة لاحقًا.";
 
+/* Data Fetch error message */
+"Attempt to fetch notes failed.  Please try again later." = "فشلت محاولة إحضار الملاحظات.  يرجى المحاولة مرة أخرى لاحقًا.";
+
+/* Data Fetch error message */
+"Attempt to fetch tags failed.  Please try again later." = "فشلت محاولة إحضار الوسوم.  يرجى المحاولة مرة أخرى لاحقًا.";
+
 /* User Authenticated */
 "Authenticated" = "مصادَق عليه";
 
@@ -151,7 +155,6 @@
    Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
-   Dismisses the alert
    Dismissing an interface
    PinLock screen \"cancel\" button
    Verb, cancel an alert dialog */
@@ -187,8 +190,8 @@
 /* Title on the PinLock screen asking to create a passcode */
 "Choose a 4 digit passcode" = "اختيار رمز مرور مكوَّن من 4 أرقام";
 
-/* Sustainer Alert's Message */
-"Choose a plan and help unlock future features" = "اختيار خطة للمساعدة على فتح الميزات في المستقبل";
+/* Code TextField Placeholder */
+"Code" = "رمز";
 
 /* Opens the Collaborate UI */
 "Collaborate" = "تشارك";
@@ -231,9 +234,18 @@
 /* Error for bad email or password */
 "Could not create an account with the provided email address and password." = "تعذر إنشاء حساب بعنوان البريد الإلكتروني وكلمة المرور اللذين تم إدخالهما.";
 
+/* Note fetch error title */
+"Could not fetch Notes" = "يتعذر إحضار الملاحظات";
+
+/* Tag fetch error title */
+"Could not fetch Tags" = "يتعذر إحضار الوسوم";
+
 /* Fetch error title */
 "Could not fetch entities" = "يتعذر إحضار الكيانات";
 
+/* note content fetch error title */
+"Could not fetch note content" = "يتعذر إحضار المحتوى";
+
 /* Message displayed when login fails */
 "Could not login with the provided email address and password." = "تعذر تسجيل الدخول بعنوان البريد الإلكتروني وكلمة المرور اللذين تم إدخالهما.";
 
@@ -360,6 +372,15 @@
 /* Number of objects enqueued for processing */
 "Enqueued" = "بقائمة الانتظار";
 
+/* LogIn Interface Title */
+"Enter Code" = "إدخال الكود";
+
+/* Enter Password fallback Action */
+"Enter password" = "إدخال كلمة المرور";
+
+/* Header for Login With Password. Please preserve the {{EMAIL}} substring */
+"Enter the password for the account {{EMAIL}}" = "إدخال كلمة المرور الخاصة بالحساب {{EMAIL}}";
+
 /* Title on the PinLock screen asking to enter a passcode */
 "Enter your passcode" = "إدخال رمز المرور الخاص بك";
 
@@ -386,7 +407,7 @@
 "Forgot password? »" = "هل نسيت كلمة المرور؟ »";
 
 /* Password Reset Action */
-"Forgotten password?" = "هل نسيت كلمة المرور؟";
+"Forgot your password?" = "هل نسيت كلمة مرورك؟";
 
 /* FAQ or contact us */
 "Get Help" = "إحصل على المساعدة";
@@ -412,6 +433,12 @@
 /* Rating view - initial - liked button */
 "I like it" = "يعجبني هذا";
 
+/* Option to add notes to spotlight search */
+"Index Notes in Spotlight" = "ملاحظات الفهرس في Spotlight";
+
+/* Alert title letting user know their search index has been removed */
+"Index Removed" = "تمت إزالة الفهرس";
+
 /* Note Information Button (metrics + references) */
 "Information" = "معلومات";
 
@@ -448,18 +475,27 @@
    LogIn Interface Title */
 "Log In" = "تسجيل الدخول";
 
+/* LogIn Interface Title */
+"Log In with Password" = "تسجيل الدخول باستخدام كلمة المرور";
+
 /* Log out of the active account in the app */
 "Log Out" = "تسجيل الخروج";
 
 /* Widget warning if user is logged out */
 "Log in to see your notes" = "تسجيل الدخول للاطلاع على ملحوظاتك";
 
-/* Allows the user to SignIn using their WPCOM Account */
+/* Password fallback Action */
 "Log in with WordPress.com" = "تسجيل دخول باستخدام ووردبريس.كوم";
 
-/* Presents the regular Email signin flow */
+/* Sends the User an email with an Authentication Code */
 "Log in with email" = "تسجيل الدخول باستخدام البريد الإلكتروني";
 
+/* Header for Enter Password UI, when the user performed too many requests */
+"Log in with email failed, please enter your password" = "فشل تسجل الدخول باستخدام البريد الإلكتروني، يرجى إدخال كلمة مرورك";
+
+/* Message displayed when a login code is too short */
+"Login Code is too short" = "كود تسجيل الدخول قصير للغاية";
+
 /* Month and day date formatter */
 "MMM d" = "MMM d";
 
@@ -490,9 +526,6 @@
 /* Sort Mode: Modified Date, ascending */
 "Modified: Oldest" = "تاريخ التعديل: الأقدم";
 
-/* Monthly Subscription Option (Used when / if the price fails to load) */
-"Monthly" = "شهريًا";
-
 /* Accessibility hint for trash selected notes button */
 "Move selected notes to trash" = "نقل الملحوظات المحدَّدة إلى سلة المهملات";
 
@@ -579,6 +612,9 @@
    Email unverified alert dismiss */
 "Ok" = "موافق";
 
+/* confirm button title */
+"Okay" = "حسنًا";
+
 /* No comment provided by engineer. */
 "On" = "تشغيل";
 
@@ -594,6 +630,9 @@
 /* Note Options Title */
 "Options" = "خيارات";
 
+/* Or, used as a separator between Actions */
+"Or" = "أو";
+
 /* A 4-digit code to lock the app when it is closed */
 "Passcode" = "رمز المرور";
 
@@ -678,6 +717,9 @@
 /* Home screen quick action: Recent Note */
 "Recent" = "الحديث";
 
+/* Header to put on any files that need to be recovered */
+"Recovered Note Cotent - " = "تم استرداد Note Cotent - ";
+
 /* References section header on Info Card */
 "Referenced In" = "تمت الإشارة في";
 
@@ -715,9 +757,6 @@
    Restore a note to a previous version */
 "Restore Note" = "استعادة الملاحظة";
 
-/* Manually Restores IAP Purchases */
-"Restore Purchases" = "استعادة عمليات الشراء";
-
 /* Title -> Review you account screen */
 "Review Your Account" = "مراجعة حسابك";
 
@@ -800,8 +839,7 @@
    Title of main share extension view */
 "Simplenote" = "Simplenote";
 
-/* Restoration Successful Title
-   Sustainer Alert's Title */
+/* Restoration Successful Title */
 "Simplenote Sustainer" = "Simplenote Sustainer";
 
 /* Simplenote's Feedback Email Title */
@@ -810,7 +848,8 @@
 /* Message displayed when app is not configured */
 "Simplenote must be configured and logged in to setup widgets" = "يجب تكوين Simplenote وتسجيل الدخول إليه لإعداد المربعات الجانبية";
 
-/* Authentication Error Alert Title */
+/* Authentication Error Alert Title
+   Email TextField Placeholder */
 "Sorry!" = "عذرًا!";
 
 /* Option to sort tags alphabetically. The default is by manual ordering. */
@@ -823,14 +862,17 @@
 /* Sort By Title */
 "Sort by:" = "فرز حسب:";
 
+/* Details that some results may still appear in searches on device */
+"Spotlight history may still appear in search results, but notes have be unindexed" = "قد يستمر سجل Spotlight في الظهور في نتائج البحث، لكن يجب إلغاء فهرسة الملاحظات";
+
 /* Title for the response's Status Code */
 "Status Code" = "كود الحالة";
 
 /* Become a Sustainer Details */
 "Support your favorite notes app to help unlock future features" = "دعم تطبيق الملحوظات المفضَّل لديك للمساعدة على فتح الميزات في المستقبل";
 
-/* No comment provided by engineer. */
-"Sustainer" = "Sustainer";
+/* Switch app icon */
+"Sustainer App Icon" = "أيقونة تطبيق Sustainer";
 
 /* Restoration Successful Message */
 "Sustainer subscription restored. Thank you for supporting Simplenote!" = "تم استعادة اشتراك Sustainer. شكرًا لك على دعم Simplenote!";
@@ -868,6 +910,12 @@
 /* Error when address is in use */
 "That email is already being used" = "يتم استخدام ذلك البريد الإلكتروني بالفعل";
 
+/* Email TextField Placeholder */
+"The authentication code you've requested has expired. Please request a new one" = "انتهت صلاحية كود المصادقة الذي طلبته. يرجى طلب واحد جديد";
+
+/* Error message for Invalid Login Code */
+"The code you've entered is not correct. Please try again" = "الكود الذي أدخلته غير صحيح. يرجى المحاولة مجددًا";
+
 /* Error when address is in use */
 "The email you've entered is already associated with a Simplenote account." = "البريد الإلكتروني الذي أدخلته مرتبط بالفعل بحساب Simplenote.";
 
@@ -980,6 +1028,9 @@
 /* Generic error */
 "We're having problems. Please try again soon." = "لدينا مشكلات. يُرجى المحاولة مرة أخرى لاحقًا.";
 
+/* Header for the Login with Code UI. Please preserve the {{EMAIL}} string as is! */
+"We've sent a code to {{EMAIL}}. The code will be valid for a few minutes." = "لقد أرسلنا كودًا إلى {{EMAIL}} سيكون هذا الكود صالحًا لبضع دقائق.";
+
 /* WebSocket Status */
 "WebSocket" = "WebSocket";
 
@@ -993,12 +1044,12 @@
 /* Rating view initial title */
 "What do you think about Simplenote?" = "ما رأيك في Simplenote؟";
 
+/* Alerting users that we will attempt to restore lost content on next launch */
+"Will attempt to recover shortcut content on next launch" = "ستتم محاولة استعادة محتوى الاختصارات في الطرح المقبل";
+
 /* Number of words in the note */
 "Words" = "الكلمات";
 
-/* Yearly Subscription Option (Used when / if the price fails to load) */
-"Yearly" = "سنوي";
-
 /* Proceeds with the Empty Trash OP */
 "Yes" = "نعم";
 
@@ -1017,6 +1068,9 @@
 /* Restoration Successful Message */
 "You're already a Sustainer. Thank you for supporting Simplenote!" = "أصبحت Sustainer بالفعل. شكرًا لك على دعم Simplenote!";
 
+/* Error message for Invalid Login Code */
+"Your authentication code has expired. Please request a new one" = "انتهت صلاحية كود المصادقة الخاص بك. يرجى طلب واحد جديد";
+
 /* Message displayed when email address is invalid */
 "Your email address is not valid" = "عنوان البريد الإلكتروني الخاص بك غير صالح.";
 
diff --git a/Simplenote/cy.lproj/Localizable.strings b/Simplenote/cy.lproj/Localizable.strings
index 3ab207cd5..7064b75e1 100644
--- a/Simplenote/cy.lproj/Localizable.strings
+++ b/Simplenote/cy.lproj/Localizable.strings
@@ -3,7 +3,7 @@
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: cy_GB */
 
-/* Number of found search results */
+/* No comment provided by engineer. */
 "%d Result" = "%d Canlyniad";
 
 /* Number of found search results */
@@ -16,6 +16,7 @@
 "%i Failed Passcode Attempts" = "%i Ymgais Aflwyddiannus gyda'r Cod Cyfrin";
 
 /* Accept Action
+   Accept Message
    Label of accept button on alert dialog */
 "Accept" = "Derbyn";
 
@@ -49,7 +50,6 @@
    Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
-   Dismisses the alert
    Dismissing an interface
    PinLock screen \"cancel\" button
    Verb, cancel an alert dialog */
diff --git a/Simplenote/de.lproj/Localizable.strings b/Simplenote/de.lproj/Localizable.strings
index 516bb4fb2..3fb9eb5a9 100644
--- a/Simplenote/de.lproj/Localizable.strings
+++ b/Simplenote/de.lproj/Localizable.strings
@@ -1,15 +1,9 @@
-/* Translation-Revision-Date: 2022-11-22 09:54:03+0000 */
+/* Translation-Revision-Date: 2024-08-07 09:54:03+0000 */
 /* Plural-Forms: nplurals=2; plural=n != 1; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: de */
 
-/* Monthly Subscription Option. Please preserve the special marker! */
-"%@ per Month" = "%@ pro Monat";
-
-/* Yearly Subscription Option. Please preserve the special marker! */
-"%@ per Year" = "%@ pro Jahr";
-
-/* Number of found search results */
+/* No comment provided by engineer. */
 "%d Result" = "%d Ergebnis";
 
 /* Number of found search results */
@@ -73,6 +67,7 @@
 "About" = "Über";
 
 /* Accept Action
+   Accept Message
    Label of accept button on alert dialog */
 "Accept" = "Akzeptieren";
 
@@ -123,9 +118,18 @@
 /* Empty Trash Warning */
 "Are you sure you want to empty the trash? This cannot be undone." = "Soll der Papierkorb wirklich geleert werden? Dies kann nicht rückgängig gemacht werden.";
 
+/* Data Fetch error message */
+"Attempt to fetch current note content failed.  Please try again later." = "Versuch, aktuellen Notizeninhalt abzurufen, fehlgeschlagen.  Bitte versuche es später erneut.";
+
 /* Data Fetch error message */
 "Attempt to fetch entities failed.  Please try again later." = "Abrufen von Einheiten fehlgeschlagen.  Bitte versuche es später erneut.";
 
+/* Data Fetch error message */
+"Attempt to fetch notes failed.  Please try again later." = "Versuch, Notizen abzurufen, fehlgeschlagen.  Bitte versuche es später erneut.";
+
+/* Data Fetch error message */
+"Attempt to fetch tags failed.  Please try again later." = "Versuch, Schlagwörter abzurufen, fehlgeschlagen.  Bitte versuche es später erneut.";
+
 /* User Authenticated */
 "Authenticated" = "Authentifiziert";
 
@@ -151,7 +155,6 @@
    Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
-   Dismisses the alert
    Dismissing an interface
    PinLock screen \"cancel\" button
    Verb, cancel an alert dialog */
@@ -187,8 +190,8 @@
 /* Title on the PinLock screen asking to create a passcode */
 "Choose a 4 digit passcode" = "Vierstelligen Zugangscode auswählen";
 
-/* Sustainer Alert's Message */
-"Choose a plan and help unlock future features" = "Wähle einen Tarif und profitiere von zukünftigen Funktionen";
+/* Code TextField Placeholder */
+"Code" = "Code";
 
 /* Opens the Collaborate UI */
 "Collaborate" = "Zusammenarbeiten";
@@ -231,9 +234,18 @@
 /* Error for bad email or password */
 "Could not create an account with the provided email address and password." = "Mit der angegebenen E-Mail-Adresse und dem Passwort konnte kein Konto erstellt werden.";
 
+/* Note fetch error title */
+"Could not fetch Notes" = "Notizen konnten nicht abgerufen werden";
+
+/* Tag fetch error title */
+"Could not fetch Tags" = "Schlagwörter konnten nicht abgerufen werden";
+
 /* Fetch error title */
 "Could not fetch entities" = "Einheiten konnten nicht abgerufen werden";
 
+/* note content fetch error title */
+"Could not fetch note content" = "Notizeninhalt konnte nicht abgerufen werden";
+
 /* Message displayed when login fails */
 "Could not login with the provided email address and password." = "Mit der angegebenen E-Mail-Adresse und dem Passwort war keine Anmeldung möglich.";
 
@@ -360,6 +372,15 @@
 /* Number of objects enqueued for processing */
 "Enqueued" = "In der Warteschlange";
 
+/* LogIn Interface Title */
+"Enter Code" = "Code eingeben";
+
+/* Enter Password fallback Action */
+"Enter password" = "Passwort eingeben";
+
+/* Header for Login With Password. Please preserve the {{EMAIL}} substring */
+"Enter the password for the account {{EMAIL}}" = "Gib das Passwort für das Konto {{EMAIL}} ein";
+
 /* Title on the PinLock screen asking to enter a passcode */
 "Enter your passcode" = "Gib deinen Passcode ein";
 
@@ -386,7 +407,7 @@
 "Forgot password? »" = "Passwort vergessen? »";
 
 /* Password Reset Action */
-"Forgotten password?" = "Passwort vergessen?";
+"Forgot your password?" = "Passwort vergessen?";
 
 /* FAQ or contact us */
 "Get Help" = "Hilfe bekommen";
@@ -412,6 +433,12 @@
 /* Rating view - initial - liked button */
 "I like it" = "Gefällt mir";
 
+/* Option to add notes to spotlight search */
+"Index Notes in Spotlight" = "Notizen in Spotlight indizieren";
+
+/* Alert title letting user know their search index has been removed */
+"Index Removed" = "Index entfernt";
+
 /* Note Information Button (metrics + references) */
 "Information" = "Informationen";
 
@@ -448,18 +475,27 @@
    LogIn Interface Title */
 "Log In" = "Anmelden";
 
+/* LogIn Interface Title */
+"Log In with Password" = "Mit Passwort anmelden";
+
 /* Log out of the active account in the app */
 "Log Out" = "Abmelden";
 
 /* Widget warning if user is logged out */
 "Log in to see your notes" = "Melde dich an, um deine Notizen zu sehen";
 
-/* Allows the user to SignIn using their WPCOM Account */
+/* Password fallback Action */
 "Log in with WordPress.com" = "Mit WordPress.com anmelden";
 
-/* Presents the regular Email signin flow */
+/* Sends the User an email with an Authentication Code */
 "Log in with email" = "Mit E-Mail-Adresse anmelden";
 
+/* Header for Enter Password UI, when the user performed too many requests */
+"Log in with email failed, please enter your password" = "Die Anmeldung per E-Mail ist fehlgeschlagen, bitte gib dein Passwort ein";
+
+/* Message displayed when a login code is too short */
+"Login Code is too short" = "Anmeldecode ist zu kurz";
+
 /* Month and day date formatter */
 "MMM d" = "d. MMM";
 
@@ -490,9 +526,6 @@
 /* Sort Mode: Modified Date, ascending */
 "Modified: Oldest" = "Geändert: Älteste";
 
-/* Monthly Subscription Option (Used when / if the price fails to load) */
-"Monthly" = "Monatlich";
-
 /* Accessibility hint for trash selected notes button */
 "Move selected notes to trash" = "Verschiebe die ausgewählten Notizen in den Papierkorb";
 
@@ -579,6 +612,9 @@
    Email unverified alert dismiss */
 "Ok" = "OK";
 
+/* confirm button title */
+"Okay" = "Okay";
+
 /* No comment provided by engineer. */
 "On" = "Ein";
 
@@ -594,6 +630,9 @@
 /* Note Options Title */
 "Options" = "Optionen";
 
+/* Or, used as a separator between Actions */
+"Or" = "Oder";
+
 /* A 4-digit code to lock the app when it is closed */
 "Passcode" = "Passcode";
 
@@ -678,6 +717,9 @@
 /* Home screen quick action: Recent Note */
 "Recent" = "Kürzlich";
 
+/* Header to put on any files that need to be recovered */
+"Recovered Note Cotent - " = "Notizeninhalt wiederhergestellt – ";
+
 /* References section header on Info Card */
 "Referenced In" = "Referenziert in";
 
@@ -715,9 +757,6 @@
    Restore a note to a previous version */
 "Restore Note" = "Notiz wiederherstellen";
 
-/* Manually Restores IAP Purchases */
-"Restore Purchases" = "Käufe wiederherstellen";
-
 /* Title -> Review you account screen */
 "Review Your Account" = "Konto prüfen";
 
@@ -800,8 +839,7 @@
    Title of main share extension view */
 "Simplenote" = "Simplenote";
 
-/* Restoration Successful Title
-   Sustainer Alert's Title */
+/* Restoration Successful Title */
 "Simplenote Sustainer" = "Simplenote-Unterstützer";
 
 /* Simplenote's Feedback Email Title */
@@ -810,7 +848,8 @@
 /* Message displayed when app is not configured */
 "Simplenote must be configured and logged in to setup widgets" = "Um Widgets einzurichten, musst du Simplenote konfigurieren und dich dort anmelden";
 
-/* Authentication Error Alert Title */
+/* Authentication Error Alert Title
+   Email TextField Placeholder */
 "Sorry!" = "Entschuldigung!";
 
 /* Option to sort tags alphabetically. The default is by manual ordering. */
@@ -823,14 +862,17 @@
 /* Sort By Title */
 "Sort by:" = "Sortiert nach:";
 
+/* Details that some results may still appear in searches on device */
+"Spotlight history may still appear in search results, but notes have be unindexed" = "Der Spotlight-Verlauf wird gegebenenfalls noch in den Suchergebnissen angezeigt, aber die Notizen wurden vom Index entfernt";
+
 /* Title for the response's Status Code */
 "Status Code" = "Statuscode";
 
 /* Become a Sustainer Details */
 "Support your favorite notes app to help unlock future features" = "Unterstütze deine bevorzugte Notizen-App, um von zukünftigen Funktionen zu profitieren";
 
-/* No comment provided by engineer. */
-"Sustainer" = "Unterstützer";
+/* Switch app icon */
+"Sustainer App Icon" = "Unterstützer-App-Icon";
 
 /* Restoration Successful Message */
 "Sustainer subscription restored. Thank you for supporting Simplenote!" = "Unterstützer-Abonnement wiederhergestellt. Danke für deine Unterstützung von Simplenote!";
@@ -868,6 +910,12 @@
 /* Error when address is in use */
 "That email is already being used" = "Diese E-Mail-Adresse wird bereits verwendet";
 
+/* Email TextField Placeholder */
+"The authentication code you've requested has expired. Please request a new one" = "Der angeforderte Authentifizierungscode ist abgelaufen. Bitte fordere einen neuen an";
+
+/* Error message for Invalid Login Code */
+"The code you've entered is not correct. Please try again" = "Der eingegebene Code ist nicht korrekt. Bitte versuche es erneut";
+
 /* Error when address is in use */
 "The email you've entered is already associated with a Simplenote account." = "Die eingegebene E-Mail-Adresse ist bereits mit einem Simplenote-Konto verknüpft.";
 
@@ -980,6 +1028,9 @@
 /* Generic error */
 "We're having problems. Please try again soon." = "Momentan gibt es ein paar Probleme. Bitte versuche es später erneut.";
 
+/* Header for the Login with Code UI. Please preserve the {{EMAIL}} string as is! */
+"We've sent a code to {{EMAIL}}. The code will be valid for a few minutes." = "Wir haben einen Code gesendet an: {{EMAIL}}. Der Code ist einige Minuten gültig.";
+
 /* WebSocket Status */
 "WebSocket" = "WebSocket";
 
@@ -993,12 +1044,12 @@
 /* Rating view initial title */
 "What do you think about Simplenote?" = "Was hältst du von Simplenote?";
 
+/* Alerting users that we will attempt to restore lost content on next launch */
+"Will attempt to recover shortcut content on next launch" = "Wir werden versuchen, den Inhalt der Verknüpfungen bei der nächsten Veröffentlichung wiederherzustellen";
+
 /* Number of words in the note */
 "Words" = "Wörter";
 
-/* Yearly Subscription Option (Used when / if the price fails to load) */
-"Yearly" = "Jährlich";
-
 /* Proceeds with the Empty Trash OP */
 "Yes" = "Ja";
 
@@ -1017,6 +1068,9 @@
 /* Restoration Successful Message */
 "You're already a Sustainer. Thank you for supporting Simplenote!" = "Du bist bereits ein Unterstützer. Danke für deine Unterstützung von Simplenote!";
 
+/* Error message for Invalid Login Code */
+"Your authentication code has expired. Please request a new one" = "Dein Authentifizierungscode ist abgelaufen. Bitte fordere einen neuen an";
+
 /* Message displayed when email address is invalid */
 "Your email address is not valid" = "Deine E-Mail-Adresse ist ungültig.";
 
diff --git a/Simplenote/el.lproj/Localizable.strings b/Simplenote/el.lproj/Localizable.strings
index 2100e34f9..43e526aa1 100644
--- a/Simplenote/el.lproj/Localizable.strings
+++ b/Simplenote/el.lproj/Localizable.strings
@@ -1,9 +1,9 @@
-/* Translation-Revision-Date: 2020-06-15 15:27:25+0000 */
+/* Translation-Revision-Date: 2019-11-22 16:18:55+0000 */
 /* Plural-Forms: nplurals=2; plural=n != 1; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: el_GR */
 
-/* Number of found search results */
+/* No comment provided by engineer. */
 "%d Result" = "%d αποτέλεσμα";
 
 /* Number of found search results */
@@ -16,6 +16,7 @@
 "%i Failed Passcode Attempts" = "%i αποτυχημένες απόπειρες συνθηματικού";
 
 /* Accept Action
+   Accept Message
    Label of accept button on alert dialog */
 "Accept" = "Αποδοχή";
 
@@ -38,7 +39,6 @@
    Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
-   Dismisses the alert
    Dismissing an interface
    PinLock screen \"cancel\" button
    Verb, cancel an alert dialog */
diff --git a/Simplenote/es.lproj/Localizable.strings b/Simplenote/es.lproj/Localizable.strings
index de368529c..8ca408e55 100644
--- a/Simplenote/es.lproj/Localizable.strings
+++ b/Simplenote/es.lproj/Localizable.strings
@@ -1,15 +1,9 @@
-/* Translation-Revision-Date: 2022-11-22 17:54:03+0000 */
+/* Translation-Revision-Date: 2024-08-08 11:54:02+0000 */
 /* Plural-Forms: nplurals=2; plural=n != 1; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: es */
 
-/* Monthly Subscription Option. Please preserve the special marker! */
-"%@ per Month" = "%@ al mes";
-
-/* Yearly Subscription Option. Please preserve the special marker! */
-"%@ per Year" = "%@ al año";
-
-/* Number of found search results */
+/* No comment provided by engineer. */
 "%d Result" = "%d Resultados";
 
 /* Number of found search results */
@@ -73,6 +67,7 @@
 "About" = "Acerca de";
 
 /* Accept Action
+   Accept Message
    Label of accept button on alert dialog */
 "Accept" = "Aceptar";
 
@@ -123,9 +118,18 @@
 /* Empty Trash Warning */
 "Are you sure you want to empty the trash? This cannot be undone." = "¿Seguro que quieres vaciar la papelera? Esta acción no se puede deshacer.";
 
+/* Data Fetch error message */
+"Attempt to fetch current note content failed.  Please try again later." = "Se ha producido un error al intentar recuperar el contenido de la nota actual.  Inténtalo de nuevo más tarde.";
+
 /* Data Fetch error message */
 "Attempt to fetch entities failed.  Please try again later." = "Se ha producido un error al intentar recuperar las entidades.  Por favor, inténtalo de nuevo más tarde.";
 
+/* Data Fetch error message */
+"Attempt to fetch notes failed.  Please try again later." = "Se ha producido un error al intentar recuperar las notas.  Inténtalo de nuevo más tarde.";
+
+/* Data Fetch error message */
+"Attempt to fetch tags failed.  Please try again later." = "Se ha producido un error al intentar recuperar las etiquetas.  Inténtalo de nuevo más tarde.";
+
 /* User Authenticated */
 "Authenticated" = "Autenticado";
 
@@ -151,7 +155,6 @@
    Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
-   Dismisses the alert
    Dismissing an interface
    PinLock screen \"cancel\" button
    Verb, cancel an alert dialog */
@@ -187,8 +190,8 @@
 /* Title on the PinLock screen asking to create a passcode */
 "Choose a 4 digit passcode" = "Elige un código de acceso de 4 dígitos";
 
-/* Sustainer Alert's Message */
-"Choose a plan and help unlock future features" = "Elige un plan y accede a nuevas funciones";
+/* Code TextField Placeholder */
+"Code" = "Código";
 
 /* Opens the Collaborate UI */
 "Collaborate" = "Colaborar";
@@ -231,9 +234,18 @@
 /* Error for bad email or password */
 "Could not create an account with the provided email address and password." = "No se ha podido crear una cuenta con el correo y contraseña ingresados.";
 
+/* Note fetch error title */
+"Could not fetch Notes" = "No se han podido recuperar las notas";
+
+/* Tag fetch error title */
+"Could not fetch Tags" = "No se han podido recuperar las etiquetas";
+
 /* Fetch error title */
 "Could not fetch entities" = "No se han podido recuperar las entidades";
 
+/* note content fetch error title */
+"Could not fetch note content" = "No se ha podido recuperar el contenido de la nota";
+
 /* Message displayed when login fails */
 "Could not login with the provided email address and password." = "No se ha podido iniciar sesion con el correo y contraseña ingresados.";
 
@@ -360,6 +372,15 @@
 /* Number of objects enqueued for processing */
 "Enqueued" = "En cola";
 
+/* LogIn Interface Title */
+"Enter Code" = "Introducir código";
+
+/* Enter Password fallback Action */
+"Enter password" = "Introducir contraseña";
+
+/* Header for Login With Password. Please preserve the {{EMAIL}} substring */
+"Enter the password for the account {{EMAIL}}" = "Introduce la contraseña de la cuenta {{EMAIL}}";
+
 /* Title on the PinLock screen asking to enter a passcode */
 "Enter your passcode" = "Ingrese su contraseña";
 
@@ -386,7 +407,7 @@
 "Forgot password? »" = "¿Olvidaste tu contraseña? »";
 
 /* Password Reset Action */
-"Forgotten password?" = "¿Olvidaste tu contraseña?";
+"Forgot your password?" = "¿Has olvidado tu contraseña?";
 
 /* FAQ or contact us */
 "Get Help" = "Obtener ayuda";
@@ -412,6 +433,12 @@
 /* Rating view - initial - liked button */
 "I like it" = "Me gusta";
 
+/* Option to add notes to spotlight search */
+"Index Notes in Spotlight" = "Notas de índice en Spotlight";
+
+/* Alert title letting user know their search index has been removed */
+"Index Removed" = "Índice eliminado";
+
 /* Note Information Button (metrics + references) */
 "Information" = "Información";
 
@@ -448,18 +475,27 @@
    LogIn Interface Title */
 "Log In" = "Acceder";
 
+/* LogIn Interface Title */
+"Log In with Password" = "Acceder con contraseña";
+
 /* Log out of the active account in the app */
 "Log Out" = "Salir";
 
 /* Widget warning if user is logged out */
 "Log in to see your notes" = "Inicia sesión para ver tus notas";
 
-/* Allows the user to SignIn using their WPCOM Account */
+/* Password fallback Action */
 "Log in with WordPress.com" = "Accede con WordPress.com";
 
-/* Presents the regular Email signin flow */
+/* Sends the User an email with an Authentication Code */
 "Log in with email" = "Accede con el correo electrónico";
 
+/* Header for Enter Password UI, when the user performed too many requests */
+"Log in with email failed, please enter your password" = "No se ha podido acceder con el correo electrónico; introduce tu contraseña";
+
+/* Message displayed when a login code is too short */
+"Login Code is too short" = "El código de acceso es demasiado corto";
+
 /* Month and day date formatter */
 "MMM d" = "d MMM";
 
@@ -490,9 +526,6 @@
 /* Sort Mode: Modified Date, ascending */
 "Modified: Oldest" = "Modificación: Más antiguo";
 
-/* Monthly Subscription Option (Used when / if the price fails to load) */
-"Monthly" = "Mensual";
-
 /* Accessibility hint for trash selected notes button */
 "Move selected notes to trash" = "Mover las notas seleccionadas a la papelera";
 
@@ -579,6 +612,9 @@
    Email unverified alert dismiss */
 "Ok" = "Aceptar";
 
+/* confirm button title */
+"Okay" = "De acuerdo";
+
 /* No comment provided by engineer. */
 "On" = "Encendido";
 
@@ -594,6 +630,9 @@
 /* Note Options Title */
 "Options" = "Opciones";
 
+/* Or, used as a separator between Actions */
+"Or" = "O";
+
 /* A 4-digit code to lock the app when it is closed */
 "Passcode" = "Codigo";
 
@@ -678,6 +717,9 @@
 /* Home screen quick action: Recent Note */
 "Recent" = "Reciente";
 
+/* Header to put on any files that need to be recovered */
+"Recovered Note Cotent - " = "Se ha recuperado el contenido de la nota: ";
+
 /* References section header on Info Card */
 "Referenced In" = "Con referencia en";
 
@@ -715,9 +757,6 @@
    Restore a note to a previous version */
 "Restore Note" = "Restaurar Nota";
 
-/* Manually Restores IAP Purchases */
-"Restore Purchases" = "Restablecer compras";
-
 /* Title -> Review you account screen */
 "Review Your Account" = "Revisa tu cuenta";
 
@@ -800,8 +839,7 @@
    Title of main share extension view */
 "Simplenote" = "Simplenote";
 
-/* Restoration Successful Title
-   Sustainer Alert's Title */
+/* Restoration Successful Title */
 "Simplenote Sustainer" = "Contribuidor de Simplenote";
 
 /* Simplenote's Feedback Email Title */
@@ -810,7 +848,8 @@
 /* Message displayed when app is not configured */
 "Simplenote must be configured and logged in to setup widgets" = "Para configurar los widgets, Simplenote debe estar configurado y conectado";
 
-/* Authentication Error Alert Title */
+/* Authentication Error Alert Title
+   Email TextField Placeholder */
 "Sorry!" = "Lo sentimos.";
 
 /* Option to sort tags alphabetically. The default is by manual ordering. */
@@ -823,14 +862,17 @@
 /* Sort By Title */
 "Sort by:" = "Ordenar por:";
 
+/* Details that some results may still appear in searches on device */
+"Spotlight history may still appear in search results, but notes have be unindexed" = "Es posible que el historial de Spotlight siga apareciendo en los resultados de búsqueda, pero las notas se han desindexado";
+
 /* Title for the response's Status Code */
 "Status Code" = "Código de estado";
 
 /* Become a Sustainer Details */
 "Support your favorite notes app to help unlock future features" = "Da soporte a tu app de notas favorita y accede a nuevas funciones";
 
-/* No comment provided by engineer. */
-"Sustainer" = "Contribuidor";
+/* Switch app icon */
+"Sustainer App Icon" = "Icono de aplicación de Sustainer";
 
 /* Restoration Successful Message */
 "Sustainer subscription restored. Thank you for supporting Simplenote!" = "Se ha restablecido la suscripción de Contribuidor. ¡Gracias por apoyar a Simplenote!";
@@ -868,6 +910,12 @@
 /* Error when address is in use */
 "That email is already being used" = "El email ya se encuentra en uso";
 
+/* Email TextField Placeholder */
+"The authentication code you've requested has expired. Please request a new one" = "El código de autenticación que has solicitado ha caducado. Solicita uno nuevo";
+
+/* Error message for Invalid Login Code */
+"The code you've entered is not correct. Please try again" = "El código que has introducido no es correcto. Inténtalo de nuevo";
+
 /* Error when address is in use */
 "The email you've entered is already associated with a Simplenote account." = "El correo electrónico que has introducido ya está asociado a una cuenta de Simplenote.";
 
@@ -980,6 +1028,9 @@
 /* Generic error */
 "We're having problems. Please try again soon." = "Estamos teniendo algunos problemas. Inténtalo de nuevo pronto.";
 
+/* Header for the Login with Code UI. Please preserve the {{EMAIL}} string as is! */
+"We've sent a code to {{EMAIL}}. The code will be valid for a few minutes." = "Hemos enviado un código a {{EMAIL}}. El código será válido durante unos minutos.";
+
 /* WebSocket Status */
 "WebSocket" = "WebSocket";
 
@@ -993,12 +1044,12 @@
 /* Rating view initial title */
 "What do you think about Simplenote?" = "¿Qué opinas de Simplenote?";
 
+/* Alerting users that we will attempt to restore lost content on next launch */
+"Will attempt to recover shortcut content on next launch" = "Intentaremos recuperar el contenido del acceso directo en el próximo lanzamiento";
+
 /* Number of words in the note */
 "Words" = "Palabras";
 
-/* Yearly Subscription Option (Used when / if the price fails to load) */
-"Yearly" = "Anual";
-
 /* Proceeds with the Empty Trash OP */
 "Yes" = "Sí";
 
@@ -1017,6 +1068,9 @@
 /* Restoration Successful Message */
 "You're already a Sustainer. Thank you for supporting Simplenote!" = "Ya eres Contribuidor. ¡Gracias por apoyar a Simplenote!";
 
+/* Error message for Invalid Login Code */
+"Your authentication code has expired. Please request a new one" = "Tu código de autenticación ha caducado. Solicita uno nuevo";
+
 /* Message displayed when email address is invalid */
 "Your email address is not valid" = "Su dirección de correo electrónico no es valida.";
 
diff --git a/Simplenote/fa.lproj/Localizable.strings b/Simplenote/fa.lproj/Localizable.strings
index 11901b89b..16b7920c4 100644
--- a/Simplenote/fa.lproj/Localizable.strings
+++ b/Simplenote/fa.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2020-05-26 04:07:15+0000 */
+/* Translation-Revision-Date: 2024-08-02 02:10:07+0000 */
 /* Plural-Forms: nplurals=1; plural=0; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: fa */
@@ -64,9 +64,6 @@
 /* Email TextField Placeholder */
 "Email" = "ایمیل";
 
-/* Password Reset Action */
-"Forgotten password?" = "گذرواژه فراموش شده؟";
-
 /* Rating view liked title */
 "Great! Mind leaving a review to tell us what you like?" = "عالی! اگر مشکلی نیست لطفاً با نوشتنِ یک بررسی به ما بگویید چه چیزی دوست دارید؟";
 
@@ -177,10 +174,14 @@
    Title of button to create a new account (must be short) */
 "Sign Up" = "نام‌نویسی";
 
+/* A short link to access the account creation screen */
+"Sign up" = "نام‌نویسی";
+
 /* Simplenote's Feedback Email Title */
 "Simplenote iOS Feedback" = "بازخوردِ Simplenote iOS";
 
-/* Authentication Error Alert Title */
+/* Authentication Error Alert Title
+   Email TextField Placeholder */
 "Sorry!" = "پوزش!";
 
 /* Option to sort tags alphabetically. The default is by manual ordering. */
diff --git a/Simplenote/fr.lproj/Localizable.strings b/Simplenote/fr.lproj/Localizable.strings
index 733f34062..ec25242dc 100644
--- a/Simplenote/fr.lproj/Localizable.strings
+++ b/Simplenote/fr.lproj/Localizable.strings
@@ -1,15 +1,9 @@
-/* Translation-Revision-Date: 2022-11-22 15:54:03+0000 */
+/* Translation-Revision-Date: 2024-08-07 12:54:03+0000 */
 /* Plural-Forms: nplurals=2; plural=n > 1; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: fr */
 
-/* Monthly Subscription Option. Please preserve the special marker! */
-"%@ per Month" = "%@ par mois";
-
-/* Yearly Subscription Option. Please preserve the special marker! */
-"%@ per Year" = "%@ par an";
-
-/* Number of found search results */
+/* No comment provided by engineer. */
 "%d Result" = "%d résultats";
 
 /* Number of found search results */
@@ -73,6 +67,7 @@
 "About" = "À propos";
 
 /* Accept Action
+   Accept Message
    Label of accept button on alert dialog */
 "Accept" = "Accepter";
 
@@ -123,9 +118,18 @@
 /* Empty Trash Warning */
 "Are you sure you want to empty the trash? This cannot be undone." = "Voulez-vous vraiment vider la corbeille ? Cette opération ne pourra pas être annulée.";
 
+/* Data Fetch error message */
+"Attempt to fetch current note content failed.  Please try again later." = "La tentative d’extraction du contenu de la note actuelle a échoué.  Veuillez réessayer plus tard.";
+
 /* Data Fetch error message */
 "Attempt to fetch entities failed.  Please try again later." = "La tentative de récupération des entités a échoué  Veuillez réessayer plus tard.";
 
+/* Data Fetch error message */
+"Attempt to fetch notes failed.  Please try again later." = "La tentative d’extraction des notes a échoué.  Veuillez réessayer plus tard.";
+
+/* Data Fetch error message */
+"Attempt to fetch tags failed.  Please try again later." = "La tentative d’extraction des étiquettes a échoué.  Veuillez réessayer plus tard.";
+
 /* User Authenticated */
 "Authenticated" = "Authentifié";
 
@@ -151,7 +155,6 @@
    Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
-   Dismisses the alert
    Dismissing an interface
    PinLock screen \"cancel\" button
    Verb, cancel an alert dialog */
@@ -187,8 +190,8 @@
 /* Title on the PinLock screen asking to create a passcode */
 "Choose a 4 digit passcode" = "Choisir un code d’accès à 4 chiffres";
 
-/* Sustainer Alert's Message */
-"Choose a plan and help unlock future features" = "Choisissez un plan et aidez à créer de nouvelles fonctionnalités.";
+/* Code TextField Placeholder */
+"Code" = "Code";
 
 /* Opens the Collaborate UI */
 "Collaborate" = "Collaborer";
@@ -231,9 +234,18 @@
 /* Error for bad email or password */
 "Could not create an account with the provided email address and password." = "Impossible de créer un compte avec l'e-mail et le mot de passe fourni.";
 
+/* Note fetch error title */
+"Could not fetch Notes" = "Impossible d’extraire les notes";
+
+/* Tag fetch error title */
+"Could not fetch Tags" = "Impossible d’extraire les étiquettes";
+
 /* Fetch error title */
 "Could not fetch entities" = "Impossible de récupérer les entités";
 
+/* note content fetch error title */
+"Could not fetch note content" = "Impossible d’extraire le contenu des notes";
+
 /* Message displayed when login fails */
 "Could not login with the provided email address and password." = "Impossible de se connecter avec l'e-mail et le mot de passe fourni.";
 
@@ -360,6 +372,15 @@
 /* Number of objects enqueued for processing */
 "Enqueued" = "En file d'attente";
 
+/* LogIn Interface Title */
+"Enter Code" = "Saisir le code";
+
+/* Enter Password fallback Action */
+"Enter password" = "Saisir le mot de passe";
+
+/* Header for Login With Password. Please preserve the {{EMAIL}} substring */
+"Enter the password for the account {{EMAIL}}" = "Saisir le mot de passe associé au compte {{EMAIL}}";
+
 /* Title on the PinLock screen asking to enter a passcode */
 "Enter your passcode" = "Entrez votre code PIN";
 
@@ -386,7 +407,7 @@
 "Forgot password? »" = "Mot de passe oublié ?";
 
 /* Password Reset Action */
-"Forgotten password?" = "Mot de passe oublié ?";
+"Forgot your password?" = "Mot de passe oublié ?";
 
 /* FAQ or contact us */
 "Get Help" = "Obtenir de l’aide";
@@ -412,6 +433,12 @@
 /* Rating view - initial - liked button */
 "I like it" = "J’aime";
 
+/* Option to add notes to spotlight search */
+"Index Notes in Spotlight" = "Indexer les notes dans Spotlight";
+
+/* Alert title letting user know their search index has been removed */
+"Index Removed" = "Index supprimé";
+
 /* Note Information Button (metrics + references) */
 "Information" = "Information";
 
@@ -448,18 +475,27 @@
    LogIn Interface Title */
 "Log In" = "Connexion";
 
+/* LogIn Interface Title */
+"Log In with Password" = "Se connecter avec un mot de passe";
+
 /* Log out of the active account in the app */
 "Log Out" = "Se déconnecter";
 
 /* Widget warning if user is logged out */
 "Log in to see your notes" = "Connectez-vous pour consulter vos notes";
 
-/* Allows the user to SignIn using their WPCOM Account */
+/* Password fallback Action */
 "Log in with WordPress.com" = "Se connecter avec WordPress.com";
 
-/* Presents the regular Email signin flow */
+/* Sends the User an email with an Authentication Code */
 "Log in with email" = "Se connecter avec une adresse e-mail";
 
+/* Header for Enter Password UI, when the user performed too many requests */
+"Log in with email failed, please enter your password" = "Échec de la connexion avec l’adresse e-mail, veuillez saisir votre mot de passe";
+
+/* Message displayed when a login code is too short */
+"Login Code is too short" = "Le code de connexion est trop court";
+
 /* Month and day date formatter */
 "MMM d" = "d MMM";
 
@@ -490,9 +526,6 @@
 /* Sort Mode: Modified Date, ascending */
 "Modified: Oldest" = "Modification : Plus anciennes";
 
-/* Monthly Subscription Option (Used when / if the price fails to load) */
-"Monthly" = "Mensuel";
-
 /* Accessibility hint for trash selected notes button */
 "Move selected notes to trash" = "Déplacer les notes sélectionnées vers la corbeille";
 
@@ -579,6 +612,9 @@
    Email unverified alert dismiss */
 "Ok" = "Valider";
 
+/* confirm button title */
+"Okay" = "OK";
+
 /* No comment provided by engineer. */
 "On" = "Activé";
 
@@ -594,6 +630,9 @@
 /* Note Options Title */
 "Options" = "Options";
 
+/* Or, used as a separator between Actions */
+"Or" = "Ou";
+
 /* A 4-digit code to lock the app when it is closed */
 "Passcode" = "Code PIN";
 
@@ -678,6 +717,9 @@
 /* Home screen quick action: Recent Note */
 "Recent" = "Récent";
 
+/* Header to put on any files that need to be recovered */
+"Recovered Note Cotent - " = "Contenu de note récupéré - ";
+
 /* References section header on Info Card */
 "Referenced In" = "Référencé dans";
 
@@ -715,9 +757,6 @@
    Restore a note to a previous version */
 "Restore Note" = "Restaurer la note";
 
-/* Manually Restores IAP Purchases */
-"Restore Purchases" = "Rétablir les achats";
-
 /* Title -> Review you account screen */
 "Review Your Account" = "Passez en revue votre compte";
 
@@ -800,8 +839,7 @@
    Title of main share extension view */
 "Simplenote" = "Simplenote";
 
-/* Restoration Successful Title
-   Sustainer Alert's Title */
+/* Restoration Successful Title */
 "Simplenote Sustainer" = "Contributeur de Simplenote";
 
 /* Simplenote's Feedback Email Title */
@@ -810,7 +848,8 @@
 /* Message displayed when app is not configured */
 "Simplenote must be configured and logged in to setup widgets" = "Vous devez configurer Simplenote en étant connecté pour configurer des widgets";
 
-/* Authentication Error Alert Title */
+/* Authentication Error Alert Title
+   Email TextField Placeholder */
 "Sorry!" = "Désolé !";
 
 /* Option to sort tags alphabetically. The default is by manual ordering. */
@@ -823,14 +862,17 @@
 /* Sort By Title */
 "Sort by:" = "Trier par :";
 
+/* Details that some results may still appear in searches on device */
+"Spotlight history may still appear in search results, but notes have be unindexed" = "L’historique Spotlight peut encore apparaître dans les résultats de recherche, mais les notes ont été désindexées";
+
 /* Title for the response's Status Code */
 "Status Code" = "Code d’état";
 
 /* Become a Sustainer Details */
 "Support your favorite notes app to help unlock future features" = "Soutenez votre application de notes préférée pour aider à créer de nouvelles fonctionnalités.";
 
-/* No comment provided by engineer. */
-"Sustainer" = "Contributeur";
+/* Switch app icon */
+"Sustainer App Icon" = "Icône de l’application Sustainer";
 
 /* Restoration Successful Message */
 "Sustainer subscription restored. Thank you for supporting Simplenote!" = "L’abonnement de soutien est restauré. Nous vous remercions de soutenir Simplenote !";
@@ -868,6 +910,12 @@
 /* Error when address is in use */
 "That email is already being used" = "Cette adresse e-mail est déjà utilisée";
 
+/* Email TextField Placeholder */
+"The authentication code you've requested has expired. Please request a new one" = "Le code d’authentification que vous avez demandé a expiré. Veuillez en demander un nouveau";
+
+/* Error message for Invalid Login Code */
+"The code you've entered is not correct. Please try again" = "Le code que vous avez saisi est incorrect. Veuillez réessayer";
+
 /* Error when address is in use */
 "The email you've entered is already associated with a Simplenote account." = "L'adresse e-mail saisie est déjà associée à un compte Simplenote.";
 
@@ -980,6 +1028,9 @@
 /* Generic error */
 "We're having problems. Please try again soon." = "Nous rencontrons des problèmes. Veuillez réessayer dans quelques instants.";
 
+/* Header for the Login with Code UI. Please preserve the {{EMAIL}} string as is! */
+"We've sent a code to {{EMAIL}}. The code will be valid for a few minutes." = "Nous avons envoyé un code à {{EMAIL}}. Ce code sera valide pendant quelques minutes.";
+
 /* WebSocket Status */
 "WebSocket" = "WebSocket";
 
@@ -993,12 +1044,12 @@
 /* Rating view initial title */
 "What do you think about Simplenote?" = "Que pensez-vous de Simplenote ?";
 
+/* Alerting users that we will attempt to restore lost content on next launch */
+"Will attempt to recover shortcut content on next launch" = "Tentera de récupérer le contenu du raccourci au prochain lancement";
+
 /* Number of words in the note */
 "Words" = "Mots";
 
-/* Yearly Subscription Option (Used when / if the price fails to load) */
-"Yearly" = "Annuellement";
-
 /* Proceeds with the Empty Trash OP */
 "Yes" = "Oui";
 
@@ -1017,6 +1068,9 @@
 /* Restoration Successful Message */
 "You're already a Sustainer. Thank you for supporting Simplenote!" = "Vous êtes déjà contributeur. Nous vous remercions de soutenir Simplenote !";
 
+/* Error message for Invalid Login Code */
+"Your authentication code has expired. Please request a new one" = "Votre code d’authentification a expiré. Veuillez en demander un nouveau";
+
 /* Message displayed when email address is invalid */
 "Your email address is not valid" = "Votre adresse e-mail n'est pas valide.";
 
diff --git a/Simplenote/he.lproj/Localizable.strings b/Simplenote/he.lproj/Localizable.strings
index efd46555d..06f458a61 100644
--- a/Simplenote/he.lproj/Localizable.strings
+++ b/Simplenote/he.lproj/Localizable.strings
@@ -1,15 +1,9 @@
-/* Translation-Revision-Date: 2022-11-22 15:54:03+0000 */
+/* Translation-Revision-Date: 2024-08-07 17:54:03+0000 */
 /* Plural-Forms: nplurals=2; plural=n != 1; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: he_IL */
 
-/* Monthly Subscription Option. Please preserve the special marker! */
-"%@ per Month" = "%@ לחודש";
-
-/* Yearly Subscription Option. Please preserve the special marker! */
-"%@ per Year" = "%@ לשנה";
-
-/* Number of found search results */
+/* No comment provided by engineer. */
 "%d Result" = "תוצאה %d";
 
 /* Number of found search results */
@@ -73,6 +67,7 @@
 "About" = "אודות";
 
 /* Accept Action
+   Accept Message
    Label of accept button on alert dialog */
 "Accept" = "קבלה";
 
@@ -123,9 +118,18 @@
 /* Empty Trash Warning */
 "Are you sure you want to empty the trash? This cannot be undone." = "האם ברצונך לרוקן את הפח? לא ניתן לבטל את הפעולה.";
 
+/* Data Fetch error message */
+"Attempt to fetch current note content failed.  Please try again later." = "ניסיון להביא את תוכן הפתק הנוכחי נכשל.  יש לנסות שוב מאוחר יותר.";
+
 /* Data Fetch error message */
 "Attempt to fetch entities failed.  Please try again later." = "ניסיון להביא את הישויות נכשל.  יש לנסות שוב מאוחר יותר.";
 
+/* Data Fetch error message */
+"Attempt to fetch notes failed.  Please try again later." = "ניסיון להביא 'פתקים' נכשל.  יש לנסות שוב מאוחר יותר.";
+
+/* Data Fetch error message */
+"Attempt to fetch tags failed.  Please try again later." = "ניסיון להביא 'תגיות' נכשל.  יש לנסות שוב מאוחר יותר.";
+
 /* User Authenticated */
 "Authenticated" = "האימות בוצע";
 
@@ -151,7 +155,6 @@
    Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
-   Dismisses the alert
    Dismissing an interface
    PinLock screen \"cancel\" button
    Verb, cancel an alert dialog */
@@ -187,8 +190,8 @@
 /* Title on the PinLock screen asking to create a passcode */
 "Choose a 4 digit passcode" = "לבחור קוד סיסמה בן 4 ספרות";
 
-/* Sustainer Alert's Message */
-"Choose a plan and help unlock future features" = "יש לבחור תוכנית כדי לעזור בהפעלת אפשרויות בעתיד";
+/* Code TextField Placeholder */
+"Code" = "קוד";
 
 /* Opens the Collaborate UI */
 "Collaborate" = "שיתוף פעולה בעריכה";
@@ -231,9 +234,18 @@
 /* Error for bad email or password */
 "Could not create an account with the provided email address and password." = "לא ניתן ליצור חשבון באמצעות כתובת האימייל והסיסמה שסופקו.";
 
+/* Note fetch error title */
+"Could not fetch Notes" = "לא ניתן היה להביא 'פתקים'";
+
+/* Tag fetch error title */
+"Could not fetch Tags" = "לא ניתן היה להביא 'תגיות'";
+
 /* Fetch error title */
 "Could not fetch entities" = "לא ניתן היה להביא את הישויות";
 
+/* note content fetch error title */
+"Could not fetch note content" = "לא ניתן היה להביא את תוכן הפתקים";
+
 /* Message displayed when login fails */
 "Could not login with the provided email address and password." = "לא ניתן להיכנס באמצעות כתובת האימייל והסיסמה שסופקו.";
 
@@ -360,6 +372,15 @@
 /* Number of objects enqueued for processing */
 "Enqueued" = "צורף לתור";
 
+/* LogIn Interface Title */
+"Enter Code" = "להזין קוד";
+
+/* Enter Password fallback Action */
+"Enter password" = "להזין סיסמה";
+
+/* Header for Login With Password. Please preserve the {{EMAIL}} substring */
+"Enter the password for the account {{EMAIL}}" = "יש להזין את הסיסמה לחשבון {{EMAIL}}";
+
 /* Title on the PinLock screen asking to enter a passcode */
 "Enter your passcode" = "הזנת קוד סיסמה";
 
@@ -386,7 +407,7 @@
 "Forgot password? »" = "שכחת את הסיסמה? »";
 
 /* Password Reset Action */
-"Forgotten password?" = "שכחת את הסיסמה?";
+"Forgot your password?" = "שכחת סיסמה?";
 
 /* FAQ or contact us */
 "Get Help" = "לקבלת עזרה";
@@ -412,6 +433,12 @@
 /* Rating view - initial - liked button */
 "I like it" = "אהבתי את זה";
 
+/* Option to add notes to spotlight search */
+"Index Notes in Spotlight" = "להוסיף אינדקס של פתקים אל Spotlight";
+
+/* Alert title letting user know their search index has been removed */
+"Index Removed" = "האינדקס הוסר";
+
 /* Note Information Button (metrics + references) */
 "Information" = "מידע";
 
@@ -448,18 +475,27 @@
    LogIn Interface Title */
 "Log In" = "התחבר";
 
+/* LogIn Interface Title */
+"Log In with Password" = "להתחבר באמצעות סיסמה";
+
 /* Log out of the active account in the app */
 "Log Out" = "התנתקות";
 
 /* Widget warning if user is logged out */
 "Log in to see your notes" = "יש להתחבר לחשבון כדי לצפות בפתקים שלך";
 
-/* Allows the user to SignIn using their WPCOM Account */
+/* Password fallback Action */
 "Log in with WordPress.com" = "התחברו באמצעות WordPress.com";
 
-/* Presents the regular Email signin flow */
+/* Sends the User an email with an Authentication Code */
 "Log in with email" = "התחברות באמצעות אימייל";
 
+/* Header for Enter Password UI, when the user performed too many requests */
+"Log in with email failed, please enter your password" = "ההתחברות באמצעות האימייל נכשלה, יש להזין סיסמה";
+
+/* Message displayed when a login code is too short */
+"Login Code is too short" = "קוד ההתחברות קצר מדי";
+
 /* Month and day date formatter */
 "MMM d" = "d ‏MMM";
 
@@ -490,9 +526,6 @@
 /* Sort Mode: Modified Date, ascending */
 "Modified: Oldest" = "עודכן: הישן ביותר";
 
-/* Monthly Subscription Option (Used when / if the price fails to load) */
-"Monthly" = "חודשי";
-
 /* Accessibility hint for trash selected notes button */
 "Move selected notes to trash" = "להעביר את הפתקים שנבחרו לפח";
 
@@ -579,6 +612,9 @@
    Email unverified alert dismiss */
 "Ok" = "OK";
 
+/* confirm button title */
+"Okay" = "בסדר";
+
 /* No comment provided by engineer. */
 "On" = "מופעל";
 
@@ -594,6 +630,9 @@
 /* Note Options Title */
 "Options" = "אפשרויות";
 
+/* Or, used as a separator between Actions */
+"Or" = "או";
+
 /* A 4-digit code to lock the app when it is closed */
 "Passcode" = "קוד סיסמה";
 
@@ -678,6 +717,9 @@
 /* Home screen quick action: Recent Note */
 "Recent" = "אחרונים";
 
+/* Header to put on any files that need to be recovered */
+"Recovered Note Cotent - " = "תוכן הפתק ששוחזר – ";
+
 /* References section header on Info Card */
 "Referenced In" = "מאוזכר בפתק";
 
@@ -715,9 +757,6 @@
    Restore a note to a previous version */
 "Restore Note" = "שחזור פתק";
 
-/* Manually Restores IAP Purchases */
-"Restore Purchases" = "לשחזר רכישות";
-
 /* Title -> Review you account screen */
 "Review Your Account" = "לבדוק את החשבון שלך";
 
@@ -800,8 +839,7 @@
    Title of main share extension view */
 "Simplenote" = "Simplenote";
 
-/* Restoration Successful Title
-   Sustainer Alert's Title */
+/* Restoration Successful Title */
 "Simplenote Sustainer" = "Simplenote Sustainer";
 
 /* Simplenote's Feedback Email Title */
@@ -810,7 +848,8 @@
 /* Message displayed when app is not configured */
 "Simplenote must be configured and logged in to setup widgets" = "יש להגדיר את Simplenote ולהתחבר אל השירות כדי להגדיר את הווידג'טים";
 
-/* Authentication Error Alert Title */
+/* Authentication Error Alert Title
+   Email TextField Placeholder */
 "Sorry!" = "מצטערים!";
 
 /* Option to sort tags alphabetically. The default is by manual ordering. */
@@ -823,14 +862,17 @@
 /* Sort By Title */
 "Sort by:" = "למיין לפי:";
 
+/* Details that some results may still appear in searches on device */
+"Spotlight history may still appear in search results, but notes have be unindexed" = "תוצאות החיפוש עדיין עשויות להציג את ההיסטוריה של Spotlight, אבל הפתקים הוסרו מהאינדקס";
+
 /* Title for the response's Status Code */
 "Status Code" = "קוד מצב";
 
 /* Become a Sustainer Details */
 "Support your favorite notes app to help unlock future features" = "ניתן לתמוך באפליקציית הפתקים המועדפת עליך כדי לעזור בהפעלת אפשרויות בעתיד";
 
-/* No comment provided by engineer. */
-"Sustainer" = "Sustainer";
+/* Switch app icon */
+"Sustainer App Icon" = "סמל האפליקציה של Sustainer";
 
 /* Restoration Successful Message */
 "Sustainer subscription restored. Thank you for supporting Simplenote!" = "המינוי של Sustainer שוחזר. תודה על התמיכה ב-Simplenote!";
@@ -868,6 +910,12 @@
 /* Error when address is in use */
 "That email is already being used" = "כתובת האימייל הזאת כבר נמצאת בשימוש";
 
+/* Email TextField Placeholder */
+"The authentication code you've requested has expired. Please request a new one" = "פג תוקפו של קוד האימות שביקשת. יש לבקש קוד חדש";
+
+/* Error message for Invalid Login Code */
+"The code you've entered is not correct. Please try again" = "הקוד שהזנת שגוי. יש לנסות שוב";
+
 /* Error when address is in use */
 "The email you've entered is already associated with a Simplenote account." = "כתובת האימייל שהזנת כבר משויכת לחשבון Simplenote.";
 
@@ -980,6 +1028,9 @@
 /* Generic error */
 "We're having problems. Please try again soon." = "נתקלנו בבעיות. יש לנסות שוב בקרוב.";
 
+/* Header for the Login with Code UI. Please preserve the {{EMAIL}} string as is! */
+"We've sent a code to {{EMAIL}}. The code will be valid for a few minutes." = "שלחנו קוד אל {{EMAIL}}. הקוד הזה יהיה בתוקף למשך מספר דקות.";
+
 /* WebSocket Status */
 "WebSocket" = "WebSocket";
 
@@ -993,12 +1044,12 @@
 /* Rating view initial title */
 "What do you think about Simplenote?" = "מה דעתך על Simplenote?";
 
+/* Alerting users that we will attempt to restore lost content on next launch */
+"Will attempt to recover shortcut content on next launch" = "ננסה לשחזר את התוכן של הקיצור בהפעלה הבאה";
+
 /* Number of words in the note */
 "Words" = "מילים";
 
-/* Yearly Subscription Option (Used when / if the price fails to load) */
-"Yearly" = "שנתי";
-
 /* Proceeds with the Empty Trash OP */
 "Yes" = "כן";
 
@@ -1017,6 +1068,9 @@
 /* Restoration Successful Message */
 "You're already a Sustainer. Thank you for supporting Simplenote!" = "כבר הצטרפת בתור Sustainer. תודה על התמיכה ב-Simplenote!";
 
+/* Error message for Invalid Login Code */
+"Your authentication code has expired. Please request a new one" = "פג תוקפו של קוד האימות. יש לבקש קוד חדש";
+
 /* Message displayed when email address is invalid */
 "Your email address is not valid" = "כתובת האימייל שלך אינה חוקית.";
 
diff --git a/Simplenote/id.lproj/Localizable.strings b/Simplenote/id.lproj/Localizable.strings
index 530ea0e1d..640a7df5d 100644
--- a/Simplenote/id.lproj/Localizable.strings
+++ b/Simplenote/id.lproj/Localizable.strings
@@ -1,15 +1,9 @@
-/* Translation-Revision-Date: 2022-11-21 22:54:03+0000 */
+/* Translation-Revision-Date: 2024-08-07 09:54:03+0000 */
 /* Plural-Forms: nplurals=2; plural=n > 1; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: id */
 
-/* Monthly Subscription Option. Please preserve the special marker! */
-"%@ per Month" = "%@ per Bulan";
-
-/* Yearly Subscription Option. Please preserve the special marker! */
-"%@ per Year" = "%@ per Tahun";
-
-/* Number of found search results */
+/* No comment provided by engineer. */
 "%d Result" = "%d Hasil";
 
 /* Number of found search results */
@@ -73,6 +67,7 @@
 "About" = "Tentang";
 
 /* Accept Action
+   Accept Message
    Label of accept button on alert dialog */
 "Accept" = "Terima";
 
@@ -120,9 +115,18 @@
 /* Empty Trash Warning */
 "Are you sure you want to empty the trash? This cannot be undone." = "Anda yakin ingin mengosongkan tempat sampah? Ini tidak dapat dibatalkan.";
 
+/* Data Fetch error message */
+"Attempt to fetch current note content failed.  Please try again later." = "Upaya untuk mengambil konten catatan terbaru gagal.  Coba lagi nanti.";
+
 /* Data Fetch error message */
 "Attempt to fetch entities failed.  Please try again later." = "Upaya untuk mengambil entitas gagal.  Silakan coba lagi nanti.";
 
+/* Data Fetch error message */
+"Attempt to fetch notes failed.  Please try again later." = "Upaya untuk mengambil catatan gagal.  Coba lagi nanti.";
+
+/* Data Fetch error message */
+"Attempt to fetch tags failed.  Please try again later." = "Upaya untuk mengambil tag gagal.  Coba lagi nanti.";
+
 /* User Authenticated */
 "Authenticated" = "Diautentikasi";
 
@@ -148,7 +152,6 @@
    Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
-   Dismisses the alert
    Dismissing an interface
    PinLock screen \"cancel\" button
    Verb, cancel an alert dialog */
@@ -184,8 +187,8 @@
 /* Title on the PinLock screen asking to create a passcode */
 "Choose a 4 digit passcode" = "Pilih kode sandi 4 digit";
 
-/* Sustainer Alert's Message */
-"Choose a plan and help unlock future features" = "Pilih paket untuk membantu pengembangan fitur masa depan";
+/* Code TextField Placeholder */
+"Code" = "Kode";
 
 /* Opens the Collaborate UI */
 "Collaborate" = "Kolaborasi";
@@ -228,9 +231,18 @@
 /* Error for bad email or password */
 "Could not create an account with the provided email address and password." = "Tidak dapat membuat akun dengan alamat email dan kata sandi yang diberikan.";
 
+/* Note fetch error title */
+"Could not fetch Notes" = "Tidak dapat mengambil Catatan";
+
+/* Tag fetch error title */
+"Could not fetch Tags" = "Tidak dapat mengambil Tag";
+
 /* Fetch error title */
 "Could not fetch entities" = "Tidak dapat mengambil entitas";
 
+/* note content fetch error title */
+"Could not fetch note content" = "Tidak dapat mengambil konten catatan";
+
 /* Message displayed when login fails */
 "Could not login with the provided email address and password." = "Tidak dapat masuk dengan alamat email dan kata sandi yang diberikan.";
 
@@ -357,6 +369,15 @@
 /* Number of objects enqueued for processing */
 "Enqueued" = "Dalam antrean";
 
+/* LogIn Interface Title */
+"Enter Code" = "Masukkan Kode";
+
+/* Enter Password fallback Action */
+"Enter password" = "Masukkan kata sandi";
+
+/* Header for Login With Password. Please preserve the {{EMAIL}} substring */
+"Enter the password for the account {{EMAIL}}" = "Masukkan kata sandi untuk akun {{EMAIL}}";
+
 /* Title on the PinLock screen asking to enter a passcode */
 "Enter your passcode" = "Masukkan kode sandi Anda";
 
@@ -383,7 +404,7 @@
 "Forgot password? »" = "Lupa kata sandi? »";
 
 /* Password Reset Action */
-"Forgotten password?" = "Lupa kata sandi?";
+"Forgot your password?" = "Lupa kata sandi?";
 
 /* FAQ or contact us */
 "Get Help" = "Dapatkan Bantuan";
@@ -409,6 +430,12 @@
 /* Rating view - initial - liked button */
 "I like it" = "Saya Menyukainya";
 
+/* Option to add notes to spotlight search */
+"Index Notes in Spotlight" = "Indeks Catatan dalam Sorotan";
+
+/* Alert title letting user know their search index has been removed */
+"Index Removed" = "Indeks Dihapus";
+
 /* Note Information Button (metrics + references) */
 "Information" = "Informasi";
 
@@ -445,18 +472,27 @@
    LogIn Interface Title */
 "Log In" = "Masuk";
 
+/* LogIn Interface Title */
+"Log In with Password" = "Login dengan Kata Sandi";
+
 /* Log out of the active account in the app */
 "Log Out" = "Logout";
 
 /* Widget warning if user is logged out */
 "Log in to see your notes" = "Masuk untuk melihat catatan Anda";
 
-/* Allows the user to SignIn using their WPCOM Account */
+/* Password fallback Action */
 "Log in with WordPress.com" = "Login dengan WordPress.com";
 
-/* Presents the regular Email signin flow */
+/* Sends the User an email with an Authentication Code */
 "Log in with email" = "Login dengan email";
 
+/* Header for Enter Password UI, when the user performed too many requests */
+"Log in with email failed, please enter your password" = "Login dengan email gagal, masukkan kata sandi";
+
+/* Message displayed when a login code is too short */
+"Login Code is too short" = "Kode Login terlalu pendek";
+
 /* Month and day date formatter */
 "MMM d" = "d MMM";
 
@@ -487,9 +523,6 @@
 /* Sort Mode: Modified Date, ascending */
 "Modified: Oldest" = "Diubah: Paling lama";
 
-/* Monthly Subscription Option (Used when / if the price fails to load) */
-"Monthly" = "Bulanan";
-
 /* Accessibility hint for trash selected notes button */
 "Move selected notes to trash" = "Pindahkan catatan yang dipilih ke tong sampah";
 
@@ -576,6 +609,9 @@
    Email unverified alert dismiss */
 "Ok" = "OK";
 
+/* confirm button title */
+"Okay" = "Oke";
+
 /* No comment provided by engineer. */
 "On" = "Menyala";
 
@@ -591,6 +627,9 @@
 /* Note Options Title */
 "Options" = "Opsi-opsi";
 
+/* Or, used as a separator between Actions */
+"Or" = "Atau";
+
 /* A 4-digit code to lock the app when it is closed */
 "Passcode" = "Kode sandi";
 
@@ -675,6 +714,9 @@
 /* Home screen quick action: Recent Note */
 "Recent" = "Terkini";
 
+/* Header to put on any files that need to be recovered */
+"Recovered Note Cotent - " = "Pemulihan Konten Catatan - ";
+
 /* References section header on Info Card */
 "Referenced In" = "Dirujuk di";
 
@@ -712,9 +754,6 @@
    Restore a note to a previous version */
 "Restore Note" = "Pulihkan Catatan";
 
-/* Manually Restores IAP Purchases */
-"Restore Purchases" = "Pulihkan Pembelian";
-
 /* Title -> Review you account screen */
 "Review Your Account" = "Tinjau Akun Anda";
 
@@ -797,8 +836,7 @@
    Title of main share extension view */
 "Simplenote" = "Simplenote";
 
-/* Restoration Successful Title
-   Sustainer Alert's Title */
+/* Restoration Successful Title */
 "Simplenote Sustainer" = "Simplenote Sustainer";
 
 /* Simplenote's Feedback Email Title */
@@ -807,7 +845,8 @@
 /* Message displayed when app is not configured */
 "Simplenote must be configured and logged in to setup widgets" = "Simplenote harus dikonfigurasi dan masuk ke widget pengaturan";
 
-/* Authentication Error Alert Title */
+/* Authentication Error Alert Title
+   Email TextField Placeholder */
 "Sorry!" = "Maaf!";
 
 /* Option to sort tags alphabetically. The default is by manual ordering. */
@@ -820,14 +859,17 @@
 /* Sort By Title */
 "Sort by:" = "Urutkan berdasarkan:";
 
+/* Details that some results may still appear in searches on device */
+"Spotlight history may still appear in search results, but notes have be unindexed" = "Riwayat sorotan mungkin masih muncul di hasil pencarian, tetapi catatan tidak terindeks";
+
 /* Title for the response's Status Code */
 "Status Code" = "Kode Status";
 
 /* Become a Sustainer Details */
 "Support your favorite notes app to help unlock future features" = "Dukung aplikasi pencatatan favorit Anda untuk membantu pengembangan fitur masa depan";
 
-/* No comment provided by engineer. */
-"Sustainer" = "Sustainer";
+/* Switch app icon */
+"Sustainer App Icon" = "Ikon Aplikasi Sustainer";
 
 /* Restoration Successful Message */
 "Sustainer subscription restored. Thank you for supporting Simplenote!" = "Langganan Sustainer dipulihkan. Terima kasih telah mendukung Simplenote!";
@@ -865,6 +907,12 @@
 /* Error when address is in use */
 "That email is already being used" = "Email sudah digunakan";
 
+/* Email TextField Placeholder */
+"The authentication code you've requested has expired. Please request a new one" = "Kode autentikasi yang diminta telah kedaluwarsa. Silakan minta kode yang baru";
+
+/* Error message for Invalid Login Code */
+"The code you've entered is not correct. Please try again" = "Kode yang Anda masukkan salah. Coba lagi";
+
 /* Error when address is in use */
 "The email you've entered is already associated with a Simplenote account." = "Email yang Anda masukkan telah digunakan oleh akun Simplenote lain.";
 
@@ -977,6 +1025,9 @@
 /* Generic error */
 "We're having problems. Please try again soon." = "Kami mengalami masalah. Harap coba lagi nanti.";
 
+/* Header for the Login with Code UI. Please preserve the {{EMAIL}} string as is! */
+"We've sent a code to {{EMAIL}}. The code will be valid for a few minutes." = "Kami telah mengirimkan kode ke {{EMAIL}}. Kode ini valid selama beberapa menit.";
+
 /* WebSocket Status */
 "WebSocket" = "WebSocket";
 
@@ -990,12 +1041,12 @@
 /* Rating view initial title */
 "What do you think about Simplenote?" = "Apa pendapat Anda tentang Simplenote?";
 
+/* Alerting users that we will attempt to restore lost content on next launch */
+"Will attempt to recover shortcut content on next launch" = "Konten pintasan akan coba dipulihkan pada saat aplikasi dibuka lagi";
+
 /* Number of words in the note */
 "Words" = "Kata";
 
-/* Yearly Subscription Option (Used when / if the price fails to load) */
-"Yearly" = "Tahunan";
-
 /* Proceeds with the Empty Trash OP */
 "Yes" = "Ya";
 
@@ -1014,6 +1065,9 @@
 /* Restoration Successful Message */
 "You're already a Sustainer. Thank you for supporting Simplenote!" = "Anda sudah menjadi Sustainer. Terima kasih telah mendukung Simplenote!";
 
+/* Error message for Invalid Login Code */
+"Your authentication code has expired. Please request a new one" = "Kode autentikasi telah kedaluwarsa. Silakan minta kode yang baru";
+
 /* Message displayed when email address is invalid */
 "Your email address is not valid" = "Alamat email Anda tidak valid.";
 
diff --git a/Simplenote/it.lproj/Localizable.strings b/Simplenote/it.lproj/Localizable.strings
index 6dc597232..7d467e95e 100644
--- a/Simplenote/it.lproj/Localizable.strings
+++ b/Simplenote/it.lproj/Localizable.strings
@@ -1,15 +1,9 @@
-/* Translation-Revision-Date: 2022-11-22 11:54:03+0000 */
+/* Translation-Revision-Date: 2024-08-07 09:54:03+0000 */
 /* Plural-Forms: nplurals=2; plural=n != 1; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: it */
 
-/* Monthly Subscription Option. Please preserve the special marker! */
-"%@ per Month" = "%@ al mese";
-
-/* Yearly Subscription Option. Please preserve the special marker! */
-"%@ per Year" = "%@ all'anno";
-
-/* Number of found search results */
+/* No comment provided by engineer. */
 "%d Result" = "%d Resultato";
 
 /* Number of found search results */
@@ -73,6 +67,7 @@
 "About" = "Informazioni";
 
 /* Accept Action
+   Accept Message
    Label of accept button on alert dialog */
 "Accept" = "Ok";
 
@@ -123,9 +118,18 @@
 /* Empty Trash Warning */
 "Are you sure you want to empty the trash? This cannot be undone." = "Desideri svuotare il cestino? Questa operazione non può essere annullata.";
 
+/* Data Fetch error message */
+"Attempt to fetch current note content failed.  Please try again later." = "Il tentativo di recuperare il contenuto della nota attuale non è riuscito.  Riprova più tardi.";
+
 /* Data Fetch error message */
 "Attempt to fetch entities failed.  Please try again later." = "Il tentativo di recuperare le entità non è riuscito.  Riprova più tardi.";
 
+/* Data Fetch error message */
+"Attempt to fetch notes failed.  Please try again later." = "Il tentativo di recuperare le note non è riuscito.  Riprova più tardi.";
+
+/* Data Fetch error message */
+"Attempt to fetch tags failed.  Please try again later." = "Il tentativo di recuperare i tag non è riuscito.  Riprova più tardi.";
+
 /* User Authenticated */
 "Authenticated" = "Autenticato";
 
@@ -151,7 +155,6 @@
    Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
-   Dismisses the alert
    Dismissing an interface
    PinLock screen \"cancel\" button
    Verb, cancel an alert dialog */
@@ -187,8 +190,8 @@
 /* Title on the PinLock screen asking to create a passcode */
 "Choose a 4 digit passcode" = "Scegli un PIN di 4 cifre";
 
-/* Sustainer Alert's Message */
-"Choose a plan and help unlock future features" = "Scegli un piano e aiuta a sbloccare funzionalità future";
+/* Code TextField Placeholder */
+"Code" = "Codice";
 
 /* Opens the Collaborate UI */
 "Collaborate" = "Collabora";
@@ -231,9 +234,18 @@
 /* Error for bad email or password */
 "Could not create an account with the provided email address and password." = "Non è possibile creare un account con l'indirizzo email e la password forniti.";
 
+/* Note fetch error title */
+"Could not fetch Notes" = "Impossibile recuperare le note";
+
+/* Tag fetch error title */
+"Could not fetch Tags" = "Impossibile recuperare i tag";
+
 /* Fetch error title */
 "Could not fetch entities" = "Impossibile recuperare le entità";
 
+/* note content fetch error title */
+"Could not fetch note content" = "Impossibile recuperare il contenuto delle note";
+
 /* Message displayed when login fails */
 "Could not login with the provided email address and password." = "Nome utente o password errata.";
 
@@ -360,6 +372,15 @@
 /* Number of objects enqueued for processing */
 "Enqueued" = "In coda";
 
+/* LogIn Interface Title */
+"Enter Code" = "Inserisci codice";
+
+/* Enter Password fallback Action */
+"Enter password" = "Inserisci password";
+
+/* Header for Login With Password. Please preserve the {{EMAIL}} substring */
+"Enter the password for the account {{EMAIL}}" = "Digita la password per l'account {{EMAIL}}";
+
 /* Title on the PinLock screen asking to enter a passcode */
 "Enter your passcode" = "Inserisci il tuo PIN";
 
@@ -386,7 +407,7 @@
 "Forgot password? »" = "Hai dimenticato la tua password? »";
 
 /* Password Reset Action */
-"Forgotten password?" = "Password dimenticata?";
+"Forgot your password?" = "Password dimenticata?";
 
 /* FAQ or contact us */
 "Get Help" = "Richiedi supporto";
@@ -412,6 +433,12 @@
 /* Rating view - initial - liked button */
 "I like it" = "Mi piace";
 
+/* Option to add notes to spotlight search */
+"Index Notes in Spotlight" = "Note dell'indice in Spotlight";
+
+/* Alert title letting user know their search index has been removed */
+"Index Removed" = "Indice rimosso";
+
 /* Note Information Button (metrics + references) */
 "Information" = "Informazioni";
 
@@ -448,18 +475,27 @@
    LogIn Interface Title */
 "Log In" = "Accedi";
 
+/* LogIn Interface Title */
+"Log In with Password" = "Accedi con la password";
+
 /* Log out of the active account in the app */
 "Log Out" = "Esci";
 
 /* Widget warning if user is logged out */
 "Log in to see your notes" = "Accedi per visualizzare le note";
 
-/* Allows the user to SignIn using their WPCOM Account */
+/* Password fallback Action */
 "Log in with WordPress.com" = "Accedi con WordPress.com";
 
-/* Presents the regular Email signin flow */
+/* Sends the User an email with an Authentication Code */
 "Log in with email" = "Accedi con l'e-mail";
 
+/* Header for Enter Password UI, when the user performed too many requests */
+"Log in with email failed, please enter your password" = "Accesso con e-mail non riuscito, inserisci la tua password";
+
+/* Message displayed when a login code is too short */
+"Login Code is too short" = "Il codice di accesso è troppo breve";
+
 /* Month and day date formatter */
 "MMM d" = "d MMM";
 
@@ -490,9 +526,6 @@
 /* Sort Mode: Modified Date, ascending */
 "Modified: Oldest" = "Data di modifica: meno recente";
 
-/* Monthly Subscription Option (Used when / if the price fails to load) */
-"Monthly" = "Mensile";
-
 /* Accessibility hint for trash selected notes button */
 "Move selected notes to trash" = "Sposta le note selezionate nel cestino";
 
@@ -579,6 +612,9 @@
    Email unverified alert dismiss */
 "Ok" = "OK";
 
+/* confirm button title */
+"Okay" = "Ok";
+
 /* No comment provided by engineer. */
 "On" = "On";
 
@@ -594,6 +630,9 @@
 /* Note Options Title */
 "Options" = "Opzioni";
 
+/* Or, used as a separator between Actions */
+"Or" = "Or";
+
 /* A 4-digit code to lock the app when it is closed */
 "Passcode" = "PIN";
 
@@ -678,6 +717,9 @@
 /* Home screen quick action: Recent Note */
 "Recent" = "Recente";
 
+/* Header to put on any files that need to be recovered */
+"Recovered Note Cotent - " = "Contenuto della nota recuperato - ";
+
 /* References section header on Info Card */
 "Referenced In" = "Riferimento in";
 
@@ -715,9 +757,6 @@
    Restore a note to a previous version */
 "Restore Note" = "Ripristina la nota";
 
-/* Manually Restores IAP Purchases */
-"Restore Purchases" = "Ripristina acquisti";
-
 /* Title -> Review you account screen */
 "Review Your Account" = "Verifica il tuo account";
 
@@ -800,8 +839,7 @@
    Title of main share extension view */
 "Simplenote" = "Simplenote";
 
-/* Restoration Successful Title
-   Sustainer Alert's Title */
+/* Restoration Successful Title */
 "Simplenote Sustainer" = "Sostenitore Simplenote";
 
 /* Simplenote's Feedback Email Title */
@@ -810,7 +848,8 @@
 /* Message displayed when app is not configured */
 "Simplenote must be configured and logged in to setup widgets" = "Simplenote deve essere configurato e deve essere stato effettuato l'accesso per configurare i widget";
 
-/* Authentication Error Alert Title */
+/* Authentication Error Alert Title
+   Email TextField Placeholder */
 "Sorry!" = "Siamo spiacenti.";
 
 /* Option to sort tags alphabetically. The default is by manual ordering. */
@@ -823,14 +862,17 @@
 /* Sort By Title */
 "Sort by:" = "Ordina per:";
 
+/* Details that some results may still appear in searches on device */
+"Spotlight history may still appear in search results, but notes have be unindexed" = "La cronologia Spotlight potrebbe apparire ancora nei risultati di ricerca, ma le note sono state rimosse dall'indice";
+
 /* Title for the response's Status Code */
 "Status Code" = "Codice stato";
 
 /* Become a Sustainer Details */
 "Support your favorite notes app to help unlock future features" = "Supporta la tua app di annotazione preferita per aiutarci a sbloccare funzionalità future";
 
-/* No comment provided by engineer. */
-"Sustainer" = "Sosteniitore";
+/* Switch app icon */
+"Sustainer App Icon" = "Icona app sostenitore";
 
 /* Restoration Successful Message */
 "Sustainer subscription restored. Thank you for supporting Simplenote!" = "Abbonamento di sostenitore ripristinato. Grazie per il supporto a Simplenote!";
@@ -868,6 +910,12 @@
 /* Error when address is in use */
 "That email is already being used" = "Quell'indirizzo e-mail è già in uso";
 
+/* Email TextField Placeholder */
+"The authentication code you've requested has expired. Please request a new one" = "Il codice di autenticazione che hai richiesto è scaduto. Richiedine uno nuovo";
+
+/* Error message for Invalid Login Code */
+"The code you've entered is not correct. Please try again" = "Il codice che hai inserito non è corretto. Riprova";
+
 /* Error when address is in use */
 "The email you've entered is already associated with a Simplenote account." = "L'indirizzo e-mail inserito è già associato a un account Simplenote.";
 
@@ -980,6 +1028,9 @@
 /* Generic error */
 "We're having problems. Please try again soon." = "Stiamo riscontrando dei problemi. Riprova a breve.";
 
+/* Header for the Login with Code UI. Please preserve the {{EMAIL}} string as is! */
+"We've sent a code to {{EMAIL}}. The code will be valid for a few minutes." = "Abbiamo inviato un codice a {{EMAIL}}. Il codice sarà valido per pochi minuti.";
+
 /* WebSocket Status */
 "WebSocket" = "WebSocket";
 
@@ -993,12 +1044,12 @@
 /* Rating view initial title */
 "What do you think about Simplenote?" = "Che cosa pensi di Simplenote?";
 
+/* Alerting users that we will attempt to restore lost content on next launch */
+"Will attempt to recover shortcut content on next launch" = "Riproveremo a recuperare il contenuto della scorciatoia al prossimo avvio.";
+
 /* Number of words in the note */
 "Words" = "Parole";
 
-/* Yearly Subscription Option (Used when / if the price fails to load) */
-"Yearly" = "Annuale";
-
 /* Proceeds with the Empty Trash OP */
 "Yes" = "Si";
 
@@ -1017,6 +1068,9 @@
 /* Restoration Successful Message */
 "You're already a Sustainer. Thank you for supporting Simplenote!" = "Sei già un sostenitore. Grazie per il supporto a Simplenote!";
 
+/* Error message for Invalid Login Code */
+"Your authentication code has expired. Please request a new one" = "Il codice di autenticazione è scaduto. Richiedine uno nuovo";
+
 /* Message displayed when email address is invalid */
 "Your email address is not valid" = "Il tuo indirizzo email non è valido.";
 
diff --git a/Simplenote/ja.lproj/Localizable.strings b/Simplenote/ja.lproj/Localizable.strings
index 8a128bf25..5200e7fa4 100644
--- a/Simplenote/ja.lproj/Localizable.strings
+++ b/Simplenote/ja.lproj/Localizable.strings
@@ -1,15 +1,9 @@
-/* Translation-Revision-Date: 2022-11-23 11:54:04+0000 */
+/* Translation-Revision-Date: 2024-08-07 09:54:03+0000 */
 /* Plural-Forms: nplurals=1; plural=0; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: ja_JP */
 
-/* Monthly Subscription Option. Please preserve the special marker! */
-"%@ per Month" = "月額 %@";
-
-/* Yearly Subscription Option. Please preserve the special marker! */
-"%@ per Year" = "年額 %@";
-
-/* Number of found search results */
+/* No comment provided by engineer. */
 "%d Result" = "%d件の検索結果";
 
 /* Number of found search results */
@@ -73,6 +67,7 @@
 "About" = "このサイトについて";
 
 /* Accept Action
+   Accept Message
    Label of accept button on alert dialog */
 "Accept" = "承認";
 
@@ -123,9 +118,18 @@
 /* Empty Trash Warning */
 "Are you sure you want to empty the trash? This cannot be undone." = "ゴミ箱を空にしてもよいですか ?この操作は元に戻すことができません。";
 
+/* Data Fetch error message */
+"Attempt to fetch current note content failed.  Please try again later." = "現在のメモ内容を取得しようとしましたが失敗しました。  後でもう一度お試しください。";
+
 /* Data Fetch error message */
 "Attempt to fetch entities failed.  Please try again later." = "エンティティの取得の試みに失敗しました。  後ほど、もう一度お試しください。";
 
+/* Data Fetch error message */
+"Attempt to fetch notes failed.  Please try again later." = "メモを取得しようとしましたが失敗しました。  後でもう一度お試しください。";
+
+/* Data Fetch error message */
+"Attempt to fetch tags failed.  Please try again later." = "タグを取得しようとしましたが失敗しました。  後でもう一度お試しください。";
+
 /* User Authenticated */
 "Authenticated" = "認証済み";
 
@@ -151,7 +155,6 @@
    Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
-   Dismisses the alert
    Dismissing an interface
    PinLock screen \"cancel\" button
    Verb, cancel an alert dialog */
@@ -187,8 +190,8 @@
 /* Title on the PinLock screen asking to create a passcode */
 "Choose a 4 digit passcode" = "4桁のパスコードを選択してください";
 
-/* Sustainer Alert's Message */
-"Choose a plan and help unlock future features" = "プランを選択して将来の機能のロックを解除する";
+/* Code TextField Placeholder */
+"Code" = "ソースコード";
 
 /* Opens the Collaborate UI */
 "Collaborate" = "共同編集";
@@ -231,9 +234,18 @@
 /* Error for bad email or password */
 "Could not create an account with the provided email address and password." = "入力されたメールアドレスとパスワードではアカウントを作成できませんでした。";
 
+/* Note fetch error title */
+"Could not fetch Notes" = "メモを取得できませんでした";
+
+/* Tag fetch error title */
+"Could not fetch Tags" = "タグを取得できませんでした";
+
 /* Fetch error title */
 "Could not fetch entities" = "エンティティを取得できませんでした";
 
+/* note content fetch error title */
+"Could not fetch note content" = "メモの内容を取得できませんでした";
+
 /* Message displayed when login fails */
 "Could not login with the provided email address and password." = "入力されたメールアドレスとパスワードではログインできませんでした。";
 
@@ -360,6 +372,15 @@
 /* Number of objects enqueued for processing */
 "Enqueued" = "待機状態";
 
+/* LogIn Interface Title */
+"Enter Code" = "コードを入力";
+
+/* Enter Password fallback Action */
+"Enter password" = "パスワードを入力";
+
+/* Header for Login With Password. Please preserve the {{EMAIL}} substring */
+"Enter the password for the account {{EMAIL}}" = "アカウント {{EMAIL}} のパスワードを入力";
+
 /* Title on the PinLock screen asking to enter a passcode */
 "Enter your passcode" = "パスコードを入力してください";
 
@@ -386,7 +407,7 @@
 "Forgot password? »" = "パスワードをお忘れですか ? »";
 
 /* Password Reset Action */
-"Forgotten password?" = "パスワードを忘れましたか ?";
+"Forgot your password?" = "パスワードを忘れた場合";
 
 /* FAQ or contact us */
 "Get Help" = "ヘルプ";
@@ -412,6 +433,12 @@
 /* Rating view - initial - liked button */
 "I like it" = "満足している";
 
+/* Option to add notes to spotlight search */
+"Index Notes in Spotlight" = "スポットライトでメモをインデックス";
+
+/* Alert title letting user know their search index has been removed */
+"Index Removed" = "インデックスが削除されました";
+
 /* Note Information Button (metrics + references) */
 "Information" = "情報";
 
@@ -448,18 +475,27 @@
    LogIn Interface Title */
 "Log In" = "ログイン";
 
+/* LogIn Interface Title */
+"Log In with Password" = "パスワードでログイン";
+
 /* Log out of the active account in the app */
 "Log Out" = "ログアウト";
 
 /* Widget warning if user is logged out */
 "Log in to see your notes" = "ノートを見るにはログインしてください";
 
-/* Allows the user to SignIn using their WPCOM Account */
+/* Password fallback Action */
 "Log in with WordPress.com" = "WordPress.com アカウントでログイン";
 
-/* Presents the regular Email signin flow */
+/* Sends the User an email with an Authentication Code */
 "Log in with email" = "メールアドレスでログイン";
 
+/* Header for Enter Password UI, when the user performed too many requests */
+"Log in with email failed, please enter your password" = "メールアドレスでのログインに失敗しました。パスワードを入力してください";
+
+/* Message displayed when a login code is too short */
+"Login Code is too short" = "ログインコードが短すぎます";
+
 /* Month and day date formatter */
 "MMM d" = "M月d日";
 
@@ -490,9 +526,6 @@
 /* Sort Mode: Modified Date, ascending */
 "Modified: Oldest" = "更新日 :最も古い";
 
-/* Monthly Subscription Option (Used when / if the price fails to load) */
-"Monthly" = "毎月";
-
 /* Accessibility hint for trash selected notes button */
 "Move selected notes to trash" = "選択したメモをゴミ箱に移動";
 
@@ -579,6 +612,9 @@
    Email unverified alert dismiss */
 "Ok" = "OK";
 
+/* confirm button title */
+"Okay" = "OK";
+
 /* No comment provided by engineer. */
 "On" = "オン";
 
@@ -594,6 +630,9 @@
 /* Note Options Title */
 "Options" = "オプション";
 
+/* Or, used as a separator between Actions */
+"Or" = "OR";
+
 /* A 4-digit code to lock the app when it is closed */
 "Passcode" = "パスコード";
 
@@ -678,6 +717,9 @@
 /* Home screen quick action: Recent Note */
 "Recent" = "最近";
 
+/* Header to put on any files that need to be recovered */
+"Recovered Note Cotent - " = "復元されたメモの内容 - ";
+
 /* References section header on Info Card */
 "Referenced In" = "参照先";
 
@@ -715,9 +757,6 @@
    Restore a note to a previous version */
 "Restore Note" = "ノートを復元";
 
-/* Manually Restores IAP Purchases */
-"Restore Purchases" = "購入したものを復元";
-
 /* Title -> Review you account screen */
 "Review Your Account" = "アカウントの設定を確認";
 
@@ -800,8 +839,7 @@
    Title of main share extension view */
 "Simplenote" = "Simplenote";
 
-/* Restoration Successful Title
-   Sustainer Alert's Title */
+/* Restoration Successful Title */
 "Simplenote Sustainer" = "Simplenote Sustainer";
 
 /* Simplenote's Feedback Email Title */
@@ -810,7 +848,8 @@
 /* Message displayed when app is not configured */
 "Simplenote must be configured and logged in to setup widgets" = "ウィジェットを設定するには Simplenote を構成してログインする必要があります";
 
-/* Authentication Error Alert Title */
+/* Authentication Error Alert Title
+   Email TextField Placeholder */
 "Sorry!" = "申し訳ございません。";
 
 /* Option to sort tags alphabetically. The default is by manual ordering. */
@@ -823,14 +862,17 @@
 /* Sort By Title */
 "Sort by:" = "並び順 :";
 
+/* Details that some results may still appear in searches on device */
+"Spotlight history may still appear in search results, but notes have be unindexed" = "スポットライト履歴が検索結果に引き続き表示される可能性がありますが、メモのインデックスは解除されます";
+
 /* Title for the response's Status Code */
 "Status Code" = "ステータスコード";
 
 /* Become a Sustainer Details */
 "Support your favorite notes app to help unlock future features" = "お気に入りのメモアプリをサポートして将来の機能のロックを解除できるようにする";
 
-/* No comment provided by engineer. */
-"Sustainer" = "Sustainer";
+/* Switch app icon */
+"Sustainer App Icon" = "Sustainer アプリアイコン";
 
 /* Restoration Successful Message */
 "Sustainer subscription restored. Thank you for supporting Simplenote!" = "Sustainer サブスクリプションが復元されました。 Simplenote をサポートいただきありがとうございます。";
@@ -868,6 +910,12 @@
 /* Error when address is in use */
 "That email is already being used" = "そのメールアドレスはすでに使用されています";
 
+/* Email TextField Placeholder */
+"The authentication code you've requested has expired. Please request a new one" = "リクエストした認証コードの有効期限が切れています。 新しいコードをリクエストしてください";
+
+/* Error message for Invalid Login Code */
+"The code you've entered is not correct. Please try again" = "入力したコードが正しくありません。 もう一度お試しください";
+
 /* Error when address is in use */
 "The email you've entered is already associated with a Simplenote account." = "このメールアドレスは、すでに他の Simplenote アカウントで使用されています。";
 
@@ -980,6 +1028,9 @@
 /* Generic error */
 "We're having problems. Please try again soon." = "問題が発生しました。すぐにもう一度実行してください。";
 
+/* Header for the Login with Code UI. Please preserve the {{EMAIL}} string as is! */
+"We've sent a code to {{EMAIL}}. The code will be valid for a few minutes." = "コードを {{EMAIL}} に送信しました。 コードは数分間有効です。";
+
 /* WebSocket Status */
 "WebSocket" = "WebSocket";
 
@@ -993,12 +1044,12 @@
 /* Rating view initial title */
 "What do you think about Simplenote?" = "Simplenote アプリに満足していますか ?";
 
+/* Alerting users that we will attempt to restore lost content on next launch */
+"Will attempt to recover shortcut content on next launch" = "次回起動時に、ショートカットの内容の復元を試みます";
+
 /* Number of words in the note */
 "Words" = "単語";
 
-/* Yearly Subscription Option (Used when / if the price fails to load) */
-"Yearly" = "毎年";
-
 /* Proceeds with the Empty Trash OP */
 "Yes" = "はい";
 
@@ -1017,6 +1068,9 @@
 /* Restoration Successful Message */
 "You're already a Sustainer. Thank you for supporting Simplenote!" = "すでに Sustainer です。 Simplenote をサポートいただきありがとうございます。";
 
+/* Error message for Invalid Login Code */
+"Your authentication code has expired. Please request a new one" = "認証コードの有効期限が切れています。 新しいコードをリクエストしてください";
+
 /* Message displayed when email address is invalid */
 "Your email address is not valid" = "無効なメールアドレスです。";
 
diff --git a/Simplenote/ko.lproj/Localizable.strings b/Simplenote/ko.lproj/Localizable.strings
index cf95dbc73..3091b4cba 100644
--- a/Simplenote/ko.lproj/Localizable.strings
+++ b/Simplenote/ko.lproj/Localizable.strings
@@ -1,15 +1,9 @@
-/* Translation-Revision-Date: 2022-11-23 13:54:03+0000 */
+/* Translation-Revision-Date: 2024-08-07 09:54:03+0000 */
 /* Plural-Forms: nplurals=1; plural=0; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: ko_KR */
 
-/* Monthly Subscription Option. Please preserve the special marker! */
-"%@ per Month" = "월 %@";
-
-/* Yearly Subscription Option. Please preserve the special marker! */
-"%@ per Year" = "연 %@";
-
-/* Number of found search results */
+/* No comment provided by engineer. */
 "%d Result" = "결과 %d개";
 
 /* Number of found search results */
@@ -73,6 +67,7 @@
 "About" = "정보";
 
 /* Accept Action
+   Accept Message
    Label of accept button on alert dialog */
 "Accept" = "수락";
 
@@ -123,9 +118,18 @@
 /* Empty Trash Warning */
 "Are you sure you want to empty the trash? This cannot be undone." = "휴지통을 비우시겠습니까? 이 작업은 되돌릴 수 없습니다.";
 
+/* Data Fetch error message */
+"Attempt to fetch current note content failed.  Please try again later." = "현재 메모 내용 가져오기 시도가 실패했습니다.  나중에 다시 시도해 주세요.";
+
 /* Data Fetch error message */
 "Attempt to fetch entities failed.  Please try again later." = "엔터티 가져오기 시도가 실패했습니다.  나중에 다시 시도하세요.";
 
+/* Data Fetch error message */
+"Attempt to fetch notes failed.  Please try again later." = "메모 가져오기 시도가 실패했습니다.  나중에 다시 시도해 주세요.";
+
+/* Data Fetch error message */
+"Attempt to fetch tags failed.  Please try again later." = "태그 가져오기 시도가 실패했습니다.  나중에 다시 시도해 주세요.";
+
 /* User Authenticated */
 "Authenticated" = "인증됨";
 
@@ -151,7 +155,6 @@
    Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
-   Dismisses the alert
    Dismissing an interface
    PinLock screen \"cancel\" button
    Verb, cancel an alert dialog */
@@ -187,8 +190,8 @@
 /* Title on the PinLock screen asking to create a passcode */
 "Choose a 4 digit passcode" = "네 자리 패스코드 선택";
 
-/* Sustainer Alert's Message */
-"Choose a plan and help unlock future features" = "향후 기능 활용에 도움이 되도록 요금제 선택";
+/* Code TextField Placeholder */
+"Code" = "코드";
 
 /* Opens the Collaborate UI */
 "Collaborate" = "협업";
@@ -231,9 +234,18 @@
 /* Error for bad email or password */
 "Could not create an account with the provided email address and password." = "입력하신 이메일 주소와 비밀번호로 계정을 만들지 못했습니다.";
 
+/* Note fetch error title */
+"Could not fetch Notes" = "메모를 가져올 수 없음";
+
+/* Tag fetch error title */
+"Could not fetch Tags" = "태그를 가져올 수 없음";
+
 /* Fetch error title */
 "Could not fetch entities" = "엔터티를 가져올 수 없음";
 
+/* note content fetch error title */
+"Could not fetch note content" = "메모 내용을 가져올 수 없음";
+
 /* Message displayed when login fails */
 "Could not login with the provided email address and password." = "입력하신 이메일 주소와 비밀번호로 로그인하지 못했습니다.";
 
@@ -360,6 +372,15 @@
 /* Number of objects enqueued for processing */
 "Enqueued" = "활성화됨";
 
+/* LogIn Interface Title */
+"Enter Code" = "코드 입력";
+
+/* Enter Password fallback Action */
+"Enter password" = "비밀번호 입력";
+
+/* Header for Login With Password. Please preserve the {{EMAIL}} substring */
+"Enter the password for the account {{EMAIL}}" = "계정 {{EMAIL}}의 비밀번호를 입력하세요.";
+
 /* Title on the PinLock screen asking to enter a passcode */
 "Enter your passcode" = "패스코드 입력";
 
@@ -386,7 +407,7 @@
 "Forgot password? »" = "비밀번호를 잊으셨나요? »";
 
 /* Password Reset Action */
-"Forgotten password?" = "비밀번호를 잊으셨나요?";
+"Forgot your password?" = "비밀번호를 잊으셨나요?";
 
 /* FAQ or contact us */
 "Get Help" = "도움말";
@@ -412,6 +433,12 @@
 /* Rating view - initial - liked button */
 "I like it" = "좋아요";
 
+/* Option to add notes to spotlight search */
+"Index Notes in Spotlight" = "스포트라이트 메모 색인화";
+
+/* Alert title letting user know their search index has been removed */
+"Index Removed" = "색인 제거됨";
+
 /* Note Information Button (metrics + references) */
 "Information" = "정보";
 
@@ -448,18 +475,27 @@
    LogIn Interface Title */
 "Log In" = "로그인";
 
+/* LogIn Interface Title */
+"Log In with Password" = "비밀번호로 로그인";
+
 /* Log out of the active account in the app */
 "Log Out" = "로그아웃";
 
 /* Widget warning if user is logged out */
 "Log in to see your notes" = "로그인하여 메모 보기";
 
-/* Allows the user to SignIn using their WPCOM Account */
+/* Password fallback Action */
 "Log in with WordPress.com" = "워드프레스닷컴으로 로그인";
 
-/* Presents the regular Email signin flow */
+/* Sends the User an email with an Authentication Code */
 "Log in with email" = "이메일로 로그인";
 
+/* Header for Enter Password UI, when the user performed too many requests */
+"Log in with email failed, please enter your password" = "이메일로 로그인하지 못했습니다. 비밀번호를 입력해 주세요.";
+
+/* Message displayed when a login code is too short */
+"Login Code is too short" = "로그인 코드가 너무 짧습니다.";
+
 /* Month and day date formatter */
 "MMM d" = "MMM d";
 
@@ -490,9 +526,6 @@
 /* Sort Mode: Modified Date, ascending */
 "Modified: Oldest" = "수정됨: 오래된 항목";
 
-/* Monthly Subscription Option (Used when / if the price fails to load) */
-"Monthly" = "월간";
-
 /* Accessibility hint for trash selected notes button */
 "Move selected notes to trash" = "선택한 메모를 휴지통으로 이동";
 
@@ -579,6 +612,9 @@
    Email unverified alert dismiss */
 "Ok" = "확인";
 
+/* confirm button title */
+"Okay" = "확인";
+
 /* No comment provided by engineer. */
 "On" = "켬";
 
@@ -594,6 +630,9 @@
 /* Note Options Title */
 "Options" = "옵션";
 
+/* Or, used as a separator between Actions */
+"Or" = "또는";
+
 /* A 4-digit code to lock the app when it is closed */
 "Passcode" = "패스코드";
 
@@ -678,6 +717,9 @@
 /* Home screen quick action: Recent Note */
 "Recent" = "최근";
 
+/* Header to put on any files that need to be recovered */
+"Recovered Note Cotent - " = "복구된 메모 내용 - ";
+
 /* References section header on Info Card */
 "Referenced In" = "참조";
 
@@ -715,9 +757,6 @@
    Restore a note to a previous version */
 "Restore Note" = "메모 복구";
 
-/* Manually Restores IAP Purchases */
-"Restore Purchases" = "구매 항목 복원";
-
 /* Title -> Review you account screen */
 "Review Your Account" = "계정 검토";
 
@@ -800,8 +839,7 @@
    Title of main share extension view */
 "Simplenote" = "Simplenote";
 
-/* Restoration Successful Title
-   Sustainer Alert's Title */
+/* Restoration Successful Title */
 "Simplenote Sustainer" = "Simplenote 지지자";
 
 /* Simplenote's Feedback Email Title */
@@ -810,7 +848,8 @@
 /* Message displayed when app is not configured */
 "Simplenote must be configured and logged in to setup widgets" = "위젯을 설정하려면 Simplenote를 구성하고 로그인해야 함";
 
-/* Authentication Error Alert Title */
+/* Authentication Error Alert Title
+   Email TextField Placeholder */
 "Sorry!" = "죄송합니다!";
 
 /* Option to sort tags alphabetically. The default is by manual ordering. */
@@ -823,14 +862,17 @@
 /* Sort By Title */
 "Sort by:" = "정렬 기준:";
 
+/* Details that some results may still appear in searches on device */
+"Spotlight history may still appear in search results, but notes have be unindexed" = "스포트라이트 기록은 여전히 검색 결과에 표시될 수 있지만 메모는 색인화되지 않습니다.";
+
 /* Title for the response's Status Code */
 "Status Code" = "상태 코드";
 
 /* Become a Sustainer Details */
 "Support your favorite notes app to help unlock future features" = "향후 기능 활용에 도움이 되도록 즐겨 찾는 메모 앱 지원";
 
-/* No comment provided by engineer. */
-"Sustainer" = "지지자";
+/* Switch app icon */
+"Sustainer App Icon" = "지지자 앱 아이콘";
 
 /* Restoration Successful Message */
 "Sustainer subscription restored. Thank you for supporting Simplenote!" = "지지자 구독이 복원되었습니다. Simplenote을 지지해 주셔서 감사합니다!";
@@ -868,6 +910,12 @@
 /* Error when address is in use */
 "That email is already being used" = "해당 이메일 주소가 이미 사용되고 있습니다.";
 
+/* Email TextField Placeholder */
+"The authentication code you've requested has expired. Please request a new one" = "요청하신 인증 코드가 만료되었습니다. 새 인증 코드를 요청하세요.";
+
+/* Error message for Invalid Login Code */
+"The code you've entered is not correct. Please try again" = "입력한 코드가 올바르지 않습니다. 다시 시도해 주세요.";
+
 /* Error when address is in use */
 "The email you've entered is already associated with a Simplenote account." = "입력한 이메일이 이미 Simplenote 계정과 연결되어 있습니다.";
 
@@ -980,6 +1028,9 @@
 /* Generic error */
 "We're having problems. Please try again soon." = "문제가 있습니다. 나중에 다시 시도하세요.";
 
+/* Header for the Login with Code UI. Please preserve the {{EMAIL}} string as is! */
+"We've sent a code to {{EMAIL}}. The code will be valid for a few minutes." = "{{EMAIL}}(으)로 코드를 보냈습니다. 코드는 몇 분 동안 유효합니다.";
+
 /* WebSocket Status */
 "WebSocket" = "WebSocket";
 
@@ -993,12 +1044,12 @@
 /* Rating view initial title */
 "What do you think about Simplenote?" = "Simplenote를 어떻게 생각하시나요?";
 
+/* Alerting users that we will attempt to restore lost content on next launch */
+"Will attempt to recover shortcut content on next launch" = "다음 실행 시 단축키 내용의 복구를 시도합니다.";
+
 /* Number of words in the note */
 "Words" = "단어";
 
-/* Yearly Subscription Option (Used when / if the price fails to load) */
-"Yearly" = "연간";
-
 /* Proceeds with the Empty Trash OP */
 "Yes" = "예";
 
@@ -1017,6 +1068,9 @@
 /* Restoration Successful Message */
 "You're already a Sustainer. Thank you for supporting Simplenote!" = "회원님은 이미 지지자입니다. Simplenote을 지지해 주셔서 감사합니다!";
 
+/* Error message for Invalid Login Code */
+"Your authentication code has expired. Please request a new one" = "인증 코드가 만료되었습니다. 새 인증 코드를 요청하세요.";
+
 /* Message displayed when email address is invalid */
 "Your email address is not valid" = "이메일 주소가 올바르지 않습니다.";
 
diff --git a/Simplenote/nl.lproj/Localizable.strings b/Simplenote/nl.lproj/Localizable.strings
index 0bd2fe55e..0d7daf868 100644
--- a/Simplenote/nl.lproj/Localizable.strings
+++ b/Simplenote/nl.lproj/Localizable.strings
@@ -1,15 +1,9 @@
-/* Translation-Revision-Date: 2022-11-24 00:43:48+0000 */
+/* Translation-Revision-Date: 2024-08-08 11:54:03+0000 */
 /* Plural-Forms: nplurals=2; plural=n != 1; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: nl */
 
-/* Monthly Subscription Option. Please preserve the special marker! */
-"%@ per Month" = "%@ Per maand";
-
-/* Yearly Subscription Option. Please preserve the special marker! */
-"%@ per Year" = "%@ Per jaar";
-
-/* Number of found search results */
+/* No comment provided by engineer. */
 "%d Result" = "%d resultaat";
 
 /* Number of found search results */
@@ -73,6 +67,7 @@
 "About" = "Over";
 
 /* Accept Action
+   Accept Message
    Label of accept button on alert dialog */
 "Accept" = "Accepteren";
 
@@ -123,9 +118,18 @@
 /* Empty Trash Warning */
 "Are you sure you want to empty the trash? This cannot be undone." = "Weet je zeker dat je de prullenbak wilt leegmaken? Deze actie kan niet ongedaan worden gemaakt.";
 
+/* Data Fetch error message */
+"Attempt to fetch current note content failed.  Please try again later." = "Het is niet gelukt om de inhoud van de huidige notitie op te halen.  Probeer het later opnieuw.";
+
 /* Data Fetch error message */
 "Attempt to fetch entities failed.  Please try again later." = "Het is niet gelukt om entiteiten op te halen.  Probeer het later opnieuw.";
 
+/* Data Fetch error message */
+"Attempt to fetch notes failed.  Please try again later." = "Het is niet gelukt om notities op te halen.  Probeer het later opnieuw.";
+
+/* Data Fetch error message */
+"Attempt to fetch tags failed.  Please try again later." = "Het is niet gelukt om tags op te halen.  Probeer het later opnieuw.";
+
 /* User Authenticated */
 "Authenticated" = "Geverifieerd";
 
@@ -151,7 +155,6 @@
    Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
-   Dismisses the alert
    Dismissing an interface
    PinLock screen \"cancel\" button
    Verb, cancel an alert dialog */
@@ -187,8 +190,8 @@
 /* Title on the PinLock screen asking to create a passcode */
 "Choose a 4 digit passcode" = "Kies een viercijferige pincode";
 
-/* Sustainer Alert's Message */
-"Choose a plan and help unlock future features" = "Kies een abonnement en help mee toekomstige functies mogelijk te maken";
+/* Code TextField Placeholder */
+"Code" = "Code";
 
 /* Opens the Collaborate UI */
 "Collaborate" = "Samenwerken";
@@ -231,9 +234,18 @@
 /* Error for bad email or password */
 "Could not create an account with the provided email address and password." = "Kan geen account maken met het opgegeven e-mailadres en wachtwoord.";
 
+/* Note fetch error title */
+"Could not fetch Notes" = "Het is niet gelukt om notities op te halen";
+
+/* Tag fetch error title */
+"Could not fetch Tags" = "Het is niet gelukt om tags op te halen";
+
 /* Fetch error title */
 "Could not fetch entities" = "Het is niet gelukt om entiteiten op te halen";
 
+/* note content fetch error title */
+"Could not fetch note content" = "Het is niet gelukt om de notitie-inhoud op te halen";
+
 /* Message displayed when login fails */
 "Could not login with the provided email address and password." = "Kan niet inloggen met het opgegeven e-mailadres en wachtwoord.";
 
@@ -360,6 +372,15 @@
 /* Number of objects enqueued for processing */
 "Enqueued" = "Aantal in wachtrij";
 
+/* LogIn Interface Title */
+"Enter Code" = "Voer code in";
+
+/* Enter Password fallback Action */
+"Enter password" = "Voer wachtwoord in";
+
+/* Header for Login With Password. Please preserve the {{EMAIL}} substring */
+"Enter the password for the account {{EMAIL}}" = "Voer het wachtwoord van het account {{EMAIL}} in";
+
 /* Title on the PinLock screen asking to enter a passcode */
 "Enter your passcode" = "Voer je wachtwoordcode in";
 
@@ -386,7 +407,7 @@
 "Forgot password? »" = "Wachtwoord vergeten? »";
 
 /* Password Reset Action */
-"Forgotten password?" = "Wachtwoord vergeten?";
+"Forgot your password?" = "Wachtwoord vergeten?";
 
 /* FAQ or contact us */
 "Get Help" = "Ontvang hulp";
@@ -412,6 +433,12 @@
 /* Rating view - initial - liked button */
 "I like it" = "Ik vind het leuk";
 
+/* Option to add notes to spotlight search */
+"Index Notes in Spotlight" = "Notities indexeren in Spotlight";
+
+/* Alert title letting user know their search index has been removed */
+"Index Removed" = "Index verwijderd";
+
 /* Note Information Button (metrics + references) */
 "Information" = "Informatie";
 
@@ -448,18 +475,27 @@
    LogIn Interface Title */
 "Log In" = "Inloggen";
 
+/* LogIn Interface Title */
+"Log In with Password" = "Inloggen met wachtwoord";
+
 /* Log out of the active account in the app */
 "Log Out" = "Uitloggen";
 
 /* Widget warning if user is logged out */
 "Log in to see your notes" = "Log in om je notitites te bekijken";
 
-/* Allows the user to SignIn using their WPCOM Account */
+/* Password fallback Action */
 "Log in with WordPress.com" = "Inloggen met WordPress.com";
 
-/* Presents the regular Email signin flow */
+/* Sends the User an email with an Authentication Code */
 "Log in with email" = "Inloggen met e-mail";
 
+/* Header for Enter Password UI, when the user performed too many requests */
+"Log in with email failed, please enter your password" = "Inloggen met e-mail is mislukt, voer je wachtwoord in";
+
+/* Message displayed when a login code is too short */
+"Login Code is too short" = "Inlogcode is te kort";
+
 /* Month and day date formatter */
 "MMM d" = "d MMM";
 
@@ -490,9 +526,6 @@
 /* Sort Mode: Modified Date, ascending */
 "Modified: Oldest" = "Aangepast op: Oudste";
 
-/* Monthly Subscription Option (Used when / if the price fails to load) */
-"Monthly" = "Maandelijks";
-
 /* Accessibility hint for trash selected notes button */
 "Move selected notes to trash" = "Verplaats de geselecteerde notities naar de prullenbak";
 
@@ -579,6 +612,9 @@
    Email unverified alert dismiss */
 "Ok" = "Ok";
 
+/* confirm button title */
+"Okay" = "Oké";
+
 /* No comment provided by engineer. */
 "On" = "Aan";
 
@@ -594,6 +630,9 @@
 /* Note Options Title */
 "Options" = "Opties";
 
+/* Or, used as a separator between Actions */
+"Or" = "Of";
+
 /* A 4-digit code to lock the app when it is closed */
 "Passcode" = "Wachtwoordcode";
 
@@ -678,6 +717,9 @@
 /* Home screen quick action: Recent Note */
 "Recent" = "Recent";
 
+/* Header to put on any files that need to be recovered */
+"Recovered Note Cotent - " = "Inhoud herstelde notitie - ";
+
 /* References section header on Info Card */
 "Referenced In" = "Naar verwezen in";
 
@@ -715,9 +757,6 @@
    Restore a note to a previous version */
 "Restore Note" = "Notitie herstellen";
 
-/* Manually Restores IAP Purchases */
-"Restore Purchases" = "Herstel aankopen";
-
 /* Title -> Review you account screen */
 "Review Your Account" = "Controleer je account";
 
@@ -800,8 +839,7 @@
    Title of main share extension view */
 "Simplenote" = "Simplenote";
 
-/* Restoration Successful Title
-   Sustainer Alert's Title */
+/* Restoration Successful Title */
 "Simplenote Sustainer" = "Simplenote Sustainer";
 
 /* Simplenote's Feedback Email Title */
@@ -810,7 +848,8 @@
 /* Message displayed when app is not configured */
 "Simplenote must be configured and logged in to setup widgets" = "Simplenote moet worden geconfigureerd en ingelogd bij configuratiewidgets";
 
-/* Authentication Error Alert Title */
+/* Authentication Error Alert Title
+   Email TextField Placeholder */
 "Sorry!" = "Sorry!";
 
 /* Option to sort tags alphabetically. The default is by manual ordering. */
@@ -823,14 +862,17 @@
 /* Sort By Title */
 "Sort by:" = "Sorteren op:";
 
+/* Details that some results may still appear in searches on device */
+"Spotlight history may still appear in search results, but notes have be unindexed" = "Spotlight-geschiedenis kan nog steeds in zoekresultaten verschijnen, maar notities zijn niet meer geïndexeerd";
+
 /* Title for the response's Status Code */
 "Status Code" = "Statuscode";
 
 /* Become a Sustainer Details */
 "Support your favorite notes app to help unlock future features" = "Steun je favoriete notitie-app en help toekomstige functies mogelijk te maken";
 
-/* No comment provided by engineer. */
-"Sustainer" = "Sustainer";
+/* Switch app icon */
+"Sustainer App Icon" = "Sustainer-app-pictogram";
 
 /* Restoration Successful Message */
 "Sustainer subscription restored. Thank you for supporting Simplenote!" = "Sustainer-abonnement hersteld. Bedankt voor je steun aan Simplenote!";
@@ -868,6 +910,12 @@
 /* Error when address is in use */
 "That email is already being used" = "Dit e-mailadres is al in gebruik";
 
+/* Email TextField Placeholder */
+"The authentication code you've requested has expired. Please request a new one" = "De authenticatiecode die je aangevraagd hebt, is verlopen. Vraag een nieuwe aan";
+
+/* Error message for Invalid Login Code */
+"The code you've entered is not correct. Please try again" = "De code die je hebt ingevuld, is onjuist. Probeer het nog eens";
+
 /* Error when address is in use */
 "The email you've entered is already associated with a Simplenote account." = "Het e-mailadres dat je hebt ingevoerd, is al gekoppeld aan een Simplenote-account.";
 
@@ -980,6 +1028,9 @@
 /* Generic error */
 "We're having problems. Please try again soon." = "We ondervinden wat problemen. Probeer het later opnieuw.";
 
+/* Header for the Login with Code UI. Please preserve the {{EMAIL}} string as is! */
+"We've sent a code to {{EMAIL}}. The code will be valid for a few minutes." = "We hebben een code gestuurd naar {{EMAIL}}. De code is een paar minuten geldig.";
+
 /* WebSocket Status */
 "WebSocket" = "WebSocket";
 
@@ -993,12 +1044,12 @@
 /* Rating view initial title */
 "What do you think about Simplenote?" = "Wat vind je van Simplenote?";
 
+/* Alerting users that we will attempt to restore lost content on next launch */
+"Will attempt to recover shortcut content on next launch" = "Bij het opstarten wordt geprobeerd de shortcut-inhoud te herstellen";
+
 /* Number of words in the note */
 "Words" = "Woorden";
 
-/* Yearly Subscription Option (Used when / if the price fails to load) */
-"Yearly" = "Jaarlijks";
-
 /* Proceeds with the Empty Trash OP */
 "Yes" = "Ja";
 
@@ -1017,6 +1068,9 @@
 /* Restoration Successful Message */
 "You're already a Sustainer. Thank you for supporting Simplenote!" = "Je bent al een Sustainer. Bedankt voor je steun aan Simplenote!";
 
+/* Error message for Invalid Login Code */
+"Your authentication code has expired. Please request a new one" = "Je authenticatiecode is verlopen. Vraag een nieuwe aan";
+
 /* Message displayed when email address is invalid */
 "Your email address is not valid" = "Je e-mailadres is niet geldig.";
 
diff --git a/Simplenote/pt-BR.lproj/Localizable.strings b/Simplenote/pt-BR.lproj/Localizable.strings
index 853469454..93fbd01f9 100644
--- a/Simplenote/pt-BR.lproj/Localizable.strings
+++ b/Simplenote/pt-BR.lproj/Localizable.strings
@@ -1,15 +1,9 @@
-/* Translation-Revision-Date: 2022-11-23 09:54:03+0000 */
+/* Translation-Revision-Date: 2024-08-07 17:54:03+0000 */
 /* Plural-Forms: nplurals=2; plural=(n > 1); */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: pt_BR */
 
-/* Monthly Subscription Option. Please preserve the special marker! */
-"%@ per Month" = "%@ por mês";
-
-/* Yearly Subscription Option. Please preserve the special marker! */
-"%@ per Year" = "%@ por ano";
-
-/* Number of found search results */
+/* No comment provided by engineer. */
 "%d Result" = "%d resultado";
 
 /* Number of found search results */
@@ -73,6 +67,7 @@
 "About" = "Sobre";
 
 /* Accept Action
+   Accept Message
    Label of accept button on alert dialog */
 "Accept" = "Aceitar";
 
@@ -123,9 +118,18 @@
 /* Empty Trash Warning */
 "Are you sure you want to empty the trash? This cannot be undone." = "Tem certeza de que deseja esvaziar a lixeira? Essa ação não pode ser desfeita.";
 
+/* Data Fetch error message */
+"Attempt to fetch current note content failed.  Please try again later." = "Falha na tentativa de obter conteúdo da nota atual.  Tente novamente mais tarde.";
+
 /* Data Fetch error message */
 "Attempt to fetch entities failed.  Please try again later." = "Falha na tentativa de buscar entidades.  Tente novamente mais tarde.";
 
+/* Data Fetch error message */
+"Attempt to fetch notes failed.  Please try again later." = "Falha na tentativa de obter notas.  Tente novamente mais tarde.";
+
+/* Data Fetch error message */
+"Attempt to fetch tags failed.  Please try again later." = "Falha na tentativa de obter tags.  Tente novamente mais tarde.";
+
 /* User Authenticated */
 "Authenticated" = "Autenticado";
 
@@ -151,7 +155,6 @@
    Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
-   Dismisses the alert
    Dismissing an interface
    PinLock screen \"cancel\" button
    Verb, cancel an alert dialog */
@@ -187,8 +190,8 @@
 /* Title on the PinLock screen asking to create a passcode */
 "Choose a 4 digit passcode" = "Escolha uma senha de quatro dígitos";
 
-/* Sustainer Alert's Message */
-"Choose a plan and help unlock future features" = "Escolha um plano e ajude a garantir funcionalidades no futuro";
+/* Code TextField Placeholder */
+"Code" = "Código";
 
 /* Opens the Collaborate UI */
 "Collaborate" = "Colaborar";
@@ -231,9 +234,18 @@
 /* Error for bad email or password */
 "Could not create an account with the provided email address and password." = "Não foi possível criar uma conta com o endereço de email e senha fornecidos.";
 
+/* Note fetch error title */
+"Could not fetch Notes" = "Não foi possível obter notas";
+
+/* Tag fetch error title */
+"Could not fetch Tags" = "Não foi possível obter tags";
+
 /* Fetch error title */
 "Could not fetch entities" = "Não foi possível buscar entidades";
 
+/* note content fetch error title */
+"Could not fetch note content" = "Não foi possível obter conteúdo da nota";
+
 /* Message displayed when login fails */
 "Could not login with the provided email address and password." = "Não foi possível fazer login com o endereço de email e senha fornecidos.";
 
@@ -360,6 +372,15 @@
 /* Number of objects enqueued for processing */
 "Enqueued" = "Enfileirado";
 
+/* LogIn Interface Title */
+"Enter Code" = "Digite o código";
+
+/* Enter Password fallback Action */
+"Enter password" = "Digite a senha";
+
+/* Header for Login With Password. Please preserve the {{EMAIL}} substring */
+"Enter the password for the account {{EMAIL}}" = "Digite a senha da conta {{EMAIL}}";
+
 /* Title on the PinLock screen asking to enter a passcode */
 "Enter your passcode" = "Insira sua senha";
 
@@ -386,7 +407,7 @@
 "Forgot password? »" = "Esqueceu sua senha? »";
 
 /* Password Reset Action */
-"Forgotten password?" = "Esqueceu a senha?";
+"Forgot your password?" = "Esqueceu sua senha?";
 
 /* FAQ or contact us */
 "Get Help" = "Obter ajuda";
@@ -412,6 +433,12 @@
 /* Rating view - initial - liked button */
 "I like it" = "Curti";
 
+/* Option to add notes to spotlight search */
+"Index Notes in Spotlight" = "Notas do índice no Spotlight";
+
+/* Alert title letting user know their search index has been removed */
+"Index Removed" = "Índice removido";
+
 /* Note Information Button (metrics + references) */
 "Information" = "Informações";
 
@@ -448,18 +475,27 @@
    LogIn Interface Title */
 "Log In" = "Fazer login";
 
+/* LogIn Interface Title */
+"Log In with Password" = "Fazer login com senha";
+
 /* Log out of the active account in the app */
 "Log Out" = "Fazer logout";
 
 /* Widget warning if user is logged out */
 "Log in to see your notes" = "Faça login para ver suas anotações";
 
-/* Allows the user to SignIn using their WPCOM Account */
+/* Password fallback Action */
 "Log in with WordPress.com" = "Fazer login com o WordPress.com";
 
-/* Presents the regular Email signin flow */
+/* Sends the User an email with an Authentication Code */
 "Log in with email" = "Fazer login com o e-mail";
 
+/* Header for Enter Password UI, when the user performed too many requests */
+"Log in with email failed, please enter your password" = "Falha no login com o e-mail. Insira sua senha.";
+
+/* Message displayed when a login code is too short */
+"Login Code is too short" = "Código de login muito curto";
+
 /* Month and day date formatter */
 "MMM d" = "d MMM";
 
@@ -490,9 +526,6 @@
 /* Sort Mode: Modified Date, ascending */
 "Modified: Oldest" = "Modificado: mais antiga";
 
-/* Monthly Subscription Option (Used when / if the price fails to load) */
-"Monthly" = "Mensalmente";
-
 /* Accessibility hint for trash selected notes button */
 "Move selected notes to trash" = "Mova as anotações selecionadas para a lixeira";
 
@@ -579,6 +612,9 @@
    Email unverified alert dismiss */
 "Ok" = "Ok";
 
+/* confirm button title */
+"Okay" = "OK";
+
 /* No comment provided by engineer. */
 "On" = "Ativado";
 
@@ -594,6 +630,9 @@
 /* Note Options Title */
 "Options" = "Opções";
 
+/* Or, used as a separator between Actions */
+"Or" = "Ou";
+
 /* A 4-digit code to lock the app when it is closed */
 "Passcode" = "Senha";
 
@@ -678,6 +717,9 @@
 /* Home screen quick action: Recent Note */
 "Recent" = "Recente";
 
+/* Header to put on any files that need to be recovered */
+"Recovered Note Cotent - " = "Conteúdo da nota recuperado ";
+
 /* References section header on Info Card */
 "Referenced In" = "Mencionado em";
 
@@ -715,9 +757,6 @@
    Restore a note to a previous version */
 "Restore Note" = "Restaurar anotação";
 
-/* Manually Restores IAP Purchases */
-"Restore Purchases" = "Restaurar compras";
-
 /* Title -> Review you account screen */
 "Review Your Account" = "Revisar sua conta";
 
@@ -800,8 +839,7 @@
    Title of main share extension view */
 "Simplenote" = "Simplenote";
 
-/* Restoration Successful Title
-   Sustainer Alert's Title */
+/* Restoration Successful Title */
 "Simplenote Sustainer" = "Apoiador do Simplenote";
 
 /* Simplenote's Feedback Email Title */
@@ -810,7 +848,8 @@
 /* Message displayed when app is not configured */
 "Simplenote must be configured and logged in to setup widgets" = "Configure e faça login no Simplenote para configurar widgets";
 
-/* Authentication Error Alert Title */
+/* Authentication Error Alert Title
+   Email TextField Placeholder */
 "Sorry!" = "Desculpe!";
 
 /* Option to sort tags alphabetically. The default is by manual ordering. */
@@ -823,14 +862,17 @@
 /* Sort By Title */
 "Sort by:" = "Ordenar por:";
 
+/* Details that some results may still appear in searches on device */
+"Spotlight history may still appear in search results, but notes have be unindexed" = "O histórico do Spotlight ainda pode aparecer nos resultados da pesquisa, mas as notas foram removidas";
+
 /* Title for the response's Status Code */
 "Status Code" = "Código do status";
 
 /* Become a Sustainer Details */
 "Support your favorite notes app to help unlock future features" = "Apoie seu aplicativo de anotações favorito para ajudar a garantir funcionalidades no futuro";
 
-/* No comment provided by engineer. */
-"Sustainer" = "Apoiador";
+/* Switch app icon */
+"Sustainer App Icon" = "Ícone do aplicativo Sustainer";
 
 /* Restoration Successful Message */
 "Sustainer subscription restored. Thank you for supporting Simplenote!" = "Assinatura de apoiador restaurada. Agradecemos por apoiar o Simplenote!";
@@ -868,6 +910,12 @@
 /* Error when address is in use */
 "That email is already being used" = "Este e-mail já está em uso";
 
+/* Email TextField Placeholder */
+"The authentication code you've requested has expired. Please request a new one" = "O código de autenticação solicitado expirou. Solicite um novo.";
+
+/* Error message for Invalid Login Code */
+"The code you've entered is not correct. Please try again" = "O código inserido não está correto. Tente novamente";
+
 /* Error when address is in use */
 "The email you've entered is already associated with a Simplenote account." = "O e-mail informado já está associado a uma conta do Simplenote.";
 
@@ -980,6 +1028,9 @@
 /* Generic error */
 "We're having problems. Please try again soon." = "Estamos com problemas. Tente novamente mais tarde.";
 
+/* Header for the Login with Code UI. Please preserve the {{EMAIL}} string as is! */
+"We've sent a code to {{EMAIL}}. The code will be valid for a few minutes." = "Enviamos um código para {{EMAIL}}. O código será válido por alguns minutos.";
+
 /* WebSocket Status */
 "WebSocket" = "WebSocket";
 
@@ -993,12 +1044,12 @@
 /* Rating view initial title */
 "What do you think about Simplenote?" = "O que você acha do Simplenote?";
 
+/* Alerting users that we will attempt to restore lost content on next launch */
+"Will attempt to recover shortcut content on next launch" = "Tentará recuperar o conteúdo do atalho no próximo lançamento";
+
 /* Number of words in the note */
 "Words" = "Palavras";
 
-/* Yearly Subscription Option (Used when / if the price fails to load) */
-"Yearly" = "Anualmente";
-
 /* Proceeds with the Empty Trash OP */
 "Yes" = "Sim";
 
@@ -1017,6 +1068,9 @@
 /* Restoration Successful Message */
 "You're already a Sustainer. Thank you for supporting Simplenote!" = "Você já é um apoiador. Agradecemos por apoiar o Simplenote!";
 
+/* Error message for Invalid Login Code */
+"Your authentication code has expired. Please request a new one" = "Seu código de autenticação expirou. Solicite um novo.";
+
 /* Message displayed when email address is invalid */
 "Your email address is not valid" = "Seu endereço de email é inválido.";
 
diff --git a/Simplenote/ru.lproj/Localizable.strings b/Simplenote/ru.lproj/Localizable.strings
index 3e4d397f5..c659103fc 100644
--- a/Simplenote/ru.lproj/Localizable.strings
+++ b/Simplenote/ru.lproj/Localizable.strings
@@ -1,15 +1,9 @@
-/* Translation-Revision-Date: 2022-11-22 11:54:03+0000 */
+/* Translation-Revision-Date: 2024-08-06 19:54:04+0000 */
 /* Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2); */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: ru */
 
-/* Monthly Subscription Option. Please preserve the special marker! */
-"%@ per Month" = "%@ в месяц";
-
-/* Yearly Subscription Option. Please preserve the special marker! */
-"%@ per Year" = "%@ в год";
-
-/* Number of found search results */
+/* No comment provided by engineer. */
 "%d Result" = "%d Найдено";
 
 /* Number of found search results */
@@ -73,6 +67,7 @@
 "About" = "О нас";
 
 /* Accept Action
+   Accept Message
    Label of accept button on alert dialog */
 "Accept" = "Согласен";
 
@@ -123,9 +118,18 @@
 /* Empty Trash Warning */
 "Are you sure you want to empty the trash? This cannot be undone." = "Очистить корзину? Это действие нельзя отменить.";
 
+/* Data Fetch error message */
+"Attempt to fetch current note content failed.  Please try again later." = "Попытка получить содержимое текущей заметки завершилась неудачей.  Повторите попытку позже.";
+
 /* Data Fetch error message */
 "Attempt to fetch entities failed.  Please try again later." = "Сбой получения объектов.  Повторите попытку позже.";
 
+/* Data Fetch error message */
+"Attempt to fetch notes failed.  Please try again later." = "Попытка получить заметки завершилась неудачей.  Повторите попытку позже.";
+
+/* Data Fetch error message */
+"Attempt to fetch tags failed.  Please try again later." = "Попытка получить метки завершилась неудачей.  Повторите попытку позже.";
+
 /* User Authenticated */
 "Authenticated" = "Прошедший проверку";
 
@@ -151,7 +155,6 @@
    Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
-   Dismisses the alert
    Dismissing an interface
    PinLock screen \"cancel\" button
    Verb, cancel an alert dialog */
@@ -187,8 +190,8 @@
 /* Title on the PinLock screen asking to create a passcode */
 "Choose a 4 digit passcode" = "Введите 4-значный пароль";
 
-/* Sustainer Alert's Message */
-"Choose a plan and help unlock future features" = "Выберите план и сделайте вклад в разработку новых функций";
+/* Code TextField Placeholder */
+"Code" = "Код";
 
 /* Opens the Collaborate UI */
 "Collaborate" = "Партнер";
@@ -231,9 +234,18 @@
 /* Error for bad email or password */
 "Could not create an account with the provided email address and password." = "Невозможно создать учетную запись с указанными адресом email и паролем.";
 
+/* Note fetch error title */
+"Could not fetch Notes" = "Не удалось получить заметки";
+
+/* Tag fetch error title */
+"Could not fetch Tags" = "Не удалось получить метки";
+
 /* Fetch error title */
 "Could not fetch entities" = "Не удалось получить объекты";
 
+/* note content fetch error title */
+"Could not fetch note content" = "Не удалось получить содержимое заметки";
+
 /* Message displayed when login fails */
 "Could not login with the provided email address and password." = "Невозможно авторизоваться с указанными адресом email и паролем.";
 
@@ -360,6 +372,15 @@
 /* Number of objects enqueued for processing */
 "Enqueued" = "Требуется";
 
+/* LogIn Interface Title */
+"Enter Code" = "Введите код";
+
+/* Enter Password fallback Action */
+"Enter password" = "Введите пароль";
+
+/* Header for Login With Password. Please preserve the {{EMAIL}} substring */
+"Enter the password for the account {{EMAIL}}" = "Введите пароль для учётной записи {{EMAIL}}";
+
 /* Title on the PinLock screen asking to enter a passcode */
 "Enter your passcode" = "Введите ваш пароль";
 
@@ -386,7 +407,7 @@
 "Forgot password? »" = "Забыли пароль? »";
 
 /* Password Reset Action */
-"Forgotten password?" = "Забыли пароль?";
+"Forgot your password?" = "Забыли пароль?";
 
 /* FAQ or contact us */
 "Get Help" = "Справка";
@@ -412,6 +433,12 @@
 /* Rating view - initial - liked button */
 "I like it" = "Мне нравится";
 
+/* Option to add notes to spotlight search */
+"Index Notes in Spotlight" = "Индексировать заметки в Spotlight";
+
+/* Alert title letting user know their search index has been removed */
+"Index Removed" = "Индекс удалён";
+
 /* Note Information Button (metrics + references) */
 "Information" = "Информация";
 
@@ -448,18 +475,27 @@
    LogIn Interface Title */
 "Log In" = "Войти";
 
+/* LogIn Interface Title */
+"Log In with Password" = "Войти с помощью пароля";
+
 /* Log out of the active account in the app */
 "Log Out" = "Выйти";
 
 /* Widget warning if user is logged out */
 "Log in to see your notes" = "Войдите для просмотра заметок";
 
-/* Allows the user to SignIn using their WPCOM Account */
+/* Password fallback Action */
 "Log in with WordPress.com" = "Войти через WordPress.com";
 
-/* Presents the regular Email signin flow */
+/* Sends the User an email with an Authentication Code */
 "Log in with email" = "Войти с помощью эл. почты";
 
+/* Header for Enter Password UI, when the user performed too many requests */
+"Log in with email failed, please enter your password" = "Не удалось войти с адресом эл. почты. Введите пароль.";
+
+/* Message displayed when a login code is too short */
+"Login Code is too short" = "Слишком короткий код для входа в систему";
+
 /* Month and day date formatter */
 "MMM d" = "Д ммм";
 
@@ -490,9 +526,6 @@
 /* Sort Mode: Modified Date, ascending */
 "Modified: Oldest" = "Дата изменения: сначала старые";
 
-/* Monthly Subscription Option (Used when / if the price fails to load) */
-"Monthly" = "Ежемесячно";
-
 /* Accessibility hint for trash selected notes button */
 "Move selected notes to trash" = "Перемещение выбранных заметок в корзину";
 
@@ -579,6 +612,9 @@
    Email unverified alert dismiss */
 "Ok" = "OK";
 
+/* confirm button title */
+"Okay" = "ОК";
+
 /* No comment provided by engineer. */
 "On" = "Включить";
 
@@ -594,6 +630,9 @@
 /* Note Options Title */
 "Options" = "Опции";
 
+/* Or, used as a separator between Actions */
+"Or" = "или";
+
 /* A 4-digit code to lock the app when it is closed */
 "Passcode" = "Пароль";
 
@@ -678,6 +717,9 @@
 /* Home screen quick action: Recent Note */
 "Recent" = "Недавние";
 
+/* Header to put on any files that need to be recovered */
+"Recovered Note Cotent - " = "Восстановленный контент заметки — ";
+
 /* References section header on Info Card */
 "Referenced In" = "Упоминание в";
 
@@ -715,9 +757,6 @@
    Restore a note to a previous version */
 "Restore Note" = "Восстановить заметку";
 
-/* Manually Restores IAP Purchases */
-"Restore Purchases" = "Восстановить покупки";
-
 /* Title -> Review you account screen */
 "Review Your Account" = "Проверить учётную запись";
 
@@ -800,8 +839,7 @@
    Title of main share extension view */
 "Simplenote" = "Simplenote";
 
-/* Restoration Successful Title
-   Sustainer Alert's Title */
+/* Restoration Successful Title */
 "Simplenote Sustainer" = "Спонсор Simplenote";
 
 /* Simplenote's Feedback Email Title */
@@ -810,7 +848,8 @@
 /* Message displayed when app is not configured */
 "Simplenote must be configured and logged in to setup widgets" = "Для настройки виджетов необходимо настроить приложение Simplenote и войти в него";
 
-/* Authentication Error Alert Title */
+/* Authentication Error Alert Title
+   Email TextField Placeholder */
 "Sorry!" = "Извините!";
 
 /* Option to sort tags alphabetically. The default is by manual ordering. */
@@ -823,14 +862,17 @@
 /* Sort By Title */
 "Sort by:" = "Сортировать по:";
 
+/* Details that some results may still appear in searches on device */
+"Spotlight history may still appear in search results, but notes have be unindexed" = "История Spotlight может по-прежнему появляться в результатах поиска, однако заметки индексироваться не будут.";
+
 /* Title for the response's Status Code */
 "Status Code" = "Код статуса";
 
 /* Become a Sustainer Details */
 "Support your favorite notes app to help unlock future features" = "Поддержите любимое приложение для заметок и внесите вклад в разработку новых функций";
 
-/* No comment provided by engineer. */
-"Sustainer" = "Спонсор";
+/* Switch app icon */
+"Sustainer App Icon" = "Значок приложения Sustainer";
 
 /* Restoration Successful Message */
 "Sustainer subscription restored. Thank you for supporting Simplenote!" = "Спонсорская подписка восстановлена. Благодарим за поддержку Simplenote!";
@@ -868,6 +910,12 @@
 /* Error when address is in use */
 "That email is already being used" = "Этот адрес эл. почты уже используется";
 
+/* Email TextField Placeholder */
+"The authentication code you've requested has expired. Please request a new one" = "Срок действия запрошенного вами кода аутентификации истёк. Запросите новый код";
+
+/* Error message for Invalid Login Code */
+"The code you've entered is not correct. Please try again" = "Вы ввели неверный код. Повторите попытку";
+
 /* Error when address is in use */
 "The email you've entered is already associated with a Simplenote account." = "Указанный адрес эл. почты уже связан с учетной записью Simplenote.";
 
@@ -980,6 +1028,9 @@
 /* Generic error */
 "We're having problems. Please try again soon." = "Произошла ошибка. Повторите попытку позже.";
 
+/* Header for the Login with Code UI. Please preserve the {{EMAIL}} string as is! */
+"We've sent a code to {{EMAIL}}. The code will be valid for a few minutes." = "Код отправлен на адрес {{EMAIL}}. Код будет действителен в течение нескольких минут.";
+
 /* WebSocket Status */
 "WebSocket" = "WebSocket";
 
@@ -993,12 +1044,12 @@
 /* Rating view initial title */
 "What do you think about Simplenote?" = "Каково ваше мнение о Simplenote?";
 
+/* Alerting users that we will attempt to restore lost content on next launch */
+"Will attempt to recover shortcut content on next launch" = "Будет предпринята попытка восстановить контент ярлыка при следующем запуске";
+
 /* Number of words in the note */
 "Words" = "Слова";
 
-/* Yearly Subscription Option (Used when / if the price fails to load) */
-"Yearly" = "Ежегодно";
-
 /* Proceeds with the Empty Trash OP */
 "Yes" = "Да";
 
@@ -1017,6 +1068,9 @@
 /* Restoration Successful Message */
 "You're already a Sustainer. Thank you for supporting Simplenote!" = "Вы уже являетесь спонсором. Благодарим за поддержку Simplenote!";
 
+/* Error message for Invalid Login Code */
+"Your authentication code has expired. Please request a new one" = "Срок действия вашего кода аутентификации истёк. Запросите новый код";
+
 /* Message displayed when email address is invalid */
 "Your email address is not valid" = "Ваш адрес электронной почты не действителен.";
 
diff --git a/Simplenote/sv.lproj/Localizable.strings b/Simplenote/sv.lproj/Localizable.strings
index f0f3dc15c..c4566932d 100644
--- a/Simplenote/sv.lproj/Localizable.strings
+++ b/Simplenote/sv.lproj/Localizable.strings
@@ -1,15 +1,9 @@
-/* Translation-Revision-Date: 2022-11-22 13:54:03+0000 */
+/* Translation-Revision-Date: 2024-08-08 11:54:02+0000 */
 /* Plural-Forms: nplurals=2; plural=n != 1; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: sv_SE */
 
-/* Monthly Subscription Option. Please preserve the special marker! */
-"%@ per Month" = "%@ per månad";
-
-/* Yearly Subscription Option. Please preserve the special marker! */
-"%@ per Year" = "%@ per år";
-
-/* Number of found search results */
+/* No comment provided by engineer. */
 "%d Result" = "%d resultat";
 
 /* Number of found search results */
@@ -73,6 +67,7 @@
 "About" = "Om";
 
 /* Accept Action
+   Accept Message
    Label of accept button on alert dialog */
 "Accept" = "Acceptera";
 
@@ -123,9 +118,18 @@
 /* Empty Trash Warning */
 "Are you sure you want to empty the trash? This cannot be undone." = "Är du säker på att du vill tömma papperskorgen?  Detta kan inte göras ogjort.";
 
+/* Data Fetch error message */
+"Attempt to fetch current note content failed.  Please try again later." = "Försöket att hämta aktuellt anteckningsinnehåll misslyckades.  Försök igen senare.";
+
 /* Data Fetch error message */
 "Attempt to fetch entities failed.  Please try again later." = "Försöket att hämta enheter misslyckades.  Försök igen senare.";
 
+/* Data Fetch error message */
+"Attempt to fetch notes failed.  Please try again later." = "Försöket att hämta anteckningar misslyckades.  Försök igen senare.";
+
+/* Data Fetch error message */
+"Attempt to fetch tags failed.  Please try again later." = "Försök att hämta etiketter misslyckades. Försök igen senare.";
+
 /* User Authenticated */
 "Authenticated" = "Autentiserad";
 
@@ -151,14 +155,13 @@
    Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
-   Dismisses the alert
    Dismissing an interface
    PinLock screen \"cancel\" button
    Verb, cancel an alert dialog */
 "Cancel" = "Avbryt";
 
 /* Name of button to cancel iOS share extension in missing token alert */
-"Cancel Share" = "Avbryt Dela";
+"Cancel Share" = "Avbryt dela";
 
 /* Error message title. Review you account screen */
 "Cannot Confirm Account" = "Kan inte bekräfta konto";
@@ -187,8 +190,8 @@
 /* Title on the PinLock screen asking to create a passcode */
 "Choose a 4 digit passcode" = "Välj en fyrsiffrig låskod";
 
-/* Sustainer Alert's Message */
-"Choose a plan and help unlock future features" = "Välj ett paket och hjälp till att låsa upp framtida funktioner";
+/* Code TextField Placeholder */
+"Code" = "Kod";
 
 /* Opens the Collaborate UI */
 "Collaborate" = "Samarbeta";
@@ -231,9 +234,18 @@
 /* Error for bad email or password */
 "Could not create an account with the provided email address and password." = "Kunde inte skapa ett konto med den e-postadressen och det lösenordet.";
 
+/* Note fetch error title */
+"Could not fetch Notes" = "Det gick inte att hämta anteckningar";
+
+/* Tag fetch error title */
+"Could not fetch Tags" = "Kunde inte hämta etiketter";
+
 /* Fetch error title */
 "Could not fetch entities" = "Kunde inte hämta enheter";
 
+/* note content fetch error title */
+"Could not fetch note content" = "Det gick inte att hämta anteckningsinnehållet";
+
 /* Message displayed when login fails */
 "Could not login with the provided email address and password." = "Kunde inte logga in med den e-postadressen och det lösenordet.";
 
@@ -360,6 +372,15 @@
 /* Number of objects enqueued for processing */
 "Enqueued" = "I kö";
 
+/* LogIn Interface Title */
+"Enter Code" = "Ange kod";
+
+/* Enter Password fallback Action */
+"Enter password" = "Ange lösenord";
+
+/* Header for Login With Password. Please preserve the {{EMAIL}} substring */
+"Enter the password for the account {{EMAIL}}" = "Ange lösenordet för kontot {{EMAIL}}";
+
 /* Title on the PinLock screen asking to enter a passcode */
 "Enter your passcode" = "Ange lösenkod";
 
@@ -386,7 +407,7 @@
 "Forgot password? »" = "Glömt lösenord? »";
 
 /* Password Reset Action */
-"Forgotten password?" = "Glömt lösenordet?";
+"Forgot your password?" = "Glömt ditt lösenord?";
 
 /* FAQ or contact us */
 "Get Help" = "Skaffa hjälp";
@@ -412,6 +433,12 @@
 /* Rating view - initial - liked button */
 "I like it" = "Jag gillar den";
 
+/* Option to add notes to spotlight search */
+"Index Notes in Spotlight" = "Indexera anteckningar i Spotlight";
+
+/* Alert title letting user know their search index has been removed */
+"Index Removed" = "Index borttaget";
+
 /* Note Information Button (metrics + references) */
 "Information" = "Information";
 
@@ -448,18 +475,27 @@
    LogIn Interface Title */
 "Log In" = "Logga in";
 
+/* LogIn Interface Title */
+"Log In with Password" = "Logga in med lösenord";
+
 /* Log out of the active account in the app */
 "Log Out" = "Logga ut";
 
 /* Widget warning if user is logged out */
 "Log in to see your notes" = "Logga in för att se dina anteckningar";
 
-/* Allows the user to SignIn using their WPCOM Account */
+/* Password fallback Action */
 "Log in with WordPress.com" = "Logga in med WordPress.com";
 
-/* Presents the regular Email signin flow */
+/* Sends the User an email with an Authentication Code */
 "Log in with email" = "Logga in med e-post";
 
+/* Header for Enter Password UI, when the user performed too many requests */
+"Log in with email failed, please enter your password" = "Inloggning med e-post misslyckades, ange ditt lösenord";
+
+/* Message displayed when a login code is too short */
+"Login Code is too short" = "Inloggningskod är för kort";
+
 /* Month and day date formatter */
 "MMM d" = "d MMM";
 
@@ -490,9 +526,6 @@
 /* Sort Mode: Modified Date, ascending */
 "Modified: Oldest" = "Modifierad: Äldsta";
 
-/* Monthly Subscription Option (Used when / if the price fails to load) */
-"Monthly" = "Månadsvis";
-
 /* Accessibility hint for trash selected notes button */
 "Move selected notes to trash" = "Flytta markerade anteckningar till papperskorgen";
 
@@ -579,6 +612,9 @@
    Email unverified alert dismiss */
 "Ok" = "Okej";
 
+/* confirm button title */
+"Okay" = "Okey";
+
 /* No comment provided by engineer. */
 "On" = "På";
 
@@ -594,6 +630,9 @@
 /* Note Options Title */
 "Options" = "Alternativ";
 
+/* Or, used as a separator between Actions */
+"Or" = "Eller";
+
 /* A 4-digit code to lock the app when it is closed */
 "Passcode" = "Lösenkod";
 
@@ -678,6 +717,9 @@
 /* Home screen quick action: Recent Note */
 "Recent" = "Senaste";
 
+/* Header to put on any files that need to be recovered */
+"Recovered Note Cotent - " = "Återställt anteckningsinnehåll – ";
+
 /* References section header on Info Card */
 "Referenced In" = "Refereras i";
 
@@ -715,9 +757,6 @@
    Restore a note to a previous version */
 "Restore Note" = "Återställ anteckning";
 
-/* Manually Restores IAP Purchases */
-"Restore Purchases" = "Återställ köp";
-
 /* Title -> Review you account screen */
 "Review Your Account" = "Granska ditt konto";
 
@@ -800,8 +839,7 @@
    Title of main share extension view */
 "Simplenote" = "Simplenote";
 
-/* Restoration Successful Title
-   Sustainer Alert's Title */
+/* Restoration Successful Title */
 "Simplenote Sustainer" = "Simplenote Sustainer";
 
 /* Simplenote's Feedback Email Title */
@@ -810,7 +848,8 @@
 /* Message displayed when app is not configured */
 "Simplenote must be configured and logged in to setup widgets" = "Du måste konfigurera Simplenote och logga in för att konfigurera widgetar";
 
-/* Authentication Error Alert Title */
+/* Authentication Error Alert Title
+   Email TextField Placeholder */
 "Sorry!" = "Tyvärr!";
 
 /* Option to sort tags alphabetically. The default is by manual ordering. */
@@ -823,14 +862,17 @@
 /* Sort By Title */
 "Sort by:" = "Sortera efter:";
 
+/* Details that some results may still appear in searches on device */
+"Spotlight history may still appear in search results, but notes have be unindexed" = "Spotlight-historik kan fortfarande visas i sökresultaten, men anteckningar är inte längre indexerade";
+
 /* Title for the response's Status Code */
 "Status Code" = "Statuskod";
 
 /* Become a Sustainer Details */
 "Support your favorite notes app to help unlock future features" = "Stöd din favoritanteckningsapp och hjälp till att låsa upp framtida funktioner";
 
-/* No comment provided by engineer. */
-"Sustainer" = "Sustainer";
+/* Switch app icon */
+"Sustainer App Icon" = "Sustainer-appikon";
 
 /* Restoration Successful Message */
 "Sustainer subscription restored. Thank you for supporting Simplenote!" = "Sustainer-prenumeration återställd. Tack för att du stödjer Simplenote.";
@@ -868,6 +910,12 @@
 /* Error when address is in use */
 "That email is already being used" = "Den e-posten används redan";
 
+/* Email TextField Placeholder */
+"The authentication code you've requested has expired. Please request a new one" = "Autentiseringskoden du har begärt har löpt ut. Begär en ny";
+
+/* Error message for Invalid Login Code */
+"The code you've entered is not correct. Please try again" = "Koden du har angett är inte korrekt. Försök igen";
+
 /* Error when address is in use */
 "The email you've entered is already associated with a Simplenote account." = "Den angivna e-postadressen är redan associerad med ett Simplenote-konto.";
 
@@ -980,6 +1028,9 @@
 /* Generic error */
 "We're having problems. Please try again soon." = "Vi har problem. Försök igen om en stund.";
 
+/* Header for the Login with Code UI. Please preserve the {{EMAIL}} string as is! */
+"We've sent a code to {{EMAIL}}. The code will be valid for a few minutes." = "Vi har skickat en kod till {{EMAIL}}. Koden kommer vara giltig i några minuter.";
+
 /* WebSocket Status */
 "WebSocket" = "WebSocket";
 
@@ -993,12 +1044,12 @@
 /* Rating view initial title */
 "What do you think about Simplenote?" = "Vad tycker du om Simplenote?";
 
+/* Alerting users that we will attempt to restore lost content on next launch */
+"Will attempt to recover shortcut content on next launch" = "Kommer att försöka återställa genvägsinnehållet vid nästa start";
+
 /* Number of words in the note */
 "Words" = "ord";
 
-/* Yearly Subscription Option (Used when / if the price fails to load) */
-"Yearly" = "Årligen";
-
 /* Proceeds with the Empty Trash OP */
 "Yes" = "Ja";
 
@@ -1017,6 +1068,9 @@
 /* Restoration Successful Message */
 "You're already a Sustainer. Thank you for supporting Simplenote!" = "Du är redan en Sustainer. Tack för att du stödjer Simplenote.";
 
+/* Error message for Invalid Login Code */
+"Your authentication code has expired. Please request a new one" = "Din autentiseringskod har löpt ut. Begär en ny";
+
 /* Message displayed when email address is invalid */
 "Your email address is not valid" = "Din e-postadress är inte giltig";
 
diff --git a/Simplenote/tr.lproj/Localizable.strings b/Simplenote/tr.lproj/Localizable.strings
index 3cd294523..e1aca6f25 100644
--- a/Simplenote/tr.lproj/Localizable.strings
+++ b/Simplenote/tr.lproj/Localizable.strings
@@ -1,15 +1,9 @@
-/* Translation-Revision-Date: 2022-11-22 15:54:03+0000 */
+/* Translation-Revision-Date: 2024-08-07 15:54:03+0000 */
 /* Plural-Forms: nplurals=2; plural=(n > 1); */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: tr */
 
-/* Monthly Subscription Option. Please preserve the special marker! */
-"%@ per Month" = "Aylık %@";
-
-/* Yearly Subscription Option. Please preserve the special marker! */
-"%@ per Year" = "Yıllık %@";
-
-/* Number of found search results */
+/* No comment provided by engineer. */
 "%d Result" = "%d Sonuç";
 
 /* Number of found search results */
@@ -73,6 +67,7 @@
 "About" = "Hakkında";
 
 /* Accept Action
+   Accept Message
    Label of accept button on alert dialog */
 "Accept" = "Kabul";
 
@@ -123,9 +118,18 @@
 /* Empty Trash Warning */
 "Are you sure you want to empty the trash? This cannot be undone." = "Çöp kutusunu boşaltmak istediğinizden emin misiniz? Bu işlem geri alınamaz.";
 
+/* Data Fetch error message */
+"Attempt to fetch current note content failed.  Please try again later." = "Mevcut not içeriğini getirme denemesi başarısız oldu.  Lütfen daha sonra tekrar deneyin.";
+
 /* Data Fetch error message */
 "Attempt to fetch entities failed.  Please try again later." = "Varlıkları getirme işlemi başarısız oldu.  Lütfen daha sonra tekrar deneyin.";
 
+/* Data Fetch error message */
+"Attempt to fetch notes failed.  Please try again later." = "Notları getirme denemesi başarısız oldu.  Lütfen daha sonra tekrar deneyin.";
+
+/* Data Fetch error message */
+"Attempt to fetch tags failed.  Please try again later." = "Etiketleri alma denemesi başarısız oldu.  Lütfen daha sonra tekrar deneyin.";
+
 /* User Authenticated */
 "Authenticated" = "Kimliği Doğrulandı";
 
@@ -151,7 +155,6 @@
    Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
-   Dismisses the alert
    Dismissing an interface
    PinLock screen \"cancel\" button
    Verb, cancel an alert dialog */
@@ -187,8 +190,8 @@
 /* Title on the PinLock screen asking to create a passcode */
 "Choose a 4 digit passcode" = "4 basamaklı bir parola seçin";
 
-/* Sustainer Alert's Message */
-"Choose a plan and help unlock future features" = "Bir paket seçerek gelecekte yeni özelliklerin sunulmasına yardımcı olun";
+/* Code TextField Placeholder */
+"Code" = "Kod";
 
 /* Opens the Collaborate UI */
 "Collaborate" = "İşbirliği Yap";
@@ -231,9 +234,18 @@
 /* Error for bad email or password */
 "Could not create an account with the provided email address and password." = "Verilen e-posta adresi ve parolayla hesap oluşturulamadı.";
 
+/* Note fetch error title */
+"Could not fetch Notes" = "Notlar getirilemedi";
+
+/* Tag fetch error title */
+"Could not fetch Tags" = "Etiketler getirilemedi";
+
 /* Fetch error title */
 "Could not fetch entities" = "Varlıklar getirilemedi";
 
+/* note content fetch error title */
+"Could not fetch note content" = "Not içeriği getirilemedi";
+
 /* Message displayed when login fails */
 "Could not login with the provided email address and password." = "Verilen e-posta adresi ve parolayla oturum açılamadı.";
 
@@ -360,6 +372,15 @@
 /* Number of objects enqueued for processing */
 "Enqueued" = "Sıraya Alındı";
 
+/* LogIn Interface Title */
+"Enter Code" = "Kod Girin";
+
+/* Enter Password fallback Action */
+"Enter password" = "Şifre girin";
+
+/* Header for Login With Password. Please preserve the {{EMAIL}} substring */
+"Enter the password for the account {{EMAIL}}" = "{{EMAIL}} hesabınızın şifresini girin";
+
 /* Title on the PinLock screen asking to enter a passcode */
 "Enter your passcode" = "Parolanızı girin";
 
@@ -386,7 +407,7 @@
 "Forgot password? »" = "Şifrenizi mi unuttunuz? »";
 
 /* Password Reset Action */
-"Forgotten password?" = "Parolayı mı unuttunuz?";
+"Forgot your password?" = "Şifrenizi mi unuttunuz?";
 
 /* FAQ or contact us */
 "Get Help" = "Yardım Alın";
@@ -412,6 +433,12 @@
 /* Rating view - initial - liked button */
 "I like it" = "Beğendim";
 
+/* Option to add notes to spotlight search */
+"Index Notes in Spotlight" = "Öne Çıkanlarda Notları Dizine Ekleyin";
+
+/* Alert title letting user know their search index has been removed */
+"Index Removed" = "Dizin Kaldırıldı";
+
 /* Note Information Button (metrics + references) */
 "Information" = "Bilgi";
 
@@ -448,18 +475,27 @@
    LogIn Interface Title */
 "Log In" = "Giriş yap";
 
+/* LogIn Interface Title */
+"Log In with Password" = "Şifre ile Oturum Açın";
+
 /* Log out of the active account in the app */
 "Log Out" = "Çıkış yap";
 
 /* Widget warning if user is logged out */
 "Log in to see your notes" = "Notlarınızı görmek için giriş yapın";
 
-/* Allows the user to SignIn using their WPCOM Account */
+/* Password fallback Action */
 "Log in with WordPress.com" = "WordPress.com ile oturum aç";
 
-/* Presents the regular Email signin flow */
+/* Sends the User an email with an Authentication Code */
 "Log in with email" = "E-postayla oturum aç";
 
+/* Header for Enter Password UI, when the user performed too many requests */
+"Log in with email failed, please enter your password" = "E-postayla oturum açma başarısız oldu, lütfen şifrenizi girin";
+
+/* Message displayed when a login code is too short */
+"Login Code is too short" = "Oturum Açma Kodu çok kısa";
+
 /* Month and day date formatter */
 "MMM d" = "AAA g";
 
@@ -490,9 +526,6 @@
 /* Sort Mode: Modified Date, ascending */
 "Modified: Oldest" = "Değiştirme Tarihi: Eski";
 
-/* Monthly Subscription Option (Used when / if the price fails to load) */
-"Monthly" = "Aylık";
-
 /* Accessibility hint for trash selected notes button */
 "Move selected notes to trash" = "Seçili notları çöp kutusuna taşı";
 
@@ -579,6 +612,9 @@
    Email unverified alert dismiss */
 "Ok" = "Tamam";
 
+/* confirm button title */
+"Okay" = "Tamam";
+
 /* No comment provided by engineer. */
 "On" = "Açık";
 
@@ -594,6 +630,9 @@
 /* Note Options Title */
 "Options" = "Seçenekler";
 
+/* Or, used as a separator between Actions */
+"Or" = "Veya";
+
 /* A 4-digit code to lock the app when it is closed */
 "Passcode" = "Geçiş kodu";
 
@@ -678,6 +717,9 @@
 /* Home screen quick action: Recent Note */
 "Recent" = "Son";
 
+/* Header to put on any files that need to be recovered */
+"Recovered Note Cotent - " = "Kurtarılan Not İçeriği - ";
+
 /* References section header on Info Card */
 "Referenced In" = "Referans Verildiği Yer";
 
@@ -715,9 +757,6 @@
    Restore a note to a previous version */
 "Restore Note" = "Notu Geri Yükle";
 
-/* Manually Restores IAP Purchases */
-"Restore Purchases" = "Satın Alınanları Geri Yükle";
-
 /* Title -> Review you account screen */
 "Review Your Account" = "Hesabınızı İnceleyin";
 
@@ -800,8 +839,7 @@
    Title of main share extension view */
 "Simplenote" = "Simplenote";
 
-/* Restoration Successful Title
-   Sustainer Alert's Title */
+/* Restoration Successful Title */
 "Simplenote Sustainer" = "Simplenote Sustainer";
 
 /* Simplenote's Feedback Email Title */
@@ -810,7 +848,8 @@
 /* Message displayed when app is not configured */
 "Simplenote must be configured and logged in to setup widgets" = "Bileşenleri ayarlamak için Simplenote yapılandırılmalı ve oturum açılmalıdır";
 
-/* Authentication Error Alert Title */
+/* Authentication Error Alert Title
+   Email TextField Placeholder */
 "Sorry!" = "Üzgünüz!";
 
 /* Option to sort tags alphabetically. The default is by manual ordering. */
@@ -823,14 +862,17 @@
 /* Sort By Title */
 "Sort by:" = "Sıralama ölçütü:";
 
+/* Details that some results may still appear in searches on device */
+"Spotlight history may still appear in search results, but notes have be unindexed" = "Öne çıkanlar geçmişi arama sonuçlarında gösterilmeye devam edebilir ancak notlar dizine eklenmez";
+
 /* Title for the response's Status Code */
 "Status Code" = "Durum Kodu";
 
 /* Become a Sustainer Details */
 "Support your favorite notes app to help unlock future features" = "Gelecekte yeni özelliklerin sunulmasına yardımcı olmak için favori notlar uygulamanızı destekleyin";
 
-/* No comment provided by engineer. */
-"Sustainer" = "Sustainer";
+/* Switch app icon */
+"Sustainer App Icon" = "Sustainer Uygulaması Simgesi";
 
 /* Restoration Successful Message */
 "Sustainer subscription restored. Thank you for supporting Simplenote!" = "Sustainer aboneliği geri yüklendi. Simplenote'u desteklediğiniz için teşekkür ederiz!";
@@ -868,6 +910,12 @@
 /* Error when address is in use */
 "That email is already being used" = "Bu e-posta zaten kullanılıyor";
 
+/* Email TextField Placeholder */
+"The authentication code you've requested has expired. Please request a new one" = "Talep ettiğiniz doğrulama kodunun geçerlilik süresi doldu. Lütfen yeni bir kod talep edin";
+
+/* Error message for Invalid Login Code */
+"The code you've entered is not correct. Please try again" = "Girdiğiniz kod geçersiz. Lütfen tekrar deneyin";
+
 /* Error when address is in use */
 "The email you've entered is already associated with a Simplenote account." = "Girdiğiniz e-posta adresi zaten bir Simplenote hesabıyla ilişkilendirilmiş.";
 
@@ -980,6 +1028,9 @@
 /* Generic error */
 "We're having problems. Please try again soon." = "Sorun yaşanıyor. Lütfen kısa bir süre sonra tekrar deneyin.";
 
+/* Header for the Login with Code UI. Please preserve the {{EMAIL}} string as is! */
+"We've sent a code to {{EMAIL}}. The code will be valid for a few minutes." = "Şuraya bir kod gönderildi: {{EMAIL}}. Kod birkaç dakikalığına geçerli olacak.";
+
 /* WebSocket Status */
 "WebSocket" = "WebSocket";
 
@@ -993,12 +1044,12 @@
 /* Rating view initial title */
 "What do you think about Simplenote?" = "Simplenote hakkında ne düşünüyorsunuz?";
 
+/* Alerting users that we will attempt to restore lost content on next launch */
+"Will attempt to recover shortcut content on next launch" = "Sonraki kullanıma sunmada kısayol içeriği kurtarılmaya çalışılacak";
+
 /* Number of words in the note */
 "Words" = "Sözcük";
 
-/* Yearly Subscription Option (Used when / if the price fails to load) */
-"Yearly" = "Yıllık";
-
 /* Proceeds with the Empty Trash OP */
 "Yes" = "Evet";
 
@@ -1017,6 +1068,9 @@
 /* Restoration Successful Message */
 "You're already a Sustainer. Thank you for supporting Simplenote!" = "Zaten bir Sustainer'sınız. Simplenote'u desteklediğiniz için teşekkür ederiz!";
 
+/* Error message for Invalid Login Code */
+"Your authentication code has expired. Please request a new one" = "Doğrulama kodunuzun geçerlilik süresi doldu. Lütfen yeni bir kod talep edin";
+
 /* Message displayed when email address is invalid */
 "Your email address is not valid" = "E-posta adresiniz geçerli değil.";
 
diff --git a/Simplenote/zh-Hans-CN.lproj/Localizable.strings b/Simplenote/zh-Hans-CN.lproj/Localizable.strings
index 853e9c036..ec5a87734 100644
--- a/Simplenote/zh-Hans-CN.lproj/Localizable.strings
+++ b/Simplenote/zh-Hans-CN.lproj/Localizable.strings
@@ -1,15 +1,9 @@
-/* Translation-Revision-Date: 2022-11-22 09:54:03+0000 */
+/* Translation-Revision-Date: 2024-08-06 11:54:03+0000 */
 /* Plural-Forms: nplurals=1; plural=0; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: zh_CN */
 
-/* Monthly Subscription Option. Please preserve the special marker! */
-"%@ per Month" = "每月 %@";
-
-/* Yearly Subscription Option. Please preserve the special marker! */
-"%@ per Year" = "每年 %@";
-
-/* Number of found search results */
+/* No comment provided by engineer. */
 "%d Result" = "%d 个结果";
 
 /* Number of found search results */
@@ -73,6 +67,7 @@
 "About" = "关于";
 
 /* Accept Action
+   Accept Message
    Label of accept button on alert dialog */
 "Accept" = "接受";
 
@@ -123,9 +118,18 @@
 /* Empty Trash Warning */
 "Are you sure you want to empty the trash? This cannot be undone." = "是否确定要清空回收站？此操作无法撤消。";
 
+/* Data Fetch error message */
+"Attempt to fetch current note content failed.  Please try again later." = "尝试获取当前注释内容失败。  请稍后重试。";
+
 /* Data Fetch error message */
 "Attempt to fetch entities failed.  Please try again later." = "尝试获取实体失败。  请稍后重试。";
 
+/* Data Fetch error message */
+"Attempt to fetch notes failed.  Please try again later." = "尝试获取注释失败。  请稍后重试。";
+
+/* Data Fetch error message */
+"Attempt to fetch tags failed.  Please try again later." = "尝试获取标签失败。  请稍后重试。";
+
 /* User Authenticated */
 "Authenticated" = "已验证";
 
@@ -151,7 +155,6 @@
    Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
-   Dismisses the alert
    Dismissing an interface
    PinLock screen \"cancel\" button
    Verb, cancel an alert dialog */
@@ -187,8 +190,8 @@
 /* Title on the PinLock screen asking to create a passcode */
 "Choose a 4 digit passcode" = "选择一个 4 位数密码";
 
-/* Sustainer Alert's Message */
-"Choose a plan and help unlock future features" = "选择套餐，帮助该产品在未来提供更多功能";
+/* Code TextField Placeholder */
+"Code" = "代码";
 
 /* Opens the Collaborate UI */
 "Collaborate" = "协作";
@@ -231,9 +234,18 @@
 /* Error for bad email or password */
 "Could not create an account with the provided email address and password." = "无法使用所提供的电子邮件地址和密码创建帐户。";
 
+/* Note fetch error title */
+"Could not fetch Notes" = "无法获取注释";
+
+/* Tag fetch error title */
+"Could not fetch Tags" = "无法获取标签";
+
 /* Fetch error title */
 "Could not fetch entities" = "无法获取实体";
 
+/* note content fetch error title */
+"Could not fetch note content" = "无法获取注释内容";
+
 /* Message displayed when login fails */
 "Could not login with the provided email address and password." = "无法使用所提供的电子邮件地址和密码登录。";
 
@@ -360,6 +372,15 @@
 /* Number of objects enqueued for processing */
 "Enqueued" = "已排入队列数";
 
+/* LogIn Interface Title */
+"Enter Code" = "输入代码";
+
+/* Enter Password fallback Action */
+"Enter password" = "输入密码";
+
+/* Header for Login With Password. Please preserve the {{EMAIL}} substring */
+"Enter the password for the account {{EMAIL}}" = "输入账户 {{EMAIL}} 的密码";
+
 /* Title on the PinLock screen asking to enter a passcode */
 "Enter your passcode" = "输入您的密码";
 
@@ -386,7 +407,7 @@
 "Forgot password? »" = "忘记密码？»";
 
 /* Password Reset Action */
-"Forgotten password?" = "忘记密码？";
+"Forgot your password?" = "忘记密码？";
 
 /* FAQ or contact us */
 "Get Help" = "获取帮助";
@@ -412,6 +433,12 @@
 /* Rating view - initial - liked button */
 "I like it" = "我喜欢";
 
+/* Option to add notes to spotlight search */
+"Index Notes in Spotlight" = "Spotlight 中的索引注释";
+
+/* Alert title letting user know their search index has been removed */
+"Index Removed" = "索引已删除";
+
 /* Note Information Button (metrics + references) */
 "Information" = "信息";
 
@@ -448,18 +475,27 @@
    LogIn Interface Title */
 "Log In" = "登录";
 
+/* LogIn Interface Title */
+"Log In with Password" = "使用密码登录";
+
 /* Log out of the active account in the app */
 "Log Out" = "注销";
 
 /* Widget warning if user is logged out */
 "Log in to see your notes" = "登录以查看您的笔记";
 
-/* Allows the user to SignIn using their WPCOM Account */
+/* Password fallback Action */
 "Log in with WordPress.com" = "使用 WordPress.com 帐户登录";
 
-/* Presents the regular Email signin flow */
+/* Sends the User an email with an Authentication Code */
 "Log in with email" = "使用电子邮件登录";
 
+/* Header for Enter Password UI, when the user performed too many requests */
+"Log in with email failed, please enter your password" = "使用电子邮箱登录失败，请输入您的密码";
+
+/* Message displayed when a login code is too short */
+"Login Code is too short" = "登录代码过短";
+
 /* Month and day date formatter */
 "MMM d" = "MMM d";
 
@@ -490,9 +526,6 @@
 /* Sort Mode: Modified Date, ascending */
 "Modified: Oldest" = "修改时间：最旧";
 
-/* Monthly Subscription Option (Used when / if the price fails to load) */
-"Monthly" = "每月";
-
 /* Accessibility hint for trash selected notes button */
 "Move selected notes to trash" = "将选中的笔记放入回收站";
 
@@ -579,6 +612,9 @@
    Email unverified alert dismiss */
 "Ok" = "确定";
 
+/* confirm button title */
+"Okay" = "好的";
+
 /* No comment provided by engineer. */
 "On" = "打开";
 
@@ -594,6 +630,9 @@
 /* Note Options Title */
 "Options" = "选项";
 
+/* Or, used as a separator between Actions */
+"Or" = "或";
+
 /* A 4-digit code to lock the app when it is closed */
 "Passcode" = "密码";
 
@@ -678,6 +717,9 @@
 /* Home screen quick action: Recent Note */
 "Recent" = "最近";
 
+/* Header to put on any files that need to be recovered */
+"Recovered Note Cotent - " = "已恢复注释内容 — ";
+
 /* References section header on Info Card */
 "Referenced In" = "引用于";
 
@@ -715,9 +757,6 @@
    Restore a note to a previous version */
 "Restore Note" = "恢复笔记";
 
-/* Manually Restores IAP Purchases */
-"Restore Purchases" = "恢复购买";
-
 /* Title -> Review you account screen */
 "Review Your Account" = "检查您的帐户";
 
@@ -800,8 +839,7 @@
    Title of main share extension view */
 "Simplenote" = "Simplenote";
 
-/* Restoration Successful Title
-   Sustainer Alert's Title */
+/* Restoration Successful Title */
 "Simplenote Sustainer" = "Simplenote 支持者";
 
 /* Simplenote's Feedback Email Title */
@@ -810,7 +848,8 @@
 /* Message displayed when app is not configured */
 "Simplenote must be configured and logged in to setup widgets" = "必须配置 Simplenote 并登录以设置小组件";
 
-/* Authentication Error Alert Title */
+/* Authentication Error Alert Title
+   Email TextField Placeholder */
 "Sorry!" = "抱歉！";
 
 /* Option to sort tags alphabetically. The default is by manual ordering. */
@@ -823,14 +862,17 @@
 /* Sort By Title */
 "Sort by:" = "排序方式：";
 
+/* Details that some results may still appear in searches on device */
+"Spotlight history may still appear in search results, but notes have be unindexed" = "Spotlight 历史记录仍可能出现在搜索结果中，但注释已取消索引";
+
 /* Title for the response's Status Code */
 "Status Code" = "状态码";
 
 /* Become a Sustainer Details */
 "Support your favorite notes app to help unlock future features" = "支持您喜爱的笔记应用，帮助该产品在未来提供更多功能";
 
-/* No comment provided by engineer. */
-"Sustainer" = "支持者";
+/* Switch app icon */
+"Sustainer App Icon" = "Sustainer 应用程序图标";
 
 /* Restoration Successful Message */
 "Sustainer subscription restored. Thank you for supporting Simplenote!" = "支持者订阅已恢复。 感谢您支持 Simplenote！";
@@ -868,6 +910,12 @@
 /* Error when address is in use */
 "That email is already being used" = "该电子邮件已被使用";
 
+/* Email TextField Placeholder */
+"The authentication code you've requested has expired. Please request a new one" = "您请求的验证码已过期。 请重新请求";
+
+/* Error message for Invalid Login Code */
+"The code you've entered is not correct. Please try again" = "您输入的代码不正确。 请重试";
+
 /* Error when address is in use */
 "The email you've entered is already associated with a Simplenote account." = "您输入的电子邮件已与 Simplenote 帐户关联。";
 
@@ -980,6 +1028,9 @@
 /* Generic error */
 "We're having problems. Please try again soon." = "我们遇到了问题。请稍后重试。";
 
+/* Header for the Login with Code UI. Please preserve the {{EMAIL}} string as is! */
+"We've sent a code to {{EMAIL}}. The code will be valid for a few minutes." = "我们已向 {{EMAIL}} 发送代码。 此代码将在几分钟后失效。";
+
 /* WebSocket Status */
 "WebSocket" = "WebSocket";
 
@@ -993,12 +1044,12 @@
 /* Rating view initial title */
 "What do you think about Simplenote?" = "您觉得 Simplenote 怎么样？";
 
+/* Alerting users that we will attempt to restore lost content on next launch */
+"Will attempt to recover shortcut content on next launch" = "下次启动时将尝试恢复快捷方式内容";
+
 /* Number of words in the note */
 "Words" = "字数";
 
-/* Yearly Subscription Option (Used when / if the price fails to load) */
-"Yearly" = "每年";
-
 /* Proceeds with the Empty Trash OP */
 "Yes" = "是";
 
@@ -1017,6 +1068,9 @@
 /* Restoration Successful Message */
 "You're already a Sustainer. Thank you for supporting Simplenote!" = "您已成为支持者。 感谢您支持 Simplenote！";
 
+/* Error message for Invalid Login Code */
+"Your authentication code has expired. Please request a new one" = "您的验证码已过期。 请重新请求";
+
 /* Message displayed when email address is invalid */
 "Your email address is not valid" = "您输入的电子邮件地址无效。";
 
diff --git a/Simplenote/zh-Hant-TW.lproj/Localizable.strings b/Simplenote/zh-Hant-TW.lproj/Localizable.strings
index b3bc6a284..6ba9fe93c 100644
--- a/Simplenote/zh-Hant-TW.lproj/Localizable.strings
+++ b/Simplenote/zh-Hant-TW.lproj/Localizable.strings
@@ -1,15 +1,9 @@
-/* Translation-Revision-Date: 2022-11-22 09:54:03+0000 */
+/* Translation-Revision-Date: 2024-08-07 09:54:02+0000 */
 /* Plural-Forms: nplurals=1; plural=0; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: zh_TW */
 
-/* Monthly Subscription Option. Please preserve the special marker! */
-"%@ per Month" = "每月 %@";
-
-/* Yearly Subscription Option. Please preserve the special marker! */
-"%@ per Year" = "每年 %@";
-
-/* Number of found search results */
+/* No comment provided by engineer. */
 "%d Result" = "%d 個搜尋結果";
 
 /* Number of found search results */
@@ -73,6 +67,7 @@
 "About" = "關於";
 
 /* Accept Action
+   Accept Message
    Label of accept button on alert dialog */
 "Accept" = "接受";
 
@@ -123,9 +118,18 @@
 /* Empty Trash Warning */
 "Are you sure you want to empty the trash? This cannot be undone." = "確定要清空垃圾桶？此動作無法復原。";
 
+/* Data Fetch error message */
+"Attempt to fetch current note content failed.  Please try again later." = "嘗試擷取目前備註內容失敗。  請稍後再試。";
+
 /* Data Fetch error message */
 "Attempt to fetch entities failed.  Please try again later." = "嘗試擷取實體失敗。  請稍後再試一次。";
 
+/* Data Fetch error message */
+"Attempt to fetch notes failed.  Please try again later." = "嘗試擷取備註失敗。  請稍後再試。";
+
+/* Data Fetch error message */
+"Attempt to fetch tags failed.  Please try again later." = "嘗試擷取標籤失敗。  請稍後再試。";
+
 /* User Authenticated */
 "Authenticated" = "已驗證";
 
@@ -151,7 +155,6 @@
    Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
-   Dismisses the alert
    Dismissing an interface
    PinLock screen \"cancel\" button
    Verb, cancel an alert dialog */
@@ -187,8 +190,8 @@
 /* Title on the PinLock screen asking to create a passcode */
 "Choose a 4 digit passcode" = "選擇 4 位數的密碼";
 
-/* Sustainer Alert's Message */
-"Choose a plan and help unlock future features" = "選擇方案，協助日後解鎖更多功能";
+/* Code TextField Placeholder */
+"Code" = "程式碼";
 
 /* Opens the Collaborate UI */
 "Collaborate" = "協作";
@@ -231,9 +234,18 @@
 /* Error for bad email or password */
 "Could not create an account with the provided email address and password." = "無法使用提供的電子郵件地址和密碼建立帳號。";
 
+/* Note fetch error title */
+"Could not fetch Notes" = "無法擷取備註";
+
+/* Tag fetch error title */
+"Could not fetch Tags" = "無法擷取標籤";
+
 /* Fetch error title */
 "Could not fetch entities" = "無法擷取實體";
 
+/* note content fetch error title */
+"Could not fetch note content" = "無法擷取備註內容";
+
 /* Message displayed when login fails */
 "Could not login with the provided email address and password." = "無法使用提供的電子郵件地址和密碼登入。";
 
@@ -360,6 +372,15 @@
 /* Number of objects enqueued for processing */
 "Enqueued" = "加入佇列";
 
+/* LogIn Interface Title */
+"Enter Code" = "輸入驗證碼";
+
+/* Enter Password fallback Action */
+"Enter password" = "輸入密碼";
+
+/* Header for Login With Password. Please preserve the {{EMAIL}} substring */
+"Enter the password for the account {{EMAIL}}" = "輸入 {{EMAIL}} 帳號的密碼";
+
 /* Title on the PinLock screen asking to enter a passcode */
 "Enter your passcode" = "輸入你的密碼";
 
@@ -386,7 +407,7 @@
 "Forgot password? »" = "忘記密碼？»";
 
 /* Password Reset Action */
-"Forgotten password?" = "忘記密碼了嗎？";
+"Forgot your password?" = "忘記密碼？";
 
 /* FAQ or contact us */
 "Get Help" = "取得協助";
@@ -412,6 +433,12 @@
 /* Rating view - initial - liked button */
 "I like it" = "我喜歡";
 
+/* Option to add notes to spotlight search */
+"Index Notes in Spotlight" = "焦點中的索引備註";
+
+/* Alert title letting user know their search index has been removed */
+"Index Removed" = "已移除索引";
+
 /* Note Information Button (metrics + references) */
 "Information" = "資訊";
 
@@ -448,18 +475,27 @@
    LogIn Interface Title */
 "Log In" = "登入";
 
+/* LogIn Interface Title */
+"Log In with Password" = "使用密碼登入";
+
 /* Log out of the active account in the app */
 "Log Out" = "登出";
 
 /* Widget warning if user is logged out */
 "Log in to see your notes" = "你需要登入才能查看筆記";
 
-/* Allows the user to SignIn using their WPCOM Account */
+/* Password fallback Action */
 "Log in with WordPress.com" = "透過 WordPress.com 登入";
 
-/* Presents the regular Email signin flow */
+/* Sends the User an email with an Authentication Code */
 "Log in with email" = "透過電子郵件登入";
 
+/* Header for Enter Password UI, when the user performed too many requests */
+"Log in with email failed, please enter your password" = "透過電子郵件地址登入失敗，請輸入你的密碼";
+
+/* Message displayed when a login code is too short */
+"Login Code is too short" = "登入碼過短";
+
 /* Month and day date formatter */
 "MMM d" = "MMM d";
 
@@ -490,9 +526,6 @@
 /* Sort Mode: Modified Date, ascending */
 "Modified: Oldest" = "修改時間：最舊";
 
-/* Monthly Subscription Option (Used when / if the price fails to load) */
-"Monthly" = "每月";
-
 /* Accessibility hint for trash selected notes button */
 "Move selected notes to trash" = "將選取的筆記移至垃圾桶";
 
@@ -579,6 +612,9 @@
    Email unverified alert dismiss */
 "Ok" = "確定";
 
+/* confirm button title */
+"Okay" = "確定";
+
 /* No comment provided by engineer. */
 "On" = "開啟";
 
@@ -594,6 +630,9 @@
 /* Note Options Title */
 "Options" = "選項";
 
+/* Or, used as a separator between Actions */
+"Or" = "或者";
+
 /* A 4-digit code to lock the app when it is closed */
 "Passcode" = "密碼";
 
@@ -678,6 +717,9 @@
 /* Home screen quick action: Recent Note */
 "Recent" = "最近的";
 
+/* Header to put on any files that need to be recovered */
+"Recovered Note Cotent - " = "已還原的備註內容 - ";
+
 /* References section header on Info Card */
 "Referenced In" = "參考位置";
 
@@ -715,9 +757,6 @@
    Restore a note to a previous version */
 "Restore Note" = "還原筆記";
 
-/* Manually Restores IAP Purchases */
-"Restore Purchases" = "恢復購買";
-
 /* Title -> Review you account screen */
 "Review Your Account" = "檢閱你的帳號";
 
@@ -800,8 +839,7 @@
    Title of main share extension view */
 "Simplenote" = "Simplenote";
 
-/* Restoration Successful Title
-   Sustainer Alert's Title */
+/* Restoration Successful Title */
 "Simplenote Sustainer" = "Simplenote Sustainer";
 
 /* Simplenote's Feedback Email Title */
@@ -810,7 +848,8 @@
 /* Message displayed when app is not configured */
 "Simplenote must be configured and logged in to setup widgets" = "你必須設定並登入 Simplenote 才能設定小工具";
 
-/* Authentication Error Alert Title */
+/* Authentication Error Alert Title
+   Email TextField Placeholder */
 "Sorry!" = "很抱歉！";
 
 /* Option to sort tags alphabetically. The default is by manual ordering. */
@@ -823,14 +862,17 @@
 /* Sort By Title */
 "Sort by:" = "排序依據：";
 
+/* Details that some results may still appear in searches on device */
+"Spotlight history may still appear in search results, but notes have be unindexed" = "焦點記錄可能仍會在搜尋結果中顯示，但備註已取消索引";
+
 /* Title for the response's Status Code */
 "Status Code" = "狀態代碼";
 
 /* Become a Sustainer Details */
 "Support your favorite notes app to help unlock future features" = "支持你最愛的筆記應用程式，協助日後解鎖更多功能";
 
-/* No comment provided by engineer. */
-"Sustainer" = "Sustainer";
+/* Switch app icon */
+"Sustainer App Icon" = "Sustainer 應用程式圖示";
 
 /* Restoration Successful Message */
 "Sustainer subscription restored. Thank you for supporting Simplenote!" = "已恢復 Sustainer 訂購。 感謝你支持 Simplenote！";
@@ -868,6 +910,12 @@
 /* Error when address is in use */
 "That email is already being used" = "此電子信箱已被使用";
 
+/* Email TextField Placeholder */
+"The authentication code you've requested has expired. Please request a new one" = "你要求的驗證碼已過期。 請申請新的驗證碼";
+
+/* Error message for Invalid Login Code */
+"The code you've entered is not correct. Please try again" = "你輸入的驗證碼不正確。 請再試一次";
+
 /* Error when address is in use */
 "The email you've entered is already associated with a Simplenote account." = "你輸入的電子郵件地址已與 Simplenote 帳號建立關聯。";
 
@@ -980,6 +1028,9 @@
 /* Generic error */
 "We're having problems. Please try again soon." = "發生問題，請再試一次。";
 
+/* Header for the Login with Code UI. Please preserve the {{EMAIL}} string as is! */
+"We've sent a code to {{EMAIL}}. The code will be valid for a few minutes." = "我們已傳送驗證碼到 {{EMAIL}}。 此驗證碼在幾分鐘內有效。";
+
 /* WebSocket Status */
 "WebSocket" = "WebSocket";
 
@@ -993,12 +1044,12 @@
 /* Rating view initial title */
 "What do you think about Simplenote?" = "你覺得 Simplenote 如何？";
 
+/* Alerting users that we will attempt to restore lost content on next launch */
+"Will attempt to recover shortcut content on next launch" = "會嘗試在下一次推出時還原捷徑內容";
+
 /* Number of words in the note */
 "Words" = "字";
 
-/* Yearly Subscription Option (Used when / if the price fails to load) */
-"Yearly" = "每年";
-
 /* Proceeds with the Empty Trash OP */
 "Yes" = "是";
 
@@ -1017,6 +1068,9 @@
 /* Restoration Successful Message */
 "You're already a Sustainer. Thank you for supporting Simplenote!" = "你已經是 Sustainer。 感謝你支持 Simplenote！";
 
+/* Error message for Invalid Login Code */
+"Your authentication code has expired. Please request a new one" = "你的驗證碼已過期。 請申請新的驗證碼";
+
 /* Message displayed when email address is invalid */
 "Your email address is not valid" = "你的電子郵件地址無效。";
 

From 376625326ad38f37482a8e1fc6a0252c319cd420 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Thu, 15 Aug 2024 16:36:40 +1000
Subject: [PATCH 422/547] Extract GlotPress URLs to constants

---
 fastlane/Fastfile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 5d72f1e5d..3da5248d1 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -37,6 +37,11 @@ $used_test_account_index = nil
 
 RELEASE_NOTES_SOURCE_PATH = File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt')
 
+# Notice the trailing / is required.
+# Without it, GlotPress will redirect to the version with /
+GLOTPRESS_APP_STRINGS_PROJECT_URL = 'https://translate.wordpress.com/projects/simplenote/ios/'
+GLOTPRESS_RELEASE_NOTES_PROJECT_URL = "#{GLOTPRESS_APP_STRINGS_PROJECT_URL}release-notes".freeze
+
 require_relative 'lib/env_manager'
 
 # Important: These need to be imported after all the constants have be defined because they access them.
@@ -180,18 +185,18 @@ platform :ios do
 
     UI.message('Checking app strings translation status...')
     check_translation_progress(
-      glotpress_url: 'https://translate.wordpress.com/projects/simplenote/ios/',
+      glotpress_url: GLOTPRESS_APP_STRINGS_PROJECT_URL,
       abort_on_violations: false
     )
 
     UI.message('Checking release notes strings translation status...')
     check_translation_progress(
-      glotpress_url: 'https://translate.wordpress.com/projects/simplenote/ios/release-notes/',
+      glotpress_url: GLOTPRESS_RELEASE_NOTES_PROJECT_URL,
       abort_on_violations: false
     )
 
     ios_download_strings_files_from_glotpress(
-      project_url: 'https://translate.wordpress.com/projects/simplenote/ios/',
+      project_url:GLOTPRESS_APP_STRINGS_PROJECT_URL,
       locales: GLOTPRESS_TO_LPROJ_APP_LOCALE_CODES,
       download_dir: File.join(PROJECT_ROOT_FOLDER, 'Simplenote')
     )

From 4f51693afa23054fd29b1c4e3a04e80c5803c352 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Thu, 15 Aug 2024 16:38:46 +1000
Subject: [PATCH 423/547] Provide skeleton implementation for download
 localizations lane

---
 fastlane/Fastfile              |  6 +-----
 fastlane/lanes/localization.rb | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 3da5248d1..75c219b49 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -195,11 +195,7 @@ platform :ios do
       abort_on_violations: false
     )
 
-    ios_download_strings_files_from_glotpress(
-      project_url:GLOTPRESS_APP_STRINGS_PROJECT_URL,
-      locales: GLOTPRESS_TO_LPROJ_APP_LOCALE_CODES,
-      download_dir: File.join(PROJECT_ROOT_FOLDER, 'Simplenote')
-    )
+    download_localized_strings_and_metadata_from_glotpress
     sanitize_appstore_keywords
     ios_lint_localizations(
       input_dir: 'Simplenote',
diff --git a/fastlane/lanes/localization.rb b/fastlane/lanes/localization.rb
index 95b54c8e2..ef36bac67 100644
--- a/fastlane/lanes/localization.rb
+++ b/fastlane/lanes/localization.rb
@@ -48,4 +48,27 @@
       allow_nothing_to_commit: true
     )
   end
+
+  lane :download_localized_strings_and_metadata_from_glotpress do
+    download_localized_strings_from_glotpress
+    download_localized_metadata_from_glotpress
+  end
+
+  lane :download_localized_strings_from_glotpress do
+    parent_dir_for_lprojs = File.join(PROJECT_ROOT_FOLDER, 'Simplenote')
+    ios_download_strings_files_from_glotpress(
+      project_url: GLOTPRESS_APP_STRINGS_PROJECT_URL,
+      locales: GLOTPRESS_TO_LPROJ_APP_LOCALE_CODES,
+      download_dir: parent_dir_for_lprojs
+    )
+    git_commit(
+      path: File.join(parent_dir_for_lprojs, '*.lproj', 'Localizable.strings'),
+      message: 'Update app translations – `Localizable.strings`',
+      allow_nothing_to_commit: true
+    )
+  end
+
+  lane :download_localized_metadata_from_glotpress do
+    UI.important('TODO: Not yet implemented!')
+  end
 end

From eb7006103038ac466139a567d271996e9acd57c2 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Thu, 15 Aug 2024 16:41:03 +1000
Subject: [PATCH 424/547] Move sanitize ASC keywords to lane that downloads
 them

---
 fastlane/Fastfile              | 33 ---------------------------------
 fastlane/lanes/localization.rb | 34 +++++++++++++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 75c219b49..281a44be1 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -93,38 +93,6 @@ platform :ios do
     )
   end
 
-  # This lane lacks documentation because it ought to be part of the localized
-  # metadata download script instead!
-  desc 'Updates the files with the localized keywords values for App Store Connect to match the 100 characters requirement'
-  lane :sanitize_appstore_keywords do
-    Dir['./metadata/**'].each do |locale_dir|
-      keywords_path = File.join(locale_dir, 'keywords.txt')
-
-      unless File.exist?(keywords_path)
-        UI.message "Could not find keywords file in #{locale_dir}. Skipping."
-        next
-      end
-
-      keywords = File.read(keywords_path)
-      app_store_connect_keywords_length_limit = 100
-
-      if keywords.length <= app_store_connect_keywords_length_limit
-        UI.verbose "#{keywords_path} has less than #{app_store_connect_keywords_length_limit} characters. Not trimming."
-        next
-      end
-
-      UI.message "#{keywords_path} has more than #{app_store_connect_keywords_length_limit} characters. Trimming it..."
-
-      english_comma = ','
-      arabic_comma = '،'
-      keywords = keywords.gsub(arabic_comma, english_comma) if File.basename(locale_dir) == 'ar-SA'
-
-      keywords = keywords.split(english_comma)[0...-1].join(english_comma) until keywords.length <= app_store_connect_keywords_length_limit
-
-      File.write(keywords_path, keywords)
-    end
-  end
-
   #####################################################################################
   # new_hotfix_release
   # -----------------------------------------------------------------------------------
@@ -196,7 +164,6 @@ platform :ios do
     )
 
     download_localized_strings_and_metadata_from_glotpress
-    sanitize_appstore_keywords
     ios_lint_localizations(
       input_dir: 'Simplenote',
       allow_retry: true
diff --git a/fastlane/lanes/localization.rb b/fastlane/lanes/localization.rb
index ef36bac67..3e2f66521 100644
--- a/fastlane/lanes/localization.rb
+++ b/fastlane/lanes/localization.rb
@@ -69,6 +69,38 @@
   end
 
   lane :download_localized_metadata_from_glotpress do
-    UI.important('TODO: Not yet implemented!')
+    UI.important('TODO: Download not yet implemented!')
+    sanitize_appstore_keywords
+  end
+
+  # TODO: This ought to be part of the localized metadata download action, or of Fastlane itself.
+  desc 'Updates the files with the localized keywords values for App Store Connect to match the 100 characters requirement'
+  lane :sanitize_appstore_keywords do
+    Dir['./metadata/**'].each do |locale_dir|
+      keywords_path = File.join(locale_dir, 'keywords.txt')
+
+      unless File.exist?(keywords_path)
+        UI.message "Could not find keywords file in #{locale_dir}. Skipping."
+        next
+      end
+
+      keywords = File.read(keywords_path)
+      app_store_connect_keywords_length_limit = 100
+
+      if keywords.length <= app_store_connect_keywords_length_limit
+        UI.verbose "#{keywords_path} has less than #{app_store_connect_keywords_length_limit} characters. Not trimming."
+        next
+      end
+
+      UI.message "#{keywords_path} has more than #{app_store_connect_keywords_length_limit} characters. Trimming it..."
+
+      english_comma = ','
+      arabic_comma = '،'
+      keywords = keywords.gsub(arabic_comma, english_comma) if File.basename(locale_dir) == 'ar-SA'
+
+      keywords = keywords.split(english_comma)[0...-1].join(english_comma) until keywords.length <= app_store_connect_keywords_length_limit
+
+      File.write(keywords_path, keywords)
+    end
   end
 end

From d37c53f22328ac484bbeda57ee17428a9a6bb08c Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Thu, 15 Aug 2024 17:18:25 +1000
Subject: [PATCH 425/547] Use the same GlotPress constants setup as Android

See https://github.com/Automattic/simplenote-android/pull/1676
---
 fastlane/Fastfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 281a44be1..514bc6cd5 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -37,10 +37,11 @@ $used_test_account_index = nil
 
 RELEASE_NOTES_SOURCE_PATH = File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt')
 
+GLOTPRESS_BASE_URL = 'https://translate.wordpress.com/projects'
 # Notice the trailing / is required.
 # Without it, GlotPress will redirect to the version with /
-GLOTPRESS_APP_STRINGS_PROJECT_URL = 'https://translate.wordpress.com/projects/simplenote/ios/'
-GLOTPRESS_RELEASE_NOTES_PROJECT_URL = "#{GLOTPRESS_APP_STRINGS_PROJECT_URL}release-notes".freeze
+GLOTPRESS_APP_STRINGS_PROJECT_URL = "#{GLOTPRESS_BASE_URL}/simplenote/ios/".freeze
+GLOTPRESS_STORE_METADATA_PROJECT_URL = "#{GLOTPRESS_APP_STRINGS_PROJECT_URL}release-notes".freeze
 
 require_relative 'lib/env_manager'
 
@@ -159,7 +160,7 @@ platform :ios do
 
     UI.message('Checking release notes strings translation status...')
     check_translation_progress(
-      glotpress_url: GLOTPRESS_RELEASE_NOTES_PROJECT_URL,
+      glotpress_url: GLOTPRESS_STORE_METADATA_PROJECT_URL,
       abort_on_violations: false
     )
 

From 5daa4b56c88863f3c1cdb70908be53f59a321b73 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Thu, 15 Aug 2024 17:49:37 +1000
Subject: [PATCH 426/547] Implement modern ASC localization download logic

---
 .gitignore                                |   2 +
 fastlane/Fastfile                         |   5 +-
 fastlane/lanes/localization.rb            | 105 ++++++++++++++++++++--
 fastlane/metadata/en-US/description.txt   |  37 --------
 fastlane/metadata/en-US/keywords.txt      |   1 -
 fastlane/metadata/en-US/release_notes.txt |   2 -
 fastlane/metadata/en-US/subtitle.txt      |   1 -
 7 files changed, 105 insertions(+), 48 deletions(-)
 delete mode 100644 fastlane/metadata/en-US/description.txt
 delete mode 100644 fastlane/metadata/en-US/keywords.txt
 delete mode 100644 fastlane/metadata/en-US/release_notes.txt
 delete mode 100644 fastlane/metadata/en-US/subtitle.txt

diff --git a/.gitignore b/.gitignore
index 2462a624f..c7040702f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,6 +48,8 @@ fastlane/report.xml
 fastlane/README.md
 fastlane/screenshots/
 fastlane/test_output/
+# Ignore Fastlane's default/release_notes.txt because the automation copies it from the Simplenote/Resources/release_notes.txt file in
+fastlane/metadata/default/release_notes.txt
 Preview.html
 build/
 # This is generated by the promo screenshots process
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 514bc6cd5..1ba77ad45 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -41,7 +41,9 @@ GLOTPRESS_BASE_URL = 'https://translate.wordpress.com/projects'
 # Notice the trailing / is required.
 # Without it, GlotPress will redirect to the version with /
 GLOTPRESS_APP_STRINGS_PROJECT_URL = "#{GLOTPRESS_BASE_URL}/simplenote/ios/".freeze
-GLOTPRESS_STORE_METADATA_PROJECT_URL = "#{GLOTPRESS_APP_STRINGS_PROJECT_URL}release-notes".freeze
+GLOTPRESS_STORE_METADATA_PROJECT_URL = "#{GLOTPRESS_APP_STRINGS_PROJECT_URL}release-notes/".freeze
+
+STORE_METADATA_FOLDER = File.join(PROJECT_ROOT_FOLDER, 'fastlane', 'metadata')
 
 require_relative 'lib/env_manager'
 
@@ -165,6 +167,7 @@ platform :ios do
     )
 
     download_localized_strings_and_metadata_from_glotpress
+
     ios_lint_localizations(
       input_dir: 'Simplenote',
       allow_retry: true
diff --git a/fastlane/lanes/localization.rb b/fastlane/lanes/localization.rb
index 3e2f66521..7f5e511ce 100644
--- a/fastlane/lanes/localization.rb
+++ b/fastlane/lanes/localization.rb
@@ -26,6 +26,28 @@
   'zh-tw' => 'zh-Hant-TW'   # Chinese (Taiwan)
 }.freeze
 
+# Mapping of all locales which can be used for AppStore metadata (Glotpress code => AppStore Connect code)
+#
+# TODO: Replace with `LocaleHelper` once provided by release toolkit (https://github.com/wordpress-mobile/release-toolkit/pull/296)
+GLOTPRESS_TO_ASC_METADATA_LOCALE_CODES = {
+  'ar' => 'ar-SA',
+  'de' => 'de-DE',
+  'es' => 'es-ES',
+  'fr' => 'fr-FR',
+  'he' => 'he',
+  'id' => 'id',
+  'it' => 'it',
+  'ja' => 'ja',
+  'ko' => 'ko',
+  'nl' => 'nl-NL',
+  'pt-br' => 'pt-BR',
+  'ru' => 'ru',
+  'sv' => 'sv',
+  'tr' => 'tr',
+  'zh-cn' => 'zh-Hans',
+  'zh-tw' => 'zh-Hant'
+}.freeze
+
 platform :ios do
   desc 'Updates the main `Localizable.strings` file — that will be imported by GlotPress'
   lane :generate_strings_file_for_glotpress do
@@ -69,18 +91,51 @@
   end
 
   lane :download_localized_metadata_from_glotpress do
-    UI.important('TODO: Download not yet implemented!')
+    # FIXME: We should make the `fastlane/metadata/default/release_notes.txt` path be the source of truth for the original copies in the future.
+    # (will require changes in the `update_appstore_strings` lane, the Release Scenario, the MC tool to generate the announcement post…)
+    #
+    # In the meantime, just copy the file to the right place for `deliver` to find, for the `default` pseudo-locale which is used as fallback
+    FileUtils.cp(RELEASE_NOTES_SOURCE_PATH, File.join(STORE_METADATA_FOLDER, 'default', 'release_notes.txt'))
+
+    # FIXME: Replace this with a call to the future replacement of `gp_downloadmetadata` once it's implemented in the release-toolkit (see paaHJt-31O-p2).
+    target_files = {
+      "v#{release_version_current}-whats-new": { desc: 'release_notes.txt', max_size: 4000 },
+      app_store_name: { desc: 'name.txt', max_size: 30 },
+      app_store_subtitle: { desc: 'subtitle.txt', max_size: 30 },
+      app_store_desc: { desc: 'description.txt', max_size: 4000 },
+      app_store_keywords: { desc: 'keywords.txt', max_size: 100 }
+    }
+    gp_downloadmetadata(
+      project_url: GLOTPRESS_STORE_METADATA_PROJECT_URL,
+      target_files: target_files,
+      locales: GLOTPRESS_TO_ASC_METADATA_LOCALE_CODES,
+      download_path: STORE_METADATA_FOLDER
+    )
+
+    files_to_commit = [File.join(STORE_METADATA_FOLDER, '**', '*.txt')]
+
+    ensure_default_metadata_are_not_overridden(metadata_files_hash: target_files)
+
+    files_to_commit.append(*generate_gitkeep_for_empty_locale_folders)
+
+    git_add(path: files_to_commit, shell_escape: false)
+    git_commit(
+      path: files_to_commit,
+      message: 'Update App Store metadata translations',
+      allow_nothing_to_commit: true
+    )
+
     sanitize_appstore_keywords
   end
 
   # TODO: This ought to be part of the localized metadata download action, or of Fastlane itself.
   desc 'Updates the files with the localized keywords values for App Store Connect to match the 100 characters requirement'
   lane :sanitize_appstore_keywords do
-    Dir['./metadata/**'].each do |locale_dir|
+    Dir[File.join(STORE_METADATA_FOLDER, '**')].each do |locale_dir|
       keywords_path = File.join(locale_dir, 'keywords.txt')
 
       unless File.exist?(keywords_path)
-        UI.message "Could not find keywords file in #{locale_dir}. Skipping."
+        UI.important "Could not find keywords file in #{locale_dir}. Skipping..."
         next
       end
 
@@ -88,19 +143,57 @@
       app_store_connect_keywords_length_limit = 100
 
       if keywords.length <= app_store_connect_keywords_length_limit
-        UI.verbose "#{keywords_path} has less than #{app_store_connect_keywords_length_limit} characters. Not trimming."
+        UI.success "#{keywords_path} has less than #{app_store_connect_keywords_length_limit} characters."
         next
       end
 
-      UI.message "#{keywords_path} has more than #{app_store_connect_keywords_length_limit} characters. Trimming it..."
+      UI.important "#{keywords_path} has more than #{app_store_connect_keywords_length_limit} characters. Trimming it..."
 
       english_comma = ','
       arabic_comma = '،'
-      keywords = keywords.gsub(arabic_comma, english_comma) if File.basename(locale_dir) == 'ar-SA'
+      locale_code = File.basename(locale_dir)
+      keywords = keywords.gsub(arabic_comma, english_comma) if locale_code == 'ar-SA'
 
       keywords = keywords.split(english_comma)[0...-1].join(english_comma) until keywords.length <= app_store_connect_keywords_length_limit
 
       File.write(keywords_path, keywords)
+
+      git_commit(
+        path: keywords_path,
+        message: "Trim #{locale_code} keywords to be less than #{app_store_connect_keywords_length_limit} characters",
+        allow_nothing_to_commit: false
+      )
     end
   end
 end
+
+# Ensure that none of the `.txt` files in `en-US` would accidentally override our originals in `default`
+def ensure_default_metadata_are_not_overridden(metadata_files_hash:)
+  metadata_files_hash.values.map { |t| t[:desc] }.each do |file|
+    en_file_path = File.join(STORE_METADATA_FOLDER, 'en-US', file)
+
+    override_not_allowed_message = <<~MSG
+      File `#{en_file_path}` would override the same one in `#{STORE_METADATA_FOLDER}/default`.
+      `default/` is the source of truth and we cannot allow it to change unintentionally.
+      Delete `#{en_file_path}`, ensure the version in `default/` has the expected original copy, and try again.
+    MSG
+    UI.user_error!(override_not_allowed_message) if File.exist?(en_file_path)
+  end
+end
+
+# Ensure even empty locale folders have an empty `.gitkeep` file.
+# This way, if we don't have any translation ready for those locales, we'll still have the folders in Git for clarity.
+def generate_gitkeep_for_empty_locale_folders
+  gitkeeps = []
+
+  GLOTPRESS_TO_ASC_METADATA_LOCALE_CODES.each_value do |locale|
+    gitkeep = File.join(STORE_METADATA_FOLDER, locale, '.gitkeep')
+    next if File.exist?(gitkeep)
+
+    FileUtils.mkdir_p(File.dirname(gitkeep))
+    FileUtils.touch(gitkeep)
+    gitkeeps.append(gitkeep)
+  end
+
+  gitkeeps
+end
diff --git a/fastlane/metadata/en-US/description.txt b/fastlane/metadata/en-US/description.txt
deleted file mode 100644
index ef31ca421..000000000
--- a/fastlane/metadata/en-US/description.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-Simplenote is an easy way to take notes, create to-do lists, capture ideas, and more. Open it, jot down some thoughts, and you're done. As your collection grows, stay organized with tags and pins, and find what you need with instant search. Since Simplenote will sync across your devices for free, your notes are with you at all times.
-
-- A simple, note taking experience
-- Sync everything across all your devices
-- Collaborate and share
-- Stay organized with tags
-- Log in with your email or WordPress.com account
-
-SYNC WITH CONFIDENCE
-- Automatically sync seamlessly across any computer, phone or tablet.
-- Back up and sync everything as you take notes, so you never lose your content.
-
-COLLABORATE AND SHARE
-- Collaborate and work together -- share ideas with a colleague, or write a grocery list with your roommate.
-- Choose whether to publish your content to the web, and share a link with whoever you want.
-- Publish directly to a WordPress site by connecting your WordPress.com account.
-- Quickly and easily share with third-party apps.
-
-ORGANIZE AND SEARCH
-- Stay organized with tags, and use them for quick searching and sorting.
-- Instantly find what you’re looking for with keyword highlighting.
-- Use markdown to add formatting.
-- Create to-do lists.
-- Choose the sorting order of your notes and tags.
-- Pin the notes that you use the most.
-- Edit tags directly by renaming and reordering.
-- Protect your content with a passcode lock.
-
---
-
-Privacy Policy: https://automattic.com/privacy/
-Terms of Service: https://simplenote.com/terms/
-California Users Privacy Notice: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
-
---
-
-Visit simplenote.com to download Simplenote for your other devices.
diff --git a/fastlane/metadata/en-US/keywords.txt b/fastlane/metadata/en-US/keywords.txt
deleted file mode 100644
index 363d879cb..000000000
--- a/fastlane/metadata/en-US/keywords.txt
+++ /dev/null
@@ -1 +0,0 @@
-notes,note,markdown,journal,sync,to-do,list,cloud,notebook,simple,notepad,tag,todo,writing,memo
\ No newline at end of file
diff --git a/fastlane/metadata/en-US/release_notes.txt b/fastlane/metadata/en-US/release_notes.txt
deleted file mode 100644
index e54b3a729..000000000
--- a/fastlane/metadata/en-US/release_notes.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-- Add background color to code block in dark mode preview
-- Add large note widget
diff --git a/fastlane/metadata/en-US/subtitle.txt b/fastlane/metadata/en-US/subtitle.txt
deleted file mode 100644
index 308038419..000000000
--- a/fastlane/metadata/en-US/subtitle.txt
+++ /dev/null
@@ -1 +0,0 @@
-Simple notes, todos and memos
\ No newline at end of file

From 53bf829b6f29afbaf93e1bd842ac08a8d11a0d31 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Thu, 15 Aug 2024 20:02:49 +1000
Subject: [PATCH 427/547] Remove obsolete scripts for localization

---
 Scripts/localize.py              | 145 -------------------------------
 fastlane/Fastfile                |   1 -
 fastlane/download_metadata.swift | 139 -----------------------------
 3 files changed, 285 deletions(-)
 delete mode 100755 Scripts/localize.py
 delete mode 100755 fastlane/download_metadata.swift

diff --git a/Scripts/localize.py b/Scripts/localize.py
deleted file mode 100755
index 659a7d381..000000000
--- a/Scripts/localize.py
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# Localize.py - Incremental localization on XCode projects
-# João Moreno 2009
-# http://joaomoreno.com/
-
-# Modified by Steve Streeting 2010 https://www.stevestreeting.com
-# Changes
-# - Use .strings files encoded as UTF-8
-#   This is useful because Mercurial and Git treat UTF-16 as binary and can't
-#   diff/merge them. For use on iPhone you can run an iconv script during build to
-#   convert back to UTF-16 (Mac OS X will happily use UTF-8 .strings files).
-# - Clean up .old and .new files once we're done
-
-from sys import argv
-from codecs import open
-from re import compile
-from copy import copy
-import os
-
-re_translation = compile(r'^"(.+)" = "(.+)";$')
-re_comment_single = compile(r'^/\*.*\*/$')
-re_comment_start = compile(r'^/\*.*$')
-re_comment_end = compile(r'^.*\*/$')
-
-class LocalizedString():
-    def __init__(self, comments, translation):
-        self.comments, self.translation = comments, translation
-        self.key, self.value = re_translation.match(self.translation).groups()
-
-    def __unicode__(self):
-        return u'%s%s\n' % (u''.join(self.comments), self.translation)
-
-class LocalizedFile():
-    def __init__(self, fname=None, auto_read=False):
-        self.fname = fname
-        self.strings = []
-        self.strings_d = {}
-
-        if auto_read:
-            self.read_from_file(fname)
-
-    def read_from_file(self, fname=None):
-        fname = self.fname if fname == None else fname
-        try:
-            f = open(fname, encoding='utf_8', mode='r')
-        except:
-            print 'File %s does not exist.' % fname
-            exit(-1)
-
-        line = f.readline()
-        while line:
-            comments = [line]
-
-            if not re_comment_single.match(line):
-                while line and not re_comment_end.match(line):
-                    line = f.readline()
-                    comments.append(line)
-
-            line = f.readline()
-            if line and re_translation.match(line):
-                translation = line
-            else:
-                raise Exception('invalid file')
-
-            line = f.readline()
-            while line and line == u'\n':
-                line = f.readline()
-
-            string = LocalizedString(comments, translation)
-            self.strings.append(string)
-            self.strings_d[string.key] = string
-
-        f.close()
-
-    def save_to_file(self, fname=None):
-        fname = self.fname if fname == None else fname
-        try:
-            f = open(fname, encoding='utf_8', mode='w')
-        except:
-            print 'Couldn\'t open file %s.' % fname
-            exit(-1)
-
-        for string in self.strings:
-            f.write(string.__unicode__())
-
-        f.close()
-
-    def merge_with(self, new):
-        merged = LocalizedFile()
-
-        for string in new.strings:
-            if self.strings_d.has_key(string.key):
-                new_string = copy(self.strings_d[string.key])
-                new_string.comments = string.comments
-                string = new_string
-
-            merged.strings.append(string)
-            merged.strings_d[string.key] = string
-
-        return merged
-
-def merge(merged_fname, old_fname, new_fname):
-    try:
-        old = LocalizedFile(old_fname, auto_read=True)
-        new = LocalizedFile(new_fname, auto_read=True)
-        merged = old.merge_with(new)
-        merged.save_to_file(merged_fname)
-    except:
-        print 'Error: input files have invalid format.'
-
-
-STRINGS_FILE = 'Localizable.strings'
-
-def localize(path):
-
-    language = os.path.join(path, "en.lproj")
-    original = merged = language + os.path.sep + STRINGS_FILE
-
-    old = original + '.old'
-    new = original + '.new'
-
-    # Using with `-print0` and `xargs -0` to account for spaces in the paths `find` might return
-    genstrings_cmd = 'find ./Simplenote ./SimplenoteShare ./SimplenoteWidgets \( -name "*.m" -o -name "*.swift" \) -print0 | xargs -0 genstrings -q -o "%s"'
-
-    if os.path.isfile(original):
-        os.rename(original, old)
-        os.system(genstrings_cmd % language)
-        os.system('iconv -f UTF-16 -t UTF-8 "%s" > "%s"' % (original, new))
-        merge(merged, old, new)
-    else:
-        os.system(genstrings_cmd % language)
-        os.rename(original, old)
-        os.system('iconv -f UTF-16 -t UTF-8 "%s" > "%s"' % (old, original))
-
-    if os.path.isfile(old):
-        os.remove(old)
-    if os.path.isfile(new):
-        os.remove(new)
-
-if __name__ == '__main__':
-    basedir = os.getcwd()
-    path = os.path.join(basedir, 'Simplenote')
-    localize(path)
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 1ba77ad45..edf56f777 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -73,7 +73,6 @@ ENV['PROJECT_NAME'] = 'Simplenote'
 ENV['PROJECT_ROOT_FOLDER'] = PROJECT_ROOT_FOLDER
 ENV['APP_STORE_STRINGS_FILE_NAME'] = 'AppStoreStrings.pot'
 ENV['PUBLIC_CONFIG_FILE'] = VERSION_FILE_PATH
-ENV['DOWNLOAD_METADATA'] = './fastlane/download_metadata.swift'
 ENV['FL_RELEASE_TOOLKIT_DEFAULT_BRANCH'] = 'trunk'
 
 platform :ios do
diff --git a/fastlane/download_metadata.swift b/fastlane/download_metadata.swift
deleted file mode 100755
index 78f14dfc2..000000000
--- a/fastlane/download_metadata.swift
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/usr/bin/env swift
-
-import Foundation
-
-let glotPressTitleKey = "app_store_title"
-let glotPressSubtitleKey = "app_store_subtitle"
-let glotPressWhatsNewKey = "v4.49-whats-new"
-let glotPressDescriptionKey = "app_store_desc"
-let glotPressKeywordsKey = "app_store_keywords"
-
-let scriptURL = URL(fileURLWithPath: CommandLine.arguments[0], relativeTo: URL(fileURLWithPath: FileManager.default.currentDirectoryPath))
-let fastlaneDir = scriptURL.deletingLastPathComponent()
-let baseFolder = fastlaneDir.appendingPathComponent("metadata").path
-
-// iTunes Connect language code: GlotPress code
-let languages = [
-    "ar-SA": "ar",
-    "de-DE": "de",
-    "default": "en-us", // Technically not a real GlotPress language
-    "en-US": "en-us", // Technically not a real GlotPress language
-    "es-ES": "es",
-    "fr-FR": "fr",
-    "id": "id",
-    "it": "it",
-    "ja": "ja",
-    "ko": "ko",
-    "nl-NL": "nl",
-    "pt-BR": "pt-br",
-    "ru": "ru",
-    "sv": "sv",
-    "tr": "tr",
-    "zh-Hans": "zh-cn",
-    "zh-Hant": "zh-tw",
-]
-
-func downloadTranslation(languageCode: String, folderName: String) {
-    let languageCodeOverride = languageCode == "en-us" ? "es" : languageCode
-    let glotPressURL = "https://translate.wordpress.com/projects/simplenote%2Fios%2Frelease-notes/\(languageCodeOverride)/default/export-translations?format=json"
-    let requestURL: URL = URL(string: glotPressURL)!
-    let urlRequest: URLRequest = URLRequest(url: requestURL)
-    let session = URLSession.shared
-
-    let sema = DispatchSemaphore( value: 0)
-
-    print("Downloading Language: \(languageCode)")
-	
-    let task = session.dataTask(with: urlRequest) {
-        (data, response, error) -> Void in
-
-        defer {
-            sema.signal()
-        }
-
-        guard let data = data else {
-            print("  Invalid data downloaded.")
-            return
-        }
-
-        guard let json = try? JSONSerialization.jsonObject(with: data, options: []),
-            let jsonDict = json as? [String: Any] else {
-                print("  JSON was not returned")
-                return
-        }
-
-        var title: String?
-        var subtitle: String?
-        var whatsNew: String?
-        var keywords: String?
-        var storeDescription: String?
-
-        jsonDict.forEach({ (key: String, value: Any) in
-
-            guard let index = key.firstIndex(of: Character(UnicodeScalar(0004))) else {
-            	return
-            }
-
-            let keyFirstPart = String(key[..<index])
-
-            guard let value = value as? [String],
-                let firstValue = value.first else {
-                    print("  No translation for \(keyFirstPart)")
-                    return
-            }
-
-            var originalLanguage = String(key[index...])
-            originalLanguage.remove(at: originalLanguage.startIndex)
-            let translation = languageCode == "en-us" ? originalLanguage : firstValue
-            
-            switch keyFirstPart {
-            case glotPressTitleKey:
-                title = translation
-            case glotPressSubtitleKey:
-                subtitle = translation
-            case glotPressKeywordsKey:
-                keywords = translation
-            case glotPressWhatsNewKey:
-                whatsNew = translation
-            case glotPressDescriptionKey:
-                storeDescription = translation
-            default:
-                print("  Unknown key: \(keyFirstPart)")
-            }
-        })
-
-        let languageFolder = "\(baseFolder)/\(folderName)"
-
-        let fileManager = FileManager.default
-        try? fileManager.createDirectory(atPath: languageFolder, withIntermediateDirectories: true, attributes: nil)
-
-        do {
-            // Disable downloading title from GlotPress since we don't want it to be translated anymore
-            // try title?.write(toFile: "\(languageFolder)/name.txt", atomically: true, encoding: .utf8)
-            try subtitle?.write(toFile: "\(languageFolder)/subtitle.txt", atomically: true, encoding: .utf8)
-            try whatsNew?.write(toFile: "\(languageFolder)/release_notes.txt", atomically: true, encoding: .utf8)
-            try keywords?.write(toFile: "\(languageFolder)/keywords.txt", atomically: true, encoding: .utf8)
-            try storeDescription?.write(toFile: "\(languageFolder)/description.txt", atomically: true, encoding: .utf8)
-        } catch {
-            print("  Error writing: \(error)")
-        }
-    }
-    
-    task.resume()
-    sema.wait()
-}
-
-func deleteExistingMetadata() {
-    let fileManager = FileManager.default
-	let url = URL(fileURLWithPath: baseFolder, isDirectory: true)
-	try? fileManager.removeItem(at: url)	
-	try? fileManager.createDirectory(at: url, withIntermediateDirectories: false)
-}
-
-
-deleteExistingMetadata()
-
-languages.forEach( { (key: String, value: String) in
-    downloadTranslation(languageCode: value, folderName: key)
-})
-

From 9e2175e751c9c1496fc24bbd7f42cf6241edfe6b Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Thu, 15 Aug 2024 20:04:10 +1000
Subject: [PATCH 428/547] =?UTF-8?q?Do=20not=20attempt=20to=20download=20`e?=
 =?UTF-8?q?n`=20from=20GlotPress=E2=80=94It's=20not=20there?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fastlane/lanes/localization.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fastlane/lanes/localization.rb b/fastlane/lanes/localization.rb
index 7f5e511ce..6754fa71b 100644
--- a/fastlane/lanes/localization.rb
+++ b/fastlane/lanes/localization.rb
@@ -8,7 +8,6 @@
   'cy' => 'cy',             # Welsh
   'de' => 'de',             # German
   'el' => 'el',             # Greek
-  'en' => 'en',             # English
   'es' => 'es',             # Spanish
   'fa' => 'fa',             # Persian
   'fr' => 'fr',             # French

From 6f6fd4abf1115c968c69906b7653e8884366ed2d Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Thu, 15 Aug 2024 20:06:45 +1000
Subject: [PATCH 429/547] =?UTF-8?q?Remove=20old=20`fastlane/metadata/defau?=
 =?UTF-8?q?lt/release=5Fnotes.txt`=E2=80=94Now=20git-ignored?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fastlane/metadata/default/release_notes.txt | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 fastlane/metadata/default/release_notes.txt

diff --git a/fastlane/metadata/default/release_notes.txt b/fastlane/metadata/default/release_notes.txt
deleted file mode 100644
index e54b3a729..000000000
--- a/fastlane/metadata/default/release_notes.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-- Add background color to code block in dark mode preview
-- Add large note widget

From 8d98e35ef46a4330b6ff1bb1a242e989c01ce925 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Fri, 16 Aug 2024 11:48:29 +1000
Subject: [PATCH 430/547] Extract path for `Simplenote/Resources/` in const

---
 fastlane/Fastfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index edf56f777..0e6264731 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -35,7 +35,9 @@ SECRETS_ROOT = File.join(Dir.home, '.configure', 'simplenote-ios', 'secrets')
 APP_STORE_CONNECT_KEY_PATH = File.join(SECRETS_ROOT, 'app_store_connect_fastlane_api_key.json')
 $used_test_account_index = nil
 
-RELEASE_NOTES_SOURCE_PATH = File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt')
+APP_RESOURCES_DIR = File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources')
+
+RELEASE_NOTES_SOURCE_PATH = File.join(APP_RESOURCES_DIR, 'release_notes.txt')
 
 GLOTPRESS_BASE_URL = 'https://translate.wordpress.com/projects'
 # Notice the trailing / is required.
@@ -89,7 +91,7 @@ platform :ios do
     }
 
     ios_update_metadata_source(
-      po_file_path: File.join(prj_folder, 'Simplenote', 'Resources', 'AppStoreStrings.pot'),
+      po_file_path: File.join(APP_RESOURCES_DIR, 'AppStoreStrings.pot'),
       source_files: files,
       release_version: version
     )

From 3f2737c07775e773f6acd9ecac75f5f5bb4decbc Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Fri, 16 Aug 2024 11:48:48 +1000
Subject: [PATCH 431/547] Add method to ensure Git branch is a release branch

---
 fastlane/Fastfile | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 0e6264731..943875fe7 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -1027,5 +1027,12 @@ def build_code_next
 end
 
 def release_branch_name(release_version: release_version_current)
-  "release/#{release_version}"
+  "#{RELEASE_BRANCH_ROOT}#{release_version}"
 end
+
+def ensure_git_branch_is_release_branch
+  # Verify that the current branch is a release branch. Notice that `ensure_git_branch` expects a RegEx parameter
+  ensure_git_branch(branch: "^#{RELEASE_BRANCH_ROOT}")
+end
+
+RELEASE_BRANCH_ROOT = 'release/'

From f1e1ebe7e723485ad78a8fdbb96ebbf606e1a469 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Fri, 16 Aug 2024 11:49:30 +1000
Subject: [PATCH 432/547] DRY logic to lint localizations in dedicated lane

---
 fastlane/Fastfile              | 6 ++----
 fastlane/lanes/localization.rb | 4 ++++
 fastlane/lanes/release.rb      | 7 +++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 943875fe7..e38054e2d 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -169,10 +169,8 @@ platform :ios do
 
     download_localized_strings_and_metadata_from_glotpress
 
-    ios_lint_localizations(
-      input_dir: 'Simplenote',
-      allow_retry: true
-    )
+    lint_localizations
+
     ios_bump_version_beta
 
     # Wrap up
diff --git a/fastlane/lanes/localization.rb b/fastlane/lanes/localization.rb
index 6754fa71b..80eafa1bb 100644
--- a/fastlane/lanes/localization.rb
+++ b/fastlane/lanes/localization.rb
@@ -178,6 +178,10 @@ def ensure_default_metadata_are_not_overridden(metadata_files_hash:)
     MSG
     UI.user_error!(override_not_allowed_message) if File.exist?(en_file_path)
   end
+
+  lane :lint_localizations do
+    ios_lint_localizations(input_dir: APP_RESOURCES_DIR, allow_retry: true)
+  end
 end
 
 # Ensure even empty locale folders have an empty `.gitkeep` file.
diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index d5f843904..d888ddb5b 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -69,10 +69,9 @@
   lane :new_beta_release do |options|
     ios_betabuild_prechecks(options)
     download_localized_strings_and_metadata_from_glotpress
-    ios_lint_localizations(
-      input_dir: 'Simplenote',
-      allow_retry: true
-    )
+
+    lint_localizations
+
     ios_bump_version_beta
     trigger_beta_build(branch_to_build: release_branch_name)
   end

From 217e4d93a9de5212980303d8ffbbaadcc692bf6e Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Fri, 16 Aug 2024 12:10:59 +1000
Subject: [PATCH 433/547] Revert ignoring default `release_notes.txt` because
 it fails automation

We already discussed changing the approach so that there is no need to
ignoring this file, see
https://github.com/Automattic/simplenote-ios/pull/1639#discussion_r1718219304
---
 .gitignore | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index c7040702f..2462a624f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,8 +48,6 @@ fastlane/report.xml
 fastlane/README.md
 fastlane/screenshots/
 fastlane/test_output/
-# Ignore Fastlane's default/release_notes.txt because the automation copies it from the Simplenote/Resources/release_notes.txt file in
-fastlane/metadata/default/release_notes.txt
 Preview.html
 build/
 # This is generated by the promo screenshots process

From ab3c7bf32fcc1df305d638553832ed24ca9d06ff Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Fri, 16 Aug 2024 11:55:30 +1000
Subject: [PATCH 434/547] Upgrade `new_beta_release` lane to modern syntax

---
 fastlane/lanes/release.rb | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index d888ddb5b..9e7fcf43d 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -33,7 +33,7 @@
       version_short: release_version_next,
       version_long: build_code_code_freeze
     )
-    UI.success "Done! New Release Version: #{release_version_current}. New Build Code: #{build_code_current}."
+    UI.success "Done! New release version: #{release_version_current}. New build code: #{build_code_current}."
 
     commit_version_and_build_files
 
@@ -64,16 +64,43 @@
     )
 
     trigger_beta_build(branch_to_build: computed_release_branch_name)
+
+    # TODO: Switch to working branch and open back-merge PR
   end
 
-  lane :new_beta_release do |options|
-    ios_betabuild_prechecks(options)
+  lane :new_beta_release do |skip_confirm: false|
+    ensure_git_status_clean
+    ensure_git_branch_is_release_branch
+
+    new_build_code = build_code_next
+    UI.important <<~MESSAGE
+      New beta:
+      • Current build code: #{build_code_current}
+      • New build code: #{new_build_code}
+    MESSAGE
+
+    UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.") unless skip_confirm || UI.confirm('Do you want to continue?')
+
     download_localized_strings_and_metadata_from_glotpress
 
     lint_localizations
 
-    ios_bump_version_beta
+    UI.message "Bumping build code to #{new_build_code}..."
+    PUBLIC_VERSION_FILE.write(
+      version_long: new_build_code
+    )
+    commit_version_and_build_files
+    # Uses build_code_current let user double-check result.
+    UI.success "Done! Release version: #{release_version_current}. New build code: #{build_code_current}."
+
+    UI.important('Pushing changes to remote and triggering the beta build...')
+    UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.") unless skip_confirm || UI.confirm('Do you want to continue?')
+
+    push_to_git_remote(tags: false)
+
     trigger_beta_build(branch_to_build: release_branch_name)
+
+    # TODO: Switch to working branch and open back-merge PR
   end
 
   lane :trigger_beta_build do |branch_to_build:|

From 1042c1a806eb2695480e2773b982110113210988 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Fri, 16 Aug 2024 12:17:10 +1000
Subject: [PATCH 435/547] Update App Store metadata translations

---
 fastlane/metadata/ar-SA/.gitkeep            |  0
 fastlane/metadata/ar-SA/keywords.txt        |  2 +-
 fastlane/metadata/ar-SA/release_notes.txt   |  8 +++--
 fastlane/metadata/ar-SA/subtitle.txt        |  2 +-
 fastlane/metadata/de-DE/.gitkeep            |  0
 fastlane/metadata/de-DE/keywords.txt        |  2 +-
 fastlane/metadata/de-DE/release_notes.txt   |  8 +++--
 fastlane/metadata/de-DE/subtitle.txt        |  2 +-
 fastlane/metadata/default/release_notes.txt |  6 ++++
 fastlane/metadata/es-ES/.gitkeep            |  0
 fastlane/metadata/es-ES/keywords.txt        |  2 +-
 fastlane/metadata/es-ES/release_notes.txt   |  8 +++--
 fastlane/metadata/es-ES/subtitle.txt        |  2 +-
 fastlane/metadata/fr-FR/.gitkeep            |  0
 fastlane/metadata/fr-FR/keywords.txt        |  2 +-
 fastlane/metadata/fr-FR/release_notes.txt   |  8 +++--
 fastlane/metadata/fr-FR/subtitle.txt        |  2 +-
 fastlane/metadata/he/.gitkeep               |  0
 fastlane/metadata/he/description.txt        | 37 +++++++++++++++++++++
 fastlane/metadata/he/keywords.txt           |  1 +
 fastlane/metadata/he/release_notes.txt      |  6 ++++
 fastlane/metadata/he/subtitle.txt           |  1 +
 fastlane/metadata/id/.gitkeep               |  0
 fastlane/metadata/id/keywords.txt           |  2 +-
 fastlane/metadata/id/release_notes.txt      |  8 +++--
 fastlane/metadata/id/subtitle.txt           |  2 +-
 fastlane/metadata/it/.gitkeep               |  0
 fastlane/metadata/it/keywords.txt           |  2 +-
 fastlane/metadata/it/release_notes.txt      |  8 +++--
 fastlane/metadata/it/subtitle.txt           |  2 +-
 fastlane/metadata/ja/.gitkeep               |  0
 fastlane/metadata/ja/keywords.txt           |  2 +-
 fastlane/metadata/ja/release_notes.txt      |  8 +++--
 fastlane/metadata/ja/subtitle.txt           |  2 +-
 fastlane/metadata/ko/.gitkeep               |  0
 fastlane/metadata/ko/keywords.txt           |  2 +-
 fastlane/metadata/ko/release_notes.txt      |  8 +++--
 fastlane/metadata/ko/subtitle.txt           |  2 +-
 fastlane/metadata/nl-NL/.gitkeep            |  0
 fastlane/metadata/nl-NL/keywords.txt        |  2 +-
 fastlane/metadata/nl-NL/release_notes.txt   |  8 +++--
 fastlane/metadata/nl-NL/subtitle.txt        |  2 +-
 fastlane/metadata/pt-BR/.gitkeep            |  0
 fastlane/metadata/pt-BR/keywords.txt        |  2 +-
 fastlane/metadata/pt-BR/release_notes.txt   |  8 +++--
 fastlane/metadata/pt-BR/subtitle.txt        |  2 +-
 fastlane/metadata/ru/.gitkeep               |  0
 fastlane/metadata/ru/keywords.txt           |  2 +-
 fastlane/metadata/ru/release_notes.txt      |  8 +++--
 fastlane/metadata/ru/subtitle.txt           |  2 +-
 fastlane/metadata/sv/.gitkeep               |  0
 fastlane/metadata/sv/keywords.txt           |  2 +-
 fastlane/metadata/sv/release_notes.txt      |  8 +++--
 fastlane/metadata/sv/subtitle.txt           |  2 +-
 fastlane/metadata/tr/.gitkeep               |  0
 fastlane/metadata/tr/keywords.txt           |  2 +-
 fastlane/metadata/tr/release_notes.txt      |  8 +++--
 fastlane/metadata/tr/subtitle.txt           |  2 +-
 fastlane/metadata/zh-Hans/.gitkeep          |  0
 fastlane/metadata/zh-Hans/keywords.txt      |  2 +-
 fastlane/metadata/zh-Hans/release_notes.txt |  8 +++--
 fastlane/metadata/zh-Hans/subtitle.txt      |  2 +-
 fastlane/metadata/zh-Hant/.gitkeep          |  0
 fastlane/metadata/zh-Hant/keywords.txt      |  2 +-
 fastlane/metadata/zh-Hant/release_notes.txt |  8 +++--
 fastlane/metadata/zh-Hant/subtitle.txt      |  2 +-
 66 files changed, 171 insertions(+), 60 deletions(-)
 create mode 100644 fastlane/metadata/ar-SA/.gitkeep
 create mode 100644 fastlane/metadata/de-DE/.gitkeep
 create mode 100644 fastlane/metadata/default/release_notes.txt
 create mode 100644 fastlane/metadata/es-ES/.gitkeep
 create mode 100644 fastlane/metadata/fr-FR/.gitkeep
 create mode 100644 fastlane/metadata/he/.gitkeep
 create mode 100644 fastlane/metadata/he/description.txt
 create mode 100644 fastlane/metadata/he/keywords.txt
 create mode 100644 fastlane/metadata/he/release_notes.txt
 create mode 100644 fastlane/metadata/he/subtitle.txt
 create mode 100644 fastlane/metadata/id/.gitkeep
 create mode 100644 fastlane/metadata/it/.gitkeep
 create mode 100644 fastlane/metadata/ja/.gitkeep
 create mode 100644 fastlane/metadata/ko/.gitkeep
 create mode 100644 fastlane/metadata/nl-NL/.gitkeep
 create mode 100644 fastlane/metadata/pt-BR/.gitkeep
 create mode 100644 fastlane/metadata/ru/.gitkeep
 create mode 100644 fastlane/metadata/sv/.gitkeep
 create mode 100644 fastlane/metadata/tr/.gitkeep
 create mode 100644 fastlane/metadata/zh-Hans/.gitkeep
 create mode 100644 fastlane/metadata/zh-Hant/.gitkeep

diff --git a/fastlane/metadata/ar-SA/.gitkeep b/fastlane/metadata/ar-SA/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/fastlane/metadata/ar-SA/keywords.txt b/fastlane/metadata/ar-SA/keywords.txt
index 7609cc905..be7cee772 100644
--- a/fastlane/metadata/ar-SA/keywords.txt
+++ b/fastlane/metadata/ar-SA/keywords.txt
@@ -1 +1 @@
-ملحوظات,ملحوظة,مهام مصغرة,صحيفة,مذكرات,مزامنة,قائمة مهام,مفكرة,بسيط,مفكرة,وسم قائمة مهام,كتابة,مذكرة
\ No newline at end of file
+ملحوظات,ملحوظة,مهام مصغرة,صحيفة,مذكرات,مزامنة,قائمة مهام,مفكرة,بسيط,مفكرة,وسم قائمة مهام,كتابة,مذكرة
diff --git a/fastlane/metadata/ar-SA/release_notes.txt b/fastlane/metadata/ar-SA/release_notes.txt
index a0b103b47..a91c96a46 100644
--- a/fastlane/metadata/ar-SA/release_notes.txt
+++ b/fastlane/metadata/ar-SA/release_notes.txt
@@ -1,2 +1,6 @@
-- إضافة لون الخلفية إلى مكوّن التعليمات البرمجية في معاينة الوضع الداكن
-- إضافة مربع جانبي كبير للملحوظات
+- تم تمديد دعم اختصارات نظام التشغيل iOS
+- تم إصلاح مشكلة تتمثَّل في فقدان تحديد الملاحظات عند تشغيل التطبيق في الخلفية
+- تم إصلاح مشكلة قد تؤدي إلى تفعيل مفتاح faceid من دون رمز مرور
+- دعم تسجيل الدخول عبر رابط سحري
+- تم تجديد واجهة مستخدم تسجيل الدخول
+
diff --git a/fastlane/metadata/ar-SA/subtitle.txt b/fastlane/metadata/ar-SA/subtitle.txt
index bc3f1692e..42feadee3 100644
--- a/fastlane/metadata/ar-SA/subtitle.txt
+++ b/fastlane/metadata/ar-SA/subtitle.txt
@@ -1 +1 @@
-ملاحظات بسيطة ومهام ومذكرات
\ No newline at end of file
+ملاحظات بسيطة ومهام ومذكرات
diff --git a/fastlane/metadata/de-DE/.gitkeep b/fastlane/metadata/de-DE/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/fastlane/metadata/de-DE/keywords.txt b/fastlane/metadata/de-DE/keywords.txt
index 9c13b0740..a7a4661c2 100644
--- a/fastlane/metadata/de-DE/keywords.txt
+++ b/fastlane/metadata/de-DE/keywords.txt
@@ -1 +1 @@
-Notizen,Markdown,Tagebuch,synchronisieren,To-do-Liste,Cloud,Notizbuch,Schlagwort,Schreiben,Memo
\ No newline at end of file
+Notizen,Markdown,Tagebuch,synchronisieren,To-do-Liste,Cloud,Notizbuch,Schlagwort,Schreiben,Memo
diff --git a/fastlane/metadata/de-DE/release_notes.txt b/fastlane/metadata/de-DE/release_notes.txt
index 4ecb01e49..3f6dfa710 100644
--- a/fastlane/metadata/de-DE/release_notes.txt
+++ b/fastlane/metadata/de-DE/release_notes.txt
@@ -1,2 +1,6 @@
-- Hintergrundfarbe zum Codeblock in der Vorschau im dunklen Modus hinzugefügt
-- Widget für große Notizen hinzugefügt
+- Erweiterter Support für iOS-Kurzbefehle
+- Fehler behoben, durch den die Notizenauswahl verloren ging, wenn die App im Hintergrund lief
+- Fehler behoben, durch den der Wechsel zu Face ID ohne Zugangscode aktiviert wurde
+- Support für die Anmeldung mit magischem Link
+- Anmelde-UI wurde überarbeitet
+
diff --git a/fastlane/metadata/de-DE/subtitle.txt b/fastlane/metadata/de-DE/subtitle.txt
index a8c452986..47531bbcd 100644
--- a/fastlane/metadata/de-DE/subtitle.txt
+++ b/fastlane/metadata/de-DE/subtitle.txt
@@ -1 +1 @@
-Notizen, To-do-Listen, Memos
\ No newline at end of file
+Notizen, To-do-Listen, Memos
diff --git a/fastlane/metadata/default/release_notes.txt b/fastlane/metadata/default/release_notes.txt
new file mode 100644
index 000000000..a9bcf28d6
--- /dev/null
+++ b/fastlane/metadata/default/release_notes.txt
@@ -0,0 +1,6 @@
+- Extended support for iOS Shortcuts
+- Fixed issue where notes selection was lost when app backgrounded
+- Fixed an issue can activate the faceid switch without a passcode
+- Magic Link Login Support
+- Login UI has been overhauled
+
diff --git a/fastlane/metadata/es-ES/.gitkeep b/fastlane/metadata/es-ES/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/fastlane/metadata/es-ES/keywords.txt b/fastlane/metadata/es-ES/keywords.txt
index 6eb80d7c9..02d3ddcda 100644
--- a/fastlane/metadata/es-ES/keywords.txt
+++ b/fastlane/metadata/es-ES/keywords.txt
@@ -1 +1 @@
-notas,nota,markdown,diario,sincronizar,lista,nube,simple,bloc,etiqueta,tarea,escribir,recordatorio
\ No newline at end of file
+notas,nota,markdown,diario,sincronizar,lista,nube,simple,bloc,etiqueta,tarea,escribir,recordatorio
diff --git a/fastlane/metadata/es-ES/release_notes.txt b/fastlane/metadata/es-ES/release_notes.txt
index 6e18aea31..4feea5979 100644
--- a/fastlane/metadata/es-ES/release_notes.txt
+++ b/fastlane/metadata/es-ES/release_notes.txt
@@ -1,2 +1,6 @@
-- Añadir color de fondo al bloque de código en la vista previa del modo oscuro 
-- Añadir widget grande de notas
+- Mayor compatibilidad con los accesos directos de iOS
+- Se ha solucionado un problema por el que se perdía la selección de notas al pasar la aplicación a segundo plano
+- Se ha solucionado un problema; ya se puede activar el interruptor de ID facial sin un código de acceso
+- Compatibilidad con el acceso mediante enlaces mágicos
+- Se ha revisado la interfaz de acceso
+
diff --git a/fastlane/metadata/es-ES/subtitle.txt b/fastlane/metadata/es-ES/subtitle.txt
index bfd5a25df..4ef53e063 100644
--- a/fastlane/metadata/es-ES/subtitle.txt
+++ b/fastlane/metadata/es-ES/subtitle.txt
@@ -1 +1 @@
-Notas, tareas y recordatorios
\ No newline at end of file
+Notas, tareas y recordatorios
diff --git a/fastlane/metadata/fr-FR/.gitkeep b/fastlane/metadata/fr-FR/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/fastlane/metadata/fr-FR/keywords.txt b/fastlane/metadata/fr-FR/keywords.txt
index e1f13d298..0af652e03 100644
--- a/fastlane/metadata/fr-FR/keywords.txt
+++ b/fastlane/metadata/fr-FR/keywords.txt
@@ -1 +1 @@
-notes,note,markdown,journal,synchronisation,todo,liste,cloud,notebook,simple,notepad,écrire
\ No newline at end of file
+notes,note,markdown,journal,synchronisation,todo,liste,cloud,notebook,simple,notepad,écrire
diff --git a/fastlane/metadata/fr-FR/release_notes.txt b/fastlane/metadata/fr-FR/release_notes.txt
index 0a225f22e..cafd3fe43 100644
--- a/fastlane/metadata/fr-FR/release_notes.txt
+++ b/fastlane/metadata/fr-FR/release_notes.txt
@@ -1,2 +1,6 @@
-- Ajouter une couleur d’arrière-plan au bloc de code dans l’aperçu en mode sombre
-- Ajouter un grand widget de remarque
+- Prise en charge étendue des raccourcis sur iOS
+- Correction d’un problème de perte de la sélection de notes lors du passage de l’application en arrière-plan
+- Correction d’un problème susceptible d’activer le basculement vers Face ID sans mot de passe
+- Prise en charge de la connexion par lien magique
+- Interface utilisateur de connexion remaniée
+
diff --git a/fastlane/metadata/fr-FR/subtitle.txt b/fastlane/metadata/fr-FR/subtitle.txt
index 966fe68d2..200b92876 100644
--- a/fastlane/metadata/fr-FR/subtitle.txt
+++ b/fastlane/metadata/fr-FR/subtitle.txt
@@ -1 +1 @@
-Notes, tâches et mémos simples
\ No newline at end of file
+Notes, tâches et mémos simples
diff --git a/fastlane/metadata/he/.gitkeep b/fastlane/metadata/he/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/fastlane/metadata/he/description.txt b/fastlane/metadata/he/description.txt
new file mode 100644
index 000000000..f0df9e38d
--- /dev/null
+++ b/fastlane/metadata/he/description.txt
@@ -0,0 +1,37 @@
+האפליקציה Simplenote היא דרך קלה לרשום פתקים, ליצור רשימת משימות, לתעד רעיונות ועוד. פותחים את האפליקציה, רושמים כמה מחשבות, וזה הכול. כשיש לך הרבה פריטים באוסף, אפשר לשמור על הסדר באמצעות תגיות ונעצים ולמצוא את מה שנדרש לך בחיפוש מיידי. מאחר ש-Simplenote תסתנכרן בין כל המכשירים שלך, הפתקים שלך תמיד יהיו זמינים לשימושך בכל עת.
+
+- חוויית שימוש פשוטה ברישום פתקים
+- לסנכרן את כל התוכן בין כל המכשירים שלך
+- לעבוד יחד ולשתף פתקים
+- לשמור על סדר בעזרת תגיות
+- להתחבר לאימייל או לחשבון שלך ב-WordPress.com
+
+לסנכרן ללא חשש
+- לסנכרן באופן יעיל ואוטומטי את התוכן בין המחשב, הטלפון והטאבלט.
+- ניתן לגבות ולסנכרן את כל התוכן במהלך הכתיבה של הפתקים ולא לאבד תוכן לעולם.
+
+לעבוד יחד ולשתף פתקים
+- לשתף פעולה ולעבוד יחד – לחלוק רעיונות עם עמיתים או לכתוב רשימת קניות עם השותפים לדירה.
+- ניתן לבחור אם ברצונך לפרסם את התוכן שיצרת ברשת או לשתף קישור עם אנשים מסוימים לבחירתך.
+- ניתן לפרסם את התוכן ישירות לאתר שלך ב-WordPress.com באמצעות התחברות לחשבון שלך ב-WordPress.com.
+- אפשר לשתף את התוכן במהירות ובקלות באפליקציות של צד שלישי.
+
+לארגן ולחפש
+- אפשר להקפיד על ארגון בעזרת תגיות ולהשתמש בהן כדי לחפש פתקים ולמיין אותם מהר.
+- ניתן למצוא כל מה שברצונך לחפש באופן מיידי בעזרת הדגשה של מילות מפתח.
+- ניתן להשתמש ב-Markdown כדי להוסיף עיצוב.
+- ליצור רשימת משימות.
+- לבחור את סדר התצוגה של הפתקים והתגיות שלך.
+- לנעוץ את הפתקים שנמצאים בשימוש נפוץ.
+- לערוך תגיות באמצעות שינוי השם או הסדר.
+- להגן על התוכן שלך באמצעות קוד גישה.
+
+--
+
+מדיניות פרטיות: https://automattic.com/privacy/
+תנאי שימוש: https://simplenote.com/terms/
+הודעת פרטיות למשתמשים בקליפורניה: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+
+--
+
+יש לעבור לאתר simplenote.com ולהוריד את Simplenote למכשירים הנוספים שלך.
diff --git a/fastlane/metadata/he/keywords.txt b/fastlane/metadata/he/keywords.txt
new file mode 100644
index 000000000..a2e547a5d
--- /dev/null
+++ b/fastlane/metadata/he/keywords.txt
@@ -0,0 +1 @@
+פתקים,פתק,סימון,markdown,יומן,סנכרון,לביצוע,רשימה,ענן,מחברת,פשוט,notepad,תג,כתיבה,תזכורת
diff --git a/fastlane/metadata/he/release_notes.txt b/fastlane/metadata/he/release_notes.txt
new file mode 100644
index 000000000..d91b5a301
--- /dev/null
+++ b/fastlane/metadata/he/release_notes.txt
@@ -0,0 +1,6 @@
+- תמיכה מורחבת לקיצורים של iOS
+- תיקנו בעיה שגרמה לאיבוד של בחירת פתקים כאשר האפליקציה מועברת לרקע
+- תיקנו בעיה שאפשרה הפעלה של Face ID גם בלי קוד סיסמה
+- תמיכה בהתחברות באמצעות קישור ישיר
+- ממשק המשתמש של תהליך ההתחברות שודרג
+
diff --git a/fastlane/metadata/he/subtitle.txt b/fastlane/metadata/he/subtitle.txt
new file mode 100644
index 000000000..8d04c0521
--- /dev/null
+++ b/fastlane/metadata/he/subtitle.txt
@@ -0,0 +1 @@
+פתקים, רשימות לביצוע ותזכורות
diff --git a/fastlane/metadata/id/.gitkeep b/fastlane/metadata/id/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/fastlane/metadata/id/keywords.txt b/fastlane/metadata/id/keywords.txt
index 0ed58918b..6cea874d3 100644
--- a/fastlane/metadata/id/keywords.txt
+++ b/fastlane/metadata/id/keywords.txt
@@ -1 +1 @@
-catatan,teks,markdown,jurnal,sinkronisasi,daftar,tugas,cloud,notebook,simpel,notepad,tag,tugas
\ No newline at end of file
+catatan,teks,markdown,jurnal,sinkronisasi,daftar,tugas,cloud,notebook,simpel,notepad,tag,tugas
diff --git a/fastlane/metadata/id/release_notes.txt b/fastlane/metadata/id/release_notes.txt
index ffcec52c7..4a225afaa 100644
--- a/fastlane/metadata/id/release_notes.txt
+++ b/fastlane/metadata/id/release_notes.txt
@@ -1,2 +1,6 @@
-- Menambahkan warna latar belakang ke blok kode dalam pratinjau mode gelap
-- Menambahkan widget catatan besar
+- Peningkatan dukungan untuk Pintasan iOS
+- Perbaikan masalah hilangnya pemilihan catatan saat aplikasi dijalankan di latar belakang
+- Perbaikan masalah aktivasi tombol faceid tanpa kode sandi
+- Dukungan Login Tautan Ajaib
+- Perombakan UI Login
+
diff --git a/fastlane/metadata/id/subtitle.txt b/fastlane/metadata/id/subtitle.txt
index e4fd67b3c..a26e9331e 100644
--- a/fastlane/metadata/id/subtitle.txt
+++ b/fastlane/metadata/id/subtitle.txt
@@ -1 +1 @@
-Catatan, tugas, dan memo
\ No newline at end of file
+Catatan, tugas, dan memo
diff --git a/fastlane/metadata/it/.gitkeep b/fastlane/metadata/it/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/fastlane/metadata/it/keywords.txt b/fastlane/metadata/it/keywords.txt
index 8f861a182..f0ac1ba23 100644
--- a/fastlane/metadata/it/keywords.txt
+++ b/fastlane/metadata/it/keywords.txt
@@ -1 +1 @@
-appunti,appunto,markdown,diario,sincronizzazione,checklist,cloud,blocco,semplice,notepad,tag
\ No newline at end of file
+appunti,appunto,markdown,diario,sincronizzazione,checklist,cloud,blocco,semplice,notepad,tag
diff --git a/fastlane/metadata/it/release_notes.txt b/fastlane/metadata/it/release_notes.txt
index 77de6ddc6..f5ee20a2e 100644
--- a/fastlane/metadata/it/release_notes.txt
+++ b/fastlane/metadata/it/release_notes.txt
@@ -1,2 +1,6 @@
-- Aggiungere il colore di sfondo al blocco di codice nell'anteprima in modalità scura
-- Aggiungere widget nota di grandi dimensioni
+- Supporto esteso per Tasti di scelta rapida di iOS
+- Risolto un problema per cui la selezione delle note andava persa quando l'app era in background
+- Risolto un problema per cui FaceID poteva essere attivato senza PIN
+- Supporto per l'accesso tramite link magico
+- La UI di accesso è stata revisionata
+
diff --git a/fastlane/metadata/it/subtitle.txt b/fastlane/metadata/it/subtitle.txt
index f5c046a0e..fd9ca3b1c 100644
--- a/fastlane/metadata/it/subtitle.txt
+++ b/fastlane/metadata/it/subtitle.txt
@@ -1 +1 @@
-Appunti, checklist e memo
\ No newline at end of file
+Appunti, checklist e memo
diff --git a/fastlane/metadata/ja/.gitkeep b/fastlane/metadata/ja/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/fastlane/metadata/ja/keywords.txt b/fastlane/metadata/ja/keywords.txt
index a0474d2aa..4e483358d 100644
--- a/fastlane/metadata/ja/keywords.txt
+++ b/fastlane/metadata/ja/keywords.txt
@@ -1 +1 @@
-注意,メモ,Markdown,日記,同期,ToDo,リスト,クラウド,ノートブック,シンプル,メモ帳,タグ,ToDo,投稿,メモ
\ No newline at end of file
+注意,メモ,Markdown,日記,同期,ToDo,リスト,クラウド,ノートブック,シンプル,メモ帳,タグ,ToDo,投稿,メモ
diff --git a/fastlane/metadata/ja/release_notes.txt b/fastlane/metadata/ja/release_notes.txt
index 2a7b7876e..abf6d8542 100644
--- a/fastlane/metadata/ja/release_notes.txt
+++ b/fastlane/metadata/ja/release_notes.txt
@@ -1,2 +1,6 @@
-- ダークモードプレビューでコードブロックに背景色を追加します
-- 大きいメモウィジェットを追加します
+- iOS ショートカットのサポートを拡張しました
+- アプリがバックグランドで実行される際、メモの選択が失われていた問題を修正しました
+- パスコードなしで FaceID の切り替えを有効化できた問題を修正しました
+- マジックリンクでのログインに対するサポート
+- ログイン UI が刷新されました
+
diff --git a/fastlane/metadata/ja/subtitle.txt b/fastlane/metadata/ja/subtitle.txt
index cf70022b3..4302d53c8 100644
--- a/fastlane/metadata/ja/subtitle.txt
+++ b/fastlane/metadata/ja/subtitle.txt
@@ -1 +1 @@
-ノート、ToDo リスト、メモをよりシンプルに
\ No newline at end of file
+ノート、ToDo リスト、メモをよりシンプルに
diff --git a/fastlane/metadata/ko/.gitkeep b/fastlane/metadata/ko/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/fastlane/metadata/ko/keywords.txt b/fastlane/metadata/ko/keywords.txt
index a6d41c5db..b42d39249 100644
--- a/fastlane/metadata/ko/keywords.txt
+++ b/fastlane/metadata/ko/keywords.txt
@@ -1 +1 @@
-기록,노트,마크다운,일기,동기화,할일목록,목록,클라우드,공책,심플,메모장,태그,할일,글쓰기,메모
\ No newline at end of file
+기록,노트,마크다운,일기,동기화,할일목록,목록,클라우드,공책,심플,메모장,태그,할일,글쓰기,메모
diff --git a/fastlane/metadata/ko/release_notes.txt b/fastlane/metadata/ko/release_notes.txt
index 97763a1f0..42dff9082 100644
--- a/fastlane/metadata/ko/release_notes.txt
+++ b/fastlane/metadata/ko/release_notes.txt
@@ -1,2 +1,6 @@
-- 어둡게 모드 미리보기의 코드 블록에 배경 색상 추가
-- 큰 메모 위젯 추가
+- iOS Shortcuts에 대한 지원 연장됨
+- 앱이 백그라운드에서 실행될 때 메모 선택 항목이 사라지던 문제가 해결됨
+- 비밀번호 없이도 FaceID 스위치를 활성화할 수 있는 문제가 해결됨
+- 매직 링크 로그인 지원
+- 로그인 UI가 개편됨
+
diff --git a/fastlane/metadata/ko/subtitle.txt b/fastlane/metadata/ko/subtitle.txt
index e8ad5d866..433047e7c 100644
--- a/fastlane/metadata/ko/subtitle.txt
+++ b/fastlane/metadata/ko/subtitle.txt
@@ -1 +1 @@
-간단한 기록, 할 일 목록, 메모
\ No newline at end of file
+간단한 기록, 할 일 목록, 메모
diff --git a/fastlane/metadata/nl-NL/.gitkeep b/fastlane/metadata/nl-NL/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/fastlane/metadata/nl-NL/keywords.txt b/fastlane/metadata/nl-NL/keywords.txt
index 1103f8e33..aec8c9704 100644
--- a/fastlane/metadata/nl-NL/keywords.txt
+++ b/fastlane/metadata/nl-NL/keywords.txt
@@ -1 +1 @@
-notities,tekst,markdown,dagboek,synchroniseren,to-do,cloud,eenvoudig,tag,schrijven,memo
\ No newline at end of file
+notities,tekst,markdown,dagboek,synchroniseren,to-do,cloud,eenvoudig,tag,schrijven,memo
diff --git a/fastlane/metadata/nl-NL/release_notes.txt b/fastlane/metadata/nl-NL/release_notes.txt
index 8030c55f6..fabc36568 100644
--- a/fastlane/metadata/nl-NL/release_notes.txt
+++ b/fastlane/metadata/nl-NL/release_notes.txt
@@ -1,2 +1,6 @@
-- Een achtergrondkleur toegevoegd aan het codeblok in de voorbeeldweergave van de donkere modus
-- Een grote notitie-widget toegevoegd
+- Uitgebreide ondersteuning voor iOS Shortcuts
+- Probleem opgelost waarbij de selectie van notities verloren ging als de app op de achtergrond draaide
+- Probleem opgelost waarbij de FaceID veranderd kon worden zonder wachtwoordcode
+- Ondersteuning voor inloggen via magische link
+- De UI voor het inloggen heeft een opknapbeurt gekregen
+
diff --git a/fastlane/metadata/nl-NL/subtitle.txt b/fastlane/metadata/nl-NL/subtitle.txt
index aa0c49ad1..910b1630c 100644
--- a/fastlane/metadata/nl-NL/subtitle.txt
+++ b/fastlane/metadata/nl-NL/subtitle.txt
@@ -1 +1 @@
-Notities, taken en memo's
\ No newline at end of file
+Notities, taken en memo's
diff --git a/fastlane/metadata/pt-BR/.gitkeep b/fastlane/metadata/pt-BR/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/fastlane/metadata/pt-BR/keywords.txt b/fastlane/metadata/pt-BR/keywords.txt
index c045440a7..a4752ea11 100644
--- a/fastlane/metadata/pt-BR/keywords.txt
+++ b/fastlane/metadata/pt-BR/keywords.txt
@@ -1 +1 @@
-anotações,anotaçãp,markdown,diário,sincronização,tarefas,lista,nuvem,bloco de notas,simples,tag
\ No newline at end of file
+anotações,anotaçãp,markdown,diário,sincronização,tarefas,lista,nuvem,bloco de notas,simples,tag
diff --git a/fastlane/metadata/pt-BR/release_notes.txt b/fastlane/metadata/pt-BR/release_notes.txt
index e33553de7..4bcf14a70 100644
--- a/fastlane/metadata/pt-BR/release_notes.txt
+++ b/fastlane/metadata/pt-BR/release_notes.txt
@@ -1,2 +1,6 @@
-- Adição de cor de fundo ao bloco de código na visualização do modo escuro
-- Adição do widget de anotação grande
+- Suporte estendido para os Atalhos do iOS
+- Problema corrigido em que a seleção de notas era perdida quando o aplicativo ficava em segundo plano
+- Problema corrigido para ativar a configuração do Face ID sem uma senha
+- Suporte para login com link mágico
+- A IU de login foi modificada
+
diff --git a/fastlane/metadata/pt-BR/subtitle.txt b/fastlane/metadata/pt-BR/subtitle.txt
index 20066af09..d0e6dd18e 100644
--- a/fastlane/metadata/pt-BR/subtitle.txt
+++ b/fastlane/metadata/pt-BR/subtitle.txt
@@ -1 +1 @@
-Anotações, tarefas e recados
\ No newline at end of file
+Anotações, tarefas e recados
diff --git a/fastlane/metadata/ru/.gitkeep b/fastlane/metadata/ru/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/fastlane/metadata/ru/keywords.txt b/fastlane/metadata/ru/keywords.txt
index 1c57c3a06..2e8ac572b 100644
--- a/fastlane/metadata/ru/keywords.txt
+++ b/fastlane/metadata/ru/keywords.txt
@@ -1 +1 @@
-примечания, заметка, разметка, журнал, синхронизация, список дел, список, облако, записная книжка
\ No newline at end of file
+примечания, заметка, разметка, журнал, синхронизация, список дел, список, облако, записная книжка
diff --git a/fastlane/metadata/ru/release_notes.txt b/fastlane/metadata/ru/release_notes.txt
index f778cd935..4a73a2020 100644
--- a/fastlane/metadata/ru/release_notes.txt
+++ b/fastlane/metadata/ru/release_notes.txt
@@ -1,2 +1,6 @@
-— В предварительный просмотр блока "Код" в тёмном режиме добавлен цвет фона.
-— Добавлен большой виджет заметок.
+- Расширенная поддержка ярлыков iOS.
+- Исправлена ошибка, из-за которой выбор заметок сбрасывался при переходе приложения в фоновый режим.
+- Исправлена ошибка, из-за которой Face ID переключался без пароля.
+- Поддержка входа по волшебной ссылке.
+- Переработан интерфейс входа в систему.
+
diff --git a/fastlane/metadata/ru/subtitle.txt b/fastlane/metadata/ru/subtitle.txt
index 9b88ecae7..bc41693eb 100644
--- a/fastlane/metadata/ru/subtitle.txt
+++ b/fastlane/metadata/ru/subtitle.txt
@@ -1 +1 @@
-Примечания, списки, заметки
\ No newline at end of file
+Примечания, списки, заметки
diff --git a/fastlane/metadata/sv/.gitkeep b/fastlane/metadata/sv/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/fastlane/metadata/sv/keywords.txt b/fastlane/metadata/sv/keywords.txt
index 67b3d33c4..e61ccd39b 100644
--- a/fastlane/metadata/sv/keywords.txt
+++ b/fastlane/metadata/sv/keywords.txt
@@ -1 +1 @@
-примечания,заметка,разметка,журнал,синхронизация,список дел,список,облако,записная книжка,простой
\ No newline at end of file
+примечания,заметка,разметка,журнал,синхронизация,список дел,список,облако,записная книжка,простой
diff --git a/fastlane/metadata/sv/release_notes.txt b/fastlane/metadata/sv/release_notes.txt
index c3eb68060..9a83a80f9 100644
--- a/fastlane/metadata/sv/release_notes.txt
+++ b/fastlane/metadata/sv/release_notes.txt
@@ -1,2 +1,6 @@
-- Lägg till bakgrundsfärg till kodblocket vid förhandsgranskning i mörkt läge
-- Lägg till widget för stora anteckningar
+- Vi har utökat stödet för iOS-genvägar
+- Vi har åtgärdat ett problem som gjorde att anteckningsval gick förlorade när appen placerades i bakgrunden
+- Vi har åtgärdat ett problem som gjorde att omkopplaren för ansiktsidentifiering kunde aktiveras utan en lösenkod
+- Stöd för inloggning via magisk länk
+- Användargränssnittet för inloggning har fått en översyn
+
diff --git a/fastlane/metadata/sv/subtitle.txt b/fastlane/metadata/sv/subtitle.txt
index 9620ac9ce..46bfed826 100644
--- a/fastlane/metadata/sv/subtitle.txt
+++ b/fastlane/metadata/sv/subtitle.txt
@@ -1 +1 @@
-Enkla anteckningar och memon
\ No newline at end of file
+Enkla anteckningar och memon
diff --git a/fastlane/metadata/tr/.gitkeep b/fastlane/metadata/tr/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/fastlane/metadata/tr/keywords.txt b/fastlane/metadata/tr/keywords.txt
index 8130ed4e3..18fda9249 100644
--- a/fastlane/metadata/tr/keywords.txt
+++ b/fastlane/metadata/tr/keywords.txt
@@ -1 +1 @@
-not,planlama,günlük,eşitle,yapılacaklar,bulut,defter,basit,not defteri,etiket,işler,yazı,hatırlatma
\ No newline at end of file
+not,planlama,günlük,eşitle,yapılacaklar,bulut,defter,basit,not defteri,etiket,işler,yazı,hatırlatma
diff --git a/fastlane/metadata/tr/release_notes.txt b/fastlane/metadata/tr/release_notes.txt
index fffd73b49..cb9b7078e 100644
--- a/fastlane/metadata/tr/release_notes.txt
+++ b/fastlane/metadata/tr/release_notes.txt
@@ -1,2 +1,6 @@
-- Karanlık mod önizlemesinde kod blokuna arka plan rengi ekleyin
-- Büyük not bileşeni ekleyin
+- iOS Kısayollar için genişletilmiş destek
+- Uygulama arkaplandayken not seçiminin kaybolmasına neden olan sorun düzeltildi
+- Şifre olmadan FaceID anahtarını etkinleştirebilen bir sorun düzeltildi
+- Sihirli Bağlantı Oturum Açma Desteği
+- Oturum açma kullanıcı arayüzü değiştirildi
+
diff --git a/fastlane/metadata/tr/subtitle.txt b/fastlane/metadata/tr/subtitle.txt
index ca9514cd0..7f78f2803 100644
--- a/fastlane/metadata/tr/subtitle.txt
+++ b/fastlane/metadata/tr/subtitle.txt
@@ -1 +1 @@
-Basit not ve listeler
\ No newline at end of file
+Basit not ve listeler
diff --git a/fastlane/metadata/zh-Hans/.gitkeep b/fastlane/metadata/zh-Hans/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/fastlane/metadata/zh-Hans/keywords.txt b/fastlane/metadata/zh-Hans/keywords.txt
index 968552717..4577ded2b 100644
--- a/fastlane/metadata/zh-Hans/keywords.txt
+++ b/fastlane/metadata/zh-Hans/keywords.txt
@@ -1 +1 @@
-备注、文本、markdown、日志、日记、同步、待办事项、云、笔记本、简单、记事本、标记、待办事项、写作、备忘录
\ No newline at end of file
+备注、文本、markdown、日志、日记、同步、待办事项、云、笔记本、简单、记事本、标记、待办事项、写作、备忘录
diff --git a/fastlane/metadata/zh-Hans/release_notes.txt b/fastlane/metadata/zh-Hans/release_notes.txt
index d0b4d810c..c7042ba86 100644
--- a/fastlane/metadata/zh-Hans/release_notes.txt
+++ b/fastlane/metadata/zh-Hans/release_notes.txt
@@ -1,2 +1,6 @@
-- 在深色模式预览中向代码区块添加了背景颜色
-- 添加大的笔记小工具
+- 扩展了对 iOS 快捷方式的支持
+- 修复了当应用程序处于后台时丢失注释选择的问题
+- 修复了无需密码即可激活 FaceID 切换开关的问题
+- 新增对使用免密登录链接进行登录的支持
+- 登录用户界面已全面改版
+
diff --git a/fastlane/metadata/zh-Hans/subtitle.txt b/fastlane/metadata/zh-Hans/subtitle.txt
index e2f931aec..5907655e2 100644
--- a/fastlane/metadata/zh-Hans/subtitle.txt
+++ b/fastlane/metadata/zh-Hans/subtitle.txt
@@ -1 +1 @@
-简明的备注、待办事项和备忘录
\ No newline at end of file
+简明的备注、待办事项和备忘录
diff --git a/fastlane/metadata/zh-Hant/.gitkeep b/fastlane/metadata/zh-Hant/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/fastlane/metadata/zh-Hant/keywords.txt b/fastlane/metadata/zh-Hant/keywords.txt
index 2c5acd0a8..676a44305 100644
--- a/fastlane/metadata/zh-Hant/keywords.txt
+++ b/fastlane/metadata/zh-Hant/keywords.txt
@@ -1 +1 @@
-記事, 筆記, markdown, 日誌, 同步, 待辦事項, 清單, 雲端, 筆記本, 簡單, 記事本, 標籤, 待辦事項, 待處理, 備忘錄
\ No newline at end of file
+記事, 筆記, markdown, 日誌, 同步, 待辦事項, 清單, 雲端, 筆記本, 簡單, 記事本, 標籤, 待辦事項, 待處理, 備忘錄
diff --git a/fastlane/metadata/zh-Hant/release_notes.txt b/fastlane/metadata/zh-Hant/release_notes.txt
index b2ac39008..2949fda75 100644
--- a/fastlane/metadata/zh-Hant/release_notes.txt
+++ b/fastlane/metadata/zh-Hant/release_notes.txt
@@ -1,2 +1,6 @@
-- 在深色模式預覽中為程式碼區塊新增了背景顏色
-- 新增了大型筆記的小工具
+- 已延長 iOS 捷徑支援
+- 已修正應用程式在背景執行時遺失備註選取的問題
+- 已修正不須使用密碼啟用 FaceID 切換的問題
+- 神奇連結登入支援
+- 登入 UI 已經過徹底改造
+
diff --git a/fastlane/metadata/zh-Hant/subtitle.txt b/fastlane/metadata/zh-Hant/subtitle.txt
index 12e876a79..e8a28a8cc 100644
--- a/fastlane/metadata/zh-Hant/subtitle.txt
+++ b/fastlane/metadata/zh-Hant/subtitle.txt
@@ -1 +1 @@
-簡單好用的筆記、待辦事項和備忘錄
\ No newline at end of file
+簡單好用的筆記、待辦事項和備忘錄

From 174d4407855c517bedf478f5c8e367fbe9ece6f0 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Fri, 16 Aug 2024 12:17:10 +1000
Subject: [PATCH 436/547] Trim ar-SA keywords to be less than 100 characters

---
 fastlane/metadata/ar-SA/keywords.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/metadata/ar-SA/keywords.txt b/fastlane/metadata/ar-SA/keywords.txt
index be7cee772..66c12533b 100644
--- a/fastlane/metadata/ar-SA/keywords.txt
+++ b/fastlane/metadata/ar-SA/keywords.txt
@@ -1 +1 @@
-ملحوظات,ملحوظة,مهام مصغرة,صحيفة,مذكرات,مزامنة,قائمة مهام,مفكرة,بسيط,مفكرة,وسم قائمة مهام,كتابة,مذكرة
+ملحوظات,ملحوظة,مهام مصغرة,صحيفة,مذكرات,مزامنة,قائمة مهام,مفكرة,بسيط,مفكرة,وسم قائمة مهام,كتابة
\ No newline at end of file

From cfe4aafeec7f491ac0bbfa42f10463eddc8f9eec Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Fri, 16 Aug 2024 12:17:10 +1000
Subject: [PATCH 437/547] Bump version number

---
 config/Version.Public.xcconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/Version.Public.xcconfig b/config/Version.Public.xcconfig
index 84f2ffd58..6d9c88697 100644
--- a/config/Version.Public.xcconfig
+++ b/config/Version.Public.xcconfig
@@ -1,2 +1,2 @@
-VERSION_LONG = 4.52.0.3
+VERSION_LONG = 4.52.0.4
 VERSION_SHORT = 4.52

From 01bf15923ba8ff233faf99fe7fc8fea86f7f26cb Mon Sep 17 00:00:00 2001
From: Ian Maia <ian.maia@automattic.com>
Date: Thu, 29 Aug 2024 13:54:30 +0200
Subject: [PATCH 438/547] Run Danger on Buildkite Linter queue

---
 .buildkite/pipeline.yml          | 18 ++++++++++++------
 .github/workflows/run-danger.yml | 16 ++++++++++------
 Gemfile.lock                     | 26 ++++++++++++--------------
 3 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 3357f122e..434a20632 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -19,14 +19,20 @@ steps:
   #################
   # Linters
   #################
+  - label: "☢️ Danger - PR Check"
+    command: danger
+    key: danger
+    if: "build.pull_request.id != null"
+    retry:
+      manual:
+        permit_on_passed: true
+    agents:
+      queue: "linter"
+
   - label: ":swift: SwiftLint"
-    command: run_swiftlint --strict
-    plugins: [$CI_TOOLKIT_PLUGIN]
-    notify:
-      - github_commit_status:
-          context: "SwiftLint"
+    command: swiftlint
     agents:
-      queue: "default"
+      queue: "linter"
 
   #################
   # Create Installable Build
diff --git a/.github/workflows/run-danger.yml b/.github/workflows/run-danger.yml
index 856ab8cea..874acdde2 100644
--- a/.github/workflows/run-danger.yml
+++ b/.github/workflows/run-danger.yml
@@ -1,13 +1,17 @@
-name: ☢️ Danger
+name: ☢️ Trigger Danger On Buildkite
 
 on:
   pull_request:
-    types: [opened, reopened, ready_for_review, synchronize, edited, labeled, unlabeled, milestoned, demilestoned]
+    types: [labeled, unlabeled, milestoned, demilestoned, ready_for_review]
 
 jobs:
   dangermattic:
-    # runs on draft PRs only for opened / synchronize events
-    if: ${{ (github.event.pull_request.draft == false) || (github.event.pull_request.draft == true && contains(fromJSON('["opened", "synchronize"]'), github.event.action)) }}
-    uses: Automattic/dangermattic/.github/workflows/reusable-run-danger.yml@v1.0.0
+    if: ${{ (github.event.pull_request.draft == false) }}
+    uses: Automattic/dangermattic/.github/workflows/reusable-retry-buildkite-step-on-events.yml@v1.1.2
+    with:
+      org-slug: "automattic"
+      pipeline-slug: "simplenote-ios"
+      retry-step-key: "danger"
+      build-commit-sha: "${{ github.event.pull_request.head.sha }}"
     secrets:
-      github-token: ${{ secrets.DANGERMATTIC_GITHUB_TOKEN }}
+      buildkite-api-token: ${{ secrets.TRIGGER_BK_BUILD_TOKEN }}
diff --git a/Gemfile.lock b/Gemfile.lock
index 006e2ecdc..99f722ff7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -95,7 +95,7 @@ GEM
     connection_pool (2.4.1)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (9.4.3)
+    danger (9.5.0)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
@@ -105,17 +105,16 @@ GEM
       git (~> 1.13)
       kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.0)
-      no_proxy_fix
       octokit (>= 4.0)
       terminal-table (>= 1, < 4)
-    danger-dangermattic (1.0.2)
+    danger-dangermattic (1.1.2)
       danger (~> 9.4)
       danger-plugin-api (~> 1.0)
-      danger-rubocop (~> 0.12)
-      rubocop (~> 1.61)
+      danger-rubocop (~> 0.13)
+      rubocop (~> 1.63)
     danger-plugin-api (1.0.0)
       danger (> 2.0)
-    danger-rubocop (0.12.0)
+    danger-rubocop (0.13.0)
       danger
       rubocop (~> 1.0)
     declarative (0.0.20)
@@ -293,7 +292,6 @@ GEM
     naturally (2.2.1)
     netrc (0.11.0)
     nkf (0.2.0)
-    no_proxy_fix (0.1.2)
     nokogiri (1.16.7-arm64-darwin)
       racc (~> 1.4)
     nokogiri (1.16.7-x86_64-linux)
@@ -305,8 +303,8 @@ GEM
     options (2.3.2)
     optparse (0.5.0)
     os (1.1.4)
-    parallel (1.25.1)
-    parser (3.3.1.0)
+    parallel (1.26.3)
+    parser (3.3.4.2)
       ast (~> 2.4.1)
       racc
     plist (3.7.1)
@@ -314,13 +312,13 @@ GEM
       highline (>= 1.6)
       options (~> 2.3.0)
     public_suffix (4.0.7)
-    racc (1.8.0)
+    racc (1.8.1)
     rainbow (3.1.1)
     rake (13.2.1)
     rake-compiler (1.2.7)
       rake
     rchardet (1.8.0)
-    regexp_parser (2.9.0)
+    regexp_parser (2.9.2)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -330,18 +328,18 @@ GEM
       strscan
     rmagick (3.2.0)
     rouge (2.0.7)
-    rubocop (1.63.4)
+    rubocop (1.65.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
+      regexp_parser (>= 2.4, < 3.0)
       rexml (>= 3.2.5, < 4.0)
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+    rubocop-ast (1.32.1)
       parser (>= 3.3.1.0)
     ruby-macho (2.5.1)
     ruby-progressbar (1.13.0)

From b9517a3e1f93d63d176a9e309dc7d43505ea08b8 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Fri, 30 Aug 2024 11:02:16 +1000
Subject: [PATCH 439/547] Suffix `ensure_git_branch_is_release_branch` with `!`

---
 fastlane/Fastfile         | 7 +++++--
 fastlane/lanes/release.rb | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index e38054e2d..276136e34 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -1028,8 +1028,11 @@ def release_branch_name(release_version: release_version_current)
   "#{RELEASE_BRANCH_ROOT}#{release_version}"
 end
 
-def ensure_git_branch_is_release_branch
-  # Verify that the current branch is a release branch. Notice that `ensure_git_branch` expects a RegEx parameter
+def ensure_git_branch_is_release_branch!
+  # Verify that the current branch is a release branch.
+  #
+  # Notice that `ensure_git_branch` expects a RegEx parameter
+  # Also, ensure_git_branch will fail the lane if the branch doesn't match, hence the ! in the method name.
   ensure_git_branch(branch: "^#{RELEASE_BRANCH_ROOT}")
 end
 
diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 9e7fcf43d..7d5269820 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -70,7 +70,7 @@
 
   lane :new_beta_release do |skip_confirm: false|
     ensure_git_status_clean
-    ensure_git_branch_is_release_branch
+    ensure_git_branch_is_release_branch!
 
     new_build_code = build_code_next
     UI.important <<~MESSAGE

From 3c9907698e74fa51c5fd3fb698cbc71f92773c1c Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Fri, 30 Aug 2024 11:15:51 +1000
Subject: [PATCH 440/547] Move `finalize_release` lane to dedicated file and
 modernize

---
 fastlane/Fastfile              | 58 ------------------------
 fastlane/lanes/localization.rb | 29 ++++++++++--
 fastlane/lanes/release.rb      | 83 ++++++++++++++++++++++++++++++++++
 3 files changed, 108 insertions(+), 62 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 276136e34..f69924f47 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -136,64 +136,6 @@ platform :ios do
     trigger_release_build(branch_to_build: "release/#{version}")
   end
 
-  #####################################################################################
-  # finalize_release
-  # -----------------------------------------------------------------------------------
-  # This lane finalize a release: updates store metadata, bump final version number,
-  # remove branch protection and close milestone, then trigger the final release on CI
-  # -----------------------------------------------------------------------------------
-  # Usage:
-  # bundle exec fastlane finalize_release [skip_confirm:<skip confirm>] [version:<version>]
-  #
-  # Example:
-  # bundle exec fastlane finalize_release
-  # bundle exec fastlane finalize_release skip_confirm:true
-  #####################################################################################
-  desc 'Trigger the final release build on CI'
-  lane :finalize_release do |options|
-    UI.user_error!('To finalize a hotfix, please use the finalize_hotfix_release lane instead') if ios_current_branch_is_hotfix
-
-    ios_finalize_prechecks(options)
-
-    UI.message('Checking app strings translation status...')
-    check_translation_progress(
-      glotpress_url: GLOTPRESS_APP_STRINGS_PROJECT_URL,
-      abort_on_violations: false
-    )
-
-    UI.message('Checking release notes strings translation status...')
-    check_translation_progress(
-      glotpress_url: GLOTPRESS_STORE_METADATA_PROJECT_URL,
-      abort_on_violations: false
-    )
-
-    download_localized_strings_and_metadata_from_glotpress
-
-    lint_localizations
-
-    ios_bump_version_beta
-
-    # Wrap up
-    version = ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
-    remove_branch_protection(
-      repository: GITHUB_REPO,
-      branch: "release/#{version}"
-    )
-    set_milestone_frozen_marker(
-      repository: GITHUB_REPO,
-      milestone: version,
-      freeze: false
-    )
-    create_new_milestone(repository: GITHUB_REPO)
-    close_milestone(
-      repository: GITHUB_REPO,
-      milestone: version
-    )
-
-    # Start the build
-    trigger_release_build(branch_to_build: "release/#{version}")
-  end
-
   #####################################################################################
   # build_and_upload_beta_release
   # -----------------------------------------------------------------------------------
diff --git a/fastlane/lanes/localization.rb b/fastlane/lanes/localization.rb
index 80eafa1bb..7106f5d7a 100644
--- a/fastlane/lanes/localization.rb
+++ b/fastlane/lanes/localization.rb
@@ -164,6 +164,31 @@
       )
     end
   end
+
+  lane :lint_localizations do
+    ios_lint_localizations(input_dir: APP_RESOURCES_DIR, allow_retry: true)
+  end
+
+  lane :check_translation_progress do
+    check_translation_progress_strings
+    check_translation_progress_release_notes
+  end
+
+  lane :check_translation_progress_strings do
+    UI.message('Checking app strings translation status...')
+    check_translation_progress(
+      glotpress_url: GLOTPRESS_APP_STRINGS_PROJECT_URL,
+      abort_on_violations: false
+    )
+  end
+
+  lane :check_translation_progress_release_notes do
+    UI.message('Checking release notes strings translation status...')
+    check_translation_progress(
+      glotpress_url: GLOTPRESS_STORE_METADATA_PROJECT_URL,
+      abort_on_violations: false
+    )
+  end
 end
 
 # Ensure that none of the `.txt` files in `en-US` would accidentally override our originals in `default`
@@ -178,10 +203,6 @@ def ensure_default_metadata_are_not_overridden(metadata_files_hash:)
     MSG
     UI.user_error!(override_not_allowed_message) if File.exist?(en_file_path)
   end
-
-  lane :lint_localizations do
-    ios_lint_localizations(input_dir: APP_RESOURCES_DIR, allow_retry: true)
-  end
 end
 
 # Ensure even empty locale folders have an empty `.gitkeep` file.
diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 7d5269820..a1a4dde4f 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -103,6 +103,77 @@
     # TODO: Switch to working branch and open back-merge PR
   end
 
+  desc 'Trigger the final release build on CI'
+  lane :finalize_release do |skip_confirm: false|
+    UI.user_error!('To finalize a hotfix, please use the finalize_hotfix_release lane instead') if ios_current_branch_is_hotfix
+
+    ensure_git_status_clean
+    ensure_git_branch_is_release_branch!
+
+    check_translation_progress
+
+    new_build_code = build_code_next
+    version = release_version_current
+    UI.important <<~MESSAGE
+      Finalizing release #{version}:
+      • Current build code: #{build_code_current}
+      • Final build code: #{new_build_code}
+    MESSAGE
+
+    UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.") unless skip_confirm || UI.confirm('Do you want to continue?')
+
+    download_localized_strings_and_metadata_from_glotpress
+    lint_localizations
+
+    UI.message "Bumping build code to #{new_build_code}..."
+    PUBLIC_VERSION_FILE.write(version_long: new_build_code)
+    commit_version_and_build_files
+    # Uses build_code_current let user double-check result.
+    UI.success "Done! Release version: #{version}. Final build code: #{build_code_current}."
+
+    UI.important('Will push changes to remote and trigger the release build.')
+    UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.") unless skip_confirm || UI.confirm('Do you want to continue?')
+
+    push_to_git_remote(tags: false)
+
+    trigger_release_build(branch_to_build: release_branch_name)
+
+    remove_branch_protection(
+      repository: GITHUB_REPO,
+      branch: release_branch_name
+    )
+
+    begin
+      set_milestone_frozen_marker(
+        repository: GITHUB_REPO,
+        milestone: version,
+        freeze: false
+      )
+
+      create_new_milestone(repository: GITHUB_REPO)
+
+      close_milestone(
+        repository: GITHUB_REPO,
+        milestone: version
+      )
+    rescue StandardError => e
+      report_milestone_error(error_title: "Error in milestone finalization process for `#{version}`: #{e.message}")
+    end
+
+    UI.message("Moved the following PRs to milestone #{release_version_next}: #{moved_prs.join(', ')}")
+
+    next unless is_ci
+
+    moved_prs_info = if moved_prs.empty?
+                       "No open PR were targeting `#{new_version}` at the time of code-freeze."
+                     else
+                       "#{moved_prs.count} PRs targeting `#{new_version}` were still open and thus moved to `#{release_version_next}`:\n" \
+                         + moved_prs.map { |pr_num| "[##{pr_num}](https://github.com/#{GITHUB_REPO}/pull/#{pr_num})" }.join(', ')
+                     end
+
+    buildkite_annotate(style: moved_prs.empty? ? 'success' : 'warning', context: 'start-code-freeze', message: moved_prs_info)
+  end
+
   lane :trigger_beta_build do |branch_to_build:|
     trigger_buildkite_release_build(branch: branch_to_build, beta: true)
   end
@@ -138,3 +209,15 @@ def trigger_buildkite_release_build(branch:, beta:)
     pipeline_file: 'release-build.yml'
   )
 end
+
+def report_milestone_error(error_title:)
+  error_message = <<-MESSAGE
+    #{error_title}
+    - If this is not the first time you are running the release task (e.g. retrying because it failed on first attempt), the milestone might have already been closed and this error is expected.
+    - Otherwise, please investigate the error.
+  MESSAGE
+
+  UI.error(error_message)
+
+  buildkite_annotate(style: 'warning', context: 'error-with-milestone', message: error_message) if is_ci
+end

From cf4988f3371702a1c344aa4d11c085a28eb4eb7e Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Fri, 30 Aug 2024 11:25:13 +1000
Subject: [PATCH 441/547] Create backmerge PR from `finalize_release` lane

---
 fastlane/lanes/release.rb | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index a1a4dde4f..633ec39e9 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -138,6 +138,8 @@
 
     trigger_release_build(branch_to_build: release_branch_name)
 
+    create_release_backmerge_pr(version_to_merge: version, next_version: release_version_next)
+
     remove_branch_protection(
       repository: GITHUB_REPO,
       branch: release_branch_name
@@ -210,6 +212,25 @@ def trigger_buildkite_release_build(branch:, beta:)
   )
 end
 
+def create_release_backmerge_pr(version_to_merge:, next_version:)
+  create_release_backmerge_pull_request(
+    repository: GITHUB_REPO,
+    source_branch: release_branch_name(release_version: version_to_merge),
+    labels: ['Releases'],
+    milestone_title: next_version
+  )
+rescue StandardError => e
+  error_message = <<-MESSAGE
+    Error creating backmerge pull request: #{e.message}
+    If this is not the first time you are running the release task, the backmerge PR for the version `#{version_to_merge}` might have already been previously created.
+    Please close any previous backmerge PR for `#{version_to_merge}`, delete the previous merge branch, then run the release task again.
+  MESSAGE
+
+  buildkite_annotate(style: 'error', context: 'error-creating-backmerge', message: error_message) if is_ci
+
+  UI.user_error!(error_message)
+end
+
 def report_milestone_error(error_title:)
   error_message = <<-MESSAGE
     #{error_title}

From 1f2231271c5b5f8a60a8c25cef16bb0fca8018ff Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Fri, 30 Aug 2024 11:33:59 +1000
Subject: [PATCH 442/547] =?UTF-8?q?Fix=20infinite=20loop=20in=20localizati?=
 =?UTF-8?q?on=20checks=20=F0=9F=98=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fastlane/lanes/localization.rb | 2 +-
 fastlane/lanes/release.rb      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fastlane/lanes/localization.rb b/fastlane/lanes/localization.rb
index 7106f5d7a..f048ff08a 100644
--- a/fastlane/lanes/localization.rb
+++ b/fastlane/lanes/localization.rb
@@ -169,7 +169,7 @@
     ios_lint_localizations(input_dir: APP_RESOURCES_DIR, allow_retry: true)
   end
 
-  lane :check_translation_progress do
+  lane :check_translation_progress_all do
     check_translation_progress_strings
     check_translation_progress_release_notes
   end
diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 633ec39e9..df68fe24a 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -110,7 +110,7 @@
     ensure_git_status_clean
     ensure_git_branch_is_release_branch!
 
-    check_translation_progress
+    check_translation_progress_all
 
     new_build_code = build_code_next
     version = release_version_current

From 12740c936b7282cdc67b34fdc4bc26575b78c05b Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Fri, 30 Aug 2024 11:35:02 +1000
Subject: [PATCH 443/547] Update App Store metadata translations

---
 fastlane/metadata/ar-SA/keywords.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/metadata/ar-SA/keywords.txt b/fastlane/metadata/ar-SA/keywords.txt
index 66c12533b..be7cee772 100644
--- a/fastlane/metadata/ar-SA/keywords.txt
+++ b/fastlane/metadata/ar-SA/keywords.txt
@@ -1 +1 @@
-ملحوظات,ملحوظة,مهام مصغرة,صحيفة,مذكرات,مزامنة,قائمة مهام,مفكرة,بسيط,مفكرة,وسم قائمة مهام,كتابة
\ No newline at end of file
+ملحوظات,ملحوظة,مهام مصغرة,صحيفة,مذكرات,مزامنة,قائمة مهام,مفكرة,بسيط,مفكرة,وسم قائمة مهام,كتابة,مذكرة

From 51d23e6c257272ef5450f8a10b80f3f1ba636674 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Fri, 30 Aug 2024 11:35:02 +1000
Subject: [PATCH 444/547] Trim ar-SA keywords to be less than 100 characters

---
 fastlane/metadata/ar-SA/keywords.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/metadata/ar-SA/keywords.txt b/fastlane/metadata/ar-SA/keywords.txt
index be7cee772..66c12533b 100644
--- a/fastlane/metadata/ar-SA/keywords.txt
+++ b/fastlane/metadata/ar-SA/keywords.txt
@@ -1 +1 @@
-ملحوظات,ملحوظة,مهام مصغرة,صحيفة,مذكرات,مزامنة,قائمة مهام,مفكرة,بسيط,مفكرة,وسم قائمة مهام,كتابة,مذكرة
+ملحوظات,ملحوظة,مهام مصغرة,صحيفة,مذكرات,مزامنة,قائمة مهام,مفكرة,بسيط,مفكرة,وسم قائمة مهام,كتابة
\ No newline at end of file

From 415b21fa38422bfa2379c0e67d2d96bae6f8b8da Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Fri, 30 Aug 2024 11:35:03 +1000
Subject: [PATCH 445/547] Bump version number

---
 config/Version.Public.xcconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/Version.Public.xcconfig b/config/Version.Public.xcconfig
index 6d9c88697..f78d955d1 100644
--- a/config/Version.Public.xcconfig
+++ b/config/Version.Public.xcconfig
@@ -1,2 +1,2 @@
-VERSION_LONG = 4.52.0.4
+VERSION_LONG = 4.52.0.5
 VERSION_SHORT = 4.52

From 4f3df6a452543483a1fbb25196e2b65644443b2b Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Fri, 30 Aug 2024 11:41:52 +1000
Subject: [PATCH 446/547] Reformat comment in
 `ensure_git_branch_is_release_branch!`

---
 fastlane/Fastfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index f69924f47..6f20b1771 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -972,8 +972,7 @@ end
 
 def ensure_git_branch_is_release_branch!
   # Verify that the current branch is a release branch.
-  #
-  # Notice that `ensure_git_branch` expects a RegEx parameter
+  # Notice that `ensure_git_branch` expects a RegEx parameter.
   # Also, ensure_git_branch will fail the lane if the branch doesn't match, hence the ! in the method name.
   ensure_git_branch(branch: "^#{RELEASE_BRANCH_ROOT}")
 end

From 382a466232f2e17cfa71acef6c0505cb4d61f3b6 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Fri, 30 Aug 2024 11:46:29 +1000
Subject: [PATCH 447/547] Remove misplaced annotation for milestone move in
 release finalization

---
 fastlane/lanes/release.rb | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index df68fe24a..b278343d2 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -161,19 +161,6 @@
     rescue StandardError => e
       report_milestone_error(error_title: "Error in milestone finalization process for `#{version}`: #{e.message}")
     end
-
-    UI.message("Moved the following PRs to milestone #{release_version_next}: #{moved_prs.join(', ')}")
-
-    next unless is_ci
-
-    moved_prs_info = if moved_prs.empty?
-                       "No open PR were targeting `#{new_version}` at the time of code-freeze."
-                     else
-                       "#{moved_prs.count} PRs targeting `#{new_version}` were still open and thus moved to `#{release_version_next}`:\n" \
-                         + moved_prs.map { |pr_num| "[##{pr_num}](https://github.com/#{GITHUB_REPO}/pull/#{pr_num})" }.join(', ')
-                     end
-
-    buildkite_annotate(style: moved_prs.empty? ? 'success' : 'warning', context: 'start-code-freeze', message: moved_prs_info)
   end
 
   lane :trigger_beta_build do |branch_to_build:|

From 15b440809cd3e7453056c1f75aa51820b6682f98 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Fri, 30 Aug 2024 22:04:33 +1000
Subject: [PATCH 448/547] Add metadata source for support URL

---
 fastlane/metadata/default/support_url.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 fastlane/metadata/default/support_url.txt

diff --git a/fastlane/metadata/default/support_url.txt b/fastlane/metadata/default/support_url.txt
new file mode 100644
index 000000000..c1424b760
--- /dev/null
+++ b/fastlane/metadata/default/support_url.txt
@@ -0,0 +1 @@
+https://simplenote.com/help/

From 7b0502ed7a09d8b338a2f7656710a1c8136794b9 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Fri, 30 Aug 2024 10:52:35 +1000
Subject: [PATCH 449/547] Add method for milestone moving

---
 fastlane/lanes/release.rb | 43 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index b278343d2..fd772c018 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -218,6 +218,49 @@ def create_release_backmerge_pr(version_to_merge:, next_version:)
   UI.user_error!(error_message)
 end
 
+def freeze_milestone_and_move_assigned_prs_to_next_milestone(
+  milestone_to_freeze:,
+  next_milestone:,
+  github_repository: GITHUB_REPO
+)
+  begin
+    # Move PRs to next milestone
+    moved_prs = update_assigned_milestone(
+      repository: github_repository,
+      from_milestone: milestone_to_freeze,
+      to_milestone: next_milestone,
+      comment: "Version `#{milestone_to_freeze}` has entered code-freeze. The milestone of this PR has been updated to `#{next_milestone}`."
+    )
+
+    # Add ❄️ marker to milestone title to indicate we entered code-freeze
+    set_milestone_frozen_marker(
+      repository: github_repository,
+      milestone: milestone_to_freeze
+    )
+  rescue StandardError => e
+    moved_prs = []
+
+    report_milestone_error(error_title: "Error during milestone `#{milestone_to_freeze}` freezing and PRs milestone updating process: #{e.message}")
+  end
+
+  UI.message("Moved the following PRs to milestone #{next_milestone}: #{moved_prs.join(', ')}")
+
+  next unless is_ci
+
+  moved_prs_info = if moved_prs.empty?
+                     "No open PRs were targeting `#{milestone_to_freeze}` at the time of code-freeze."
+                   else
+                     "#{moved_prs.count} PRs targeting `#{milestone_to_freeze}` were still open at the time of code-freeze. They have been moved to `#{next_milestone}`:\n" \
+                       + moved_prs.map { |pr_num| "[##{pr_num}](https://github.com/#{GITHUB_REPO}/pull/#{pr_num})" }.join(', ')
+                   end
+
+  buildkite_annotate(
+    style: moved_prs.empty? ? 'success' : 'warning',
+    context: 'code-freeze-milestone-updates',
+    message: moved_prs_info
+  )
+end
+
 def report_milestone_error(error_title:)
   error_message = <<-MESSAGE
     #{error_title}

From 9b1d3a11cfcf5b215292d43f3839d4daeaf355a6 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 2 Sep 2024 14:20:22 +1000
Subject: [PATCH 450/547] Use new milestones freezing method in code freeze
 lane

---
 fastlane/lanes/release.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index fd772c018..1248e6d42 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -58,9 +58,10 @@
       from_branch: DEFAULT_BRANCH,
       to_branch: computed_release_branch_name
     )
-    set_milestone_frozen_marker(
-      repository: GITHUB_REPO,
-      milestone: new_version
+
+    freeze_milestone_and_move_assigned_prs_to_next_milestone(
+      milestone_to_freeze: new_version,
+      next_milestone: release_version_next
     )
 
     trigger_beta_build(branch_to_build: computed_release_branch_name)

From 9705d7ac35929ff67aa85e1792b691d53711a3e1 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Tue, 3 Sep 2024 08:20:16 +1000
Subject: [PATCH 451/547] Add a note regarding the milestone moving
 implementation rationale

---
 fastlane/lanes/release.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 1248e6d42..3b819660d 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -224,6 +224,13 @@ def freeze_milestone_and_move_assigned_prs_to_next_milestone(
   next_milestone:,
   github_repository: GITHUB_REPO
 )
+  # Notice that the order of execution is important here and should not be changed.
+  #
+  # First, we move the PR from milestone_to_freeze to next_milestone.
+  # Then, we update milestone_to_freeze's tile with the frozen marker (traditionally ❄️ )
+  #
+  # If the order were to be reversed, the PRs lookup for milestone_to_freeze would yeld no value.
+  # That's because the lookup uses the milestone title, which would no longer be milestone_to_freeze, but milestone_to_freeze + the frozen marker.
   begin
     # Move PRs to next milestone
     moved_prs = update_assigned_milestone(

From a5984c81fe68a84198160a221a5b1ea5fc89a661 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Tue, 3 Sep 2024 08:23:23 +1000
Subject: [PATCH 452/547] Use `return` instead of `next` in method

---
 fastlane/lanes/release.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 3b819660d..9dc20c201 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -253,7 +253,7 @@ def freeze_milestone_and_move_assigned_prs_to_next_milestone(
 
   UI.message("Moved the following PRs to milestone #{next_milestone}: #{moved_prs.join(', ')}")
 
-  next unless is_ci
+  return unless is_ci
 
   moved_prs_info = if moved_prs.empty?
                      "No open PRs were targeting `#{milestone_to_freeze}` at the time of code-freeze."

From 31a02296f3a3074b987babf456025ac60a182fe5 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 2 Sep 2024 20:36:34 +1000
Subject: [PATCH 453/547] Use `fastlane/metadata/default/release_notes.txt` as
 source of truth

---
 fastlane/Fastfile              | 16 ++++++----------
 fastlane/lanes/build.rb        |  2 +-
 fastlane/lanes/localization.rb |  6 ------
 fastlane/lanes/release.rb      |  2 +-
 4 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 6f20b1771..644547388 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -35,17 +35,16 @@ SECRETS_ROOT = File.join(Dir.home, '.configure', 'simplenote-ios', 'secrets')
 APP_STORE_CONNECT_KEY_PATH = File.join(SECRETS_ROOT, 'app_store_connect_fastlane_api_key.json')
 $used_test_account_index = nil
 
-APP_RESOURCES_DIR = File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources')
-
-RELEASE_NOTES_SOURCE_PATH = File.join(APP_RESOURCES_DIR, 'release_notes.txt')
-
 GLOTPRESS_BASE_URL = 'https://translate.wordpress.com/projects'
 # Notice the trailing / is required.
 # Without it, GlotPress will redirect to the version with /
 GLOTPRESS_APP_STRINGS_PROJECT_URL = "#{GLOTPRESS_BASE_URL}/simplenote/ios/".freeze
 GLOTPRESS_STORE_METADATA_PROJECT_URL = "#{GLOTPRESS_APP_STRINGS_PROJECT_URL}release-notes/".freeze
 
+APP_RESOURCES_DIR = File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources')
 STORE_METADATA_FOLDER = File.join(PROJECT_ROOT_FOLDER, 'fastlane', 'metadata')
+DEFAULT_METADATA_FOLDER = File.join(STORE_METADATA_FOLDER, 'default')
+RELEASE_NOTES_SOURCE_PATH = File.join(DEFAULT_METADATA_FOLDER, 'release_notes.txt')
 
 require_relative 'lib/env_manager'
 
@@ -80,14 +79,11 @@ ENV['FL_RELEASE_TOOLKIT_DEFAULT_BRANCH'] = 'trunk'
 platform :ios do
   desc 'Updates the AppStoreStrings.pot file with the latest data'
   lane :update_appstore_strings do |version: release_version_current|
-    prj_folder = Pathname.new(File.join(Dir.pwd, '..')).expand_path.to_s
-    source_metadata_folder = File.join(prj_folder, 'fastlane', 'appstoreres', 'metadata', 'source')
-
     files = {
       whats_new: RELEASE_NOTES_SOURCE_PATH,
-      app_store_subtitle: File.join(source_metadata_folder, 'subtitle.txt'),
-      app_store_desc: File.join(source_metadata_folder, 'description.txt'),
-      app_store_keywords: File.join(source_metadata_folder, 'keywords.txt')
+      app_store_subtitle: File.join(default_metadata_folder, 'subtitle.txt'),
+      app_store_desc: File.join(default_metadata_folder, 'description.txt'),
+      app_store_keywords: File.join(default_metadata_folder, 'keywords.txt')
     }
 
     ios_update_metadata_source(
diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb
index 4cc86273b..84ea7fbb8 100644
--- a/fastlane/lanes/build.rb
+++ b/fastlane/lanes/build.rb
@@ -64,7 +64,7 @@
   create_release(
     repository: GITHUB_REPO,
     version: version,
-    release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt'),
+    release_notes_file_path: RELEASE_NOTES_SOURCE_PATH,
     release_assets: XCARCHIVE_ZIP_PATH.to_s,
     prerelease: beta_release
   )
diff --git a/fastlane/lanes/localization.rb b/fastlane/lanes/localization.rb
index f048ff08a..4cc73347a 100644
--- a/fastlane/lanes/localization.rb
+++ b/fastlane/lanes/localization.rb
@@ -90,12 +90,6 @@
   end
 
   lane :download_localized_metadata_from_glotpress do
-    # FIXME: We should make the `fastlane/metadata/default/release_notes.txt` path be the source of truth for the original copies in the future.
-    # (will require changes in the `update_appstore_strings` lane, the Release Scenario, the MC tool to generate the announcement post…)
-    #
-    # In the meantime, just copy the file to the right place for `deliver` to find, for the `default` pseudo-locale which is used as fallback
-    FileUtils.cp(RELEASE_NOTES_SOURCE_PATH, File.join(STORE_METADATA_FOLDER, 'default', 'release_notes.txt'))
-
     # FIXME: Replace this with a call to the future replacement of `gp_downloadmetadata` once it's implemented in the release-toolkit (see paaHJt-31O-p2).
     target_files = {
       "v#{release_version_current}-whats-new": { desc: 'release_notes.txt', max_size: 4000 },
diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 9dc20c201..5b324dab7 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -42,7 +42,7 @@
     extract_release_notes_for_version(
       version: new_version,
       release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'RELEASE-NOTES.txt'),
-      extracted_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources', 'release_notes.txt')
+      extracted_notes_file_path: RELEASE_NOTES_SOURCE_PATH
     )
     ios_update_release_notes(new_version: new_version)
 

From 0f3f3d43e8aa983c0422575e18a1d83cf97c4fda Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 2 Sep 2024 20:59:09 +1000
Subject: [PATCH 454/547] Clarify what the call to `ios_update_release_notes`
 does

---
 fastlane/lanes/release.rb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 5b324dab7..570fe79de 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -39,12 +39,17 @@
 
     new_version = release_version_current
 
+    changelog_path = File.join(PROJECT_ROOT_FOLDER, 'RELEASE-NOTES.txt')
     extract_release_notes_for_version(
       version: new_version,
-      release_notes_file_path: File.join(PROJECT_ROOT_FOLDER, 'RELEASE-NOTES.txt'),
+      release_notes_file_path: changelog_path,
       extracted_notes_file_path: RELEASE_NOTES_SOURCE_PATH
     )
-    ios_update_release_notes(new_version: new_version)
+    # Add a new section to the changelog for the version _after_ the one we are code freezing
+    ios_update_release_notes(
+      new_version: new_version,
+      release_notes_file_path: changelog_path
+    )
 
     generate_strings_file_for_glotpress
 

From f225c5576a9b6b745229f031ce190485ca512142 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 2 Sep 2024 21:10:29 +1000
Subject: [PATCH 455/547] Update `code_freeze` to delete release notes metadata
 before updating

---
 fastlane/lanes/release.rb | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 570fe79de..818adc910 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -39,6 +39,11 @@
 
     new_version = release_version_current
 
+    # Delete all release notes metadata, including the source of truth.
+    # We'll generate a new source of truth next, and the localized versions will be re-downloaded once translated on GlotPress.
+    # It's important we delete them, otherwise we risk using old release notes for locales that won't get translated in time for the release finalization.
+    delete_all_metadata_release_notes
+
     changelog_path = File.join(PROJECT_ROOT_FOLDER, 'RELEASE-NOTES.txt')
     extract_release_notes_for_version(
       version: new_version,
@@ -285,3 +290,15 @@ def report_milestone_error(error_title:)
 
   buildkite_annotate(style: 'warning', context: 'error-with-milestone', message: error_message) if is_ci
 end
+
+def delete_all_metadata_release_notes(store_metadata_folder: STORE_METADATA_FOLDER)
+  pattern = File.join(store_metadata_folder, '**', 'release_notes.txt')
+  Dir[pattern].each { |path| File.delete(path) }
+  git_add(path: pattern, shell_escape: true)
+  git_commit(
+    path: pattern,
+    message: 'Delete release notes source and localization before code freeze',
+    # Even if no locale was translated in the previous cycle, default/relaese_notes.txt should always be present, and therefore deleted at this stage.
+    allow_nothing_to_commit: false
+  )
+end

From 3cc614b519dc7e25d569a39ae6f16d9b4e4b81c0 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 2 Sep 2024 15:07:40 +1000
Subject: [PATCH 456/547] Remove `Simplenote/Resources/release_notes.txt`

We no longer use this in favor of
`fastalane/metadata/default/release_notes.txt`
---
 Simplenote/Resources/release_notes.txt | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 Simplenote/Resources/release_notes.txt

diff --git a/Simplenote/Resources/release_notes.txt b/Simplenote/Resources/release_notes.txt
deleted file mode 100644
index a9bcf28d6..000000000
--- a/Simplenote/Resources/release_notes.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Extended support for iOS Shortcuts
-- Fixed issue where notes selection was lost when app backgrounded
-- Fixed an issue can activate the faceid switch without a passcode
-- Magic Link Login Support
-- Login UI has been overhauled
-

From 77d83184cf6ba26ac9693a7a61938f67ed55efcd Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 2 Sep 2024 20:35:44 +1000
Subject: [PATCH 457/547] Remove unused script to extract release notes

We have automation in the release-toolkit to do this now.
---
 Scripts/extract_release_notes.rb | 91 --------------------------------
 1 file changed, 91 deletions(-)
 delete mode 100644 Scripts/extract_release_notes.rb

diff --git a/Scripts/extract_release_notes.rb b/Scripts/extract_release_notes.rb
deleted file mode 100644
index 2cfd40ae5..000000000
--- a/Scripts/extract_release_notes.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-# frozen_string_literal: true
-
-# Parses the release notes file to extract the current version information and
-# puts it to STDOUT.
-#
-# To update the release notes for localization:
-#
-# ruby ./this_script >| Simplenote/Resources/release_notes.txt
-#
-# To generate the App Store Connect release message:
-#
-# ruby ./this_script | pbcopy
-#
-# To generate the GitHub and App Center release message:
-#
-# ruby ./this_script -k | pbcopy
-
-GITHUB_URL = 'https://github.com/Automattic/simplenote-ios'
-
-RELEASE_NOTES_FILE = 'RELEASE-NOTES.txt'
-NOTES = File.read(RELEASE_NOTES_FILE)
-lines = NOTES.lines
-
-def replace_pr_number_with_markdown_link(string)
-  string.gsub(/\#\d*$/) do |pr_number|
-    "[#{pr_number}](#{GITHUB_URL}/pull/#{pr_number.gsub('#', '')})"
-  end
-end
-
-# This is a very bare bone option parsing. It does the job for this simple use
-# case, but it should not be built upon.
-#
-# If you plan to add more options, please consider using a gem to manage them
-# properly.
-mode = ARGV[0] == '-k' ? :keep_pr_links : :strip_pr_links
-
-# Format:
-#
-# 1.23
-# -----
-#
-# 1.22
-# -----
-# -   something #123
-# -   something #234
-#
-# 1.21
-# -----
-# -   something something #345
-
-# Skip the first three lines: the next version header
-lines = lines[3...]
-
-# Isolate the current version by looking for the first new line
-release_lines = []
-
-# Find the start of the releases by looking for the line with the '-----'
-# sequence. This accounts for the edge case in which more new lines make it
-# into the release notes file than expected.
-index = 0
-index += 1 until lines[index].start_with? '-----'
-
-lines[(index + 1)...].each do |line|
-  break if line.strip == ''
-
-  release_lines.push line
-end
-
-formatted_lines = release_lines
-                  .map { |l| l.gsub('-   ', '- ') }
-
-case mode
-when :strip_pr_links
-  formatted_lines = formatted_lines
-                    .map { |l| l.gsub(/ \#\d*$/, '') }
-when :keep_pr_links
-  formatted_lines = formatted_lines.
-                    # The PR "links" are not actually links, but PR "ids". On GitHub, they'll
-                    # be automatically parsed into links to the corresponding PR, but outside
-                    # GitHub, such as in our internal posts or on App Center, they won't.
-                    #
-                    # It's probably best to update the convention in writing the release notes
-                    # but in the meantime let's compensate with more automation.
-                    map { |l| replace_pr_number_with_markdown_link(l) }
-end
-
-# It would be good to either add overriding of the file where the parsed
-# release notes should go. I haven't done it yet because I'm using this script
-# also to generate the text for the release notes on GitHub, where I want to
-# keep the PR links. See info on the usage a the start of the file.
-puts formatted_lines

From e22d8a270d29c1837f977f7a82a66516bb6f2661 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Tue, 3 Sep 2024 11:59:43 +1000
Subject: [PATCH 458/547] Use `STORE_METADATA_DEFAULT_LOCALE_FOLDER` for
 clarity

---
 fastlane/Fastfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 644547388..b2106ef7d 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -43,8 +43,8 @@ GLOTPRESS_STORE_METADATA_PROJECT_URL = "#{GLOTPRESS_APP_STRINGS_PROJECT_URL}rele
 
 APP_RESOURCES_DIR = File.join(PROJECT_ROOT_FOLDER, 'Simplenote', 'Resources')
 STORE_METADATA_FOLDER = File.join(PROJECT_ROOT_FOLDER, 'fastlane', 'metadata')
-DEFAULT_METADATA_FOLDER = File.join(STORE_METADATA_FOLDER, 'default')
-RELEASE_NOTES_SOURCE_PATH = File.join(DEFAULT_METADATA_FOLDER, 'release_notes.txt')
+STORE_METADATA_DEFAULT_LOCALE_FOLDER = File.join(STORE_METADATA_FOLDER, 'default')
+RELEASE_NOTES_SOURCE_PATH = File.join(STORE_METADATA_DEFAULT_LOCALE_FOLDER, 'release_notes.txt')
 
 require_relative 'lib/env_manager'
 
@@ -81,9 +81,9 @@ platform :ios do
   lane :update_appstore_strings do |version: release_version_current|
     files = {
       whats_new: RELEASE_NOTES_SOURCE_PATH,
-      app_store_subtitle: File.join(default_metadata_folder, 'subtitle.txt'),
-      app_store_desc: File.join(default_metadata_folder, 'description.txt'),
-      app_store_keywords: File.join(default_metadata_folder, 'keywords.txt')
+      app_store_subtitle: File.join(STORE_METADATA_DEFAULT_LOCALE_FOLDER, 'subtitle.txt'),
+      app_store_desc: File.join(STORE_METADATA_DEFAULT_LOCALE_FOLDER, 'description.txt'),
+      app_store_keywords: File.join(STORE_METADATA_DEFAULT_LOCALE_FOLDER, 'keywords.txt')
     }
 
     ios_update_metadata_source(

From 74512dc7529186c43c093898fb21f67e5c4dc907 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Tue, 3 Sep 2024 12:01:24 +1000
Subject: [PATCH 459/547] Move `update_appstore_strings` lane to
 `localization.rb`

---
 fastlane/Fastfile              | 16 ----------------
 fastlane/lanes/localization.rb | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index b2106ef7d..0fb607931 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -77,22 +77,6 @@ ENV['PUBLIC_CONFIG_FILE'] = VERSION_FILE_PATH
 ENV['FL_RELEASE_TOOLKIT_DEFAULT_BRANCH'] = 'trunk'
 
 platform :ios do
-  desc 'Updates the AppStoreStrings.pot file with the latest data'
-  lane :update_appstore_strings do |version: release_version_current|
-    files = {
-      whats_new: RELEASE_NOTES_SOURCE_PATH,
-      app_store_subtitle: File.join(STORE_METADATA_DEFAULT_LOCALE_FOLDER, 'subtitle.txt'),
-      app_store_desc: File.join(STORE_METADATA_DEFAULT_LOCALE_FOLDER, 'description.txt'),
-      app_store_keywords: File.join(STORE_METADATA_DEFAULT_LOCALE_FOLDER, 'keywords.txt')
-    }
-
-    ios_update_metadata_source(
-      po_file_path: File.join(APP_RESOURCES_DIR, 'AppStoreStrings.pot'),
-      source_files: files,
-      release_version: version
-    )
-  end
-
   #####################################################################################
   # new_hotfix_release
   # -----------------------------------------------------------------------------------
diff --git a/fastlane/lanes/localization.rb b/fastlane/lanes/localization.rb
index 4cc73347a..fb4064a2d 100644
--- a/fastlane/lanes/localization.rb
+++ b/fastlane/lanes/localization.rb
@@ -70,6 +70,22 @@
     )
   end
 
+  desc 'Updates the AppStoreStrings.pot file with the latest data'
+  lane :update_appstore_strings do |version: release_version_current|
+    files = {
+      whats_new: RELEASE_NOTES_SOURCE_PATH,
+      app_store_subtitle: File.join(STORE_METADATA_DEFAULT_LOCALE_FOLDER, 'subtitle.txt'),
+      app_store_desc: File.join(STORE_METADATA_DEFAULT_LOCALE_FOLDER, 'description.txt'),
+      app_store_keywords: File.join(STORE_METADATA_DEFAULT_LOCALE_FOLDER, 'keywords.txt')
+    }
+
+    ios_update_metadata_source(
+      po_file_path: File.join(APP_RESOURCES_DIR, 'AppStoreStrings.pot'),
+      source_files: files,
+      release_version: version
+    )
+  end
+
   lane :download_localized_strings_and_metadata_from_glotpress do
     download_localized_strings_from_glotpress
     download_localized_metadata_from_glotpress

From 020beecfcdc0b348e85051a2eea8f3e7916217b0 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Tue, 3 Sep 2024 12:03:18 +1000
Subject: [PATCH 460/547] Remove unnecessary env var
 `APP_STORE_STRINGS_FILE_NAME`

See
https://github.com/wordpress-mobile/release-toolkit/blob/b6eb4278f96779c47888e1b57af830e9258c083f/MIGRATION.md#L34
---
 fastlane/Fastfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 0fb607931..10eee470b 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -72,7 +72,6 @@ end
 ########################################################################
 ENV['PROJECT_NAME'] = 'Simplenote'
 ENV['PROJECT_ROOT_FOLDER'] = PROJECT_ROOT_FOLDER
-ENV['APP_STORE_STRINGS_FILE_NAME'] = 'AppStoreStrings.pot'
 ENV['PUBLIC_CONFIG_FILE'] = VERSION_FILE_PATH
 ENV['FL_RELEASE_TOOLKIT_DEFAULT_BRANCH'] = 'trunk'
 

From 163271e7711b53b56bcd98d9942068781aaafe16 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Tue, 3 Sep 2024 12:04:20 +1000
Subject: [PATCH 461/547] Remove explicit file name from
 `update_appstore_strings` description

Just to decouple the lane from the implementation detail of the file
name...
---
 fastlane/lanes/localization.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/lanes/localization.rb b/fastlane/lanes/localization.rb
index fb4064a2d..dd1023890 100644
--- a/fastlane/lanes/localization.rb
+++ b/fastlane/lanes/localization.rb
@@ -70,7 +70,7 @@
     )
   end
 
-  desc 'Updates the AppStoreStrings.pot file with the latest data'
+  desc 'Updates the localization source POT file with the latest metadata for App Store Connect.'
   lane :update_appstore_strings do |version: release_version_current|
     files = {
       whats_new: RELEASE_NOTES_SOURCE_PATH,

From bf666288471c27569fa35aa72263431fc5c9e73f Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 4 Sep 2024 09:09:44 +1000
Subject: [PATCH 462/547] Refactor `delete_all_metadata_release_notes` for
 clarity

Saves wondering what `shell_escape` `true` vs `false` means.

Co-authored-by: Olivier Halligon <olivier.halligon@automattic.com>
---
 fastlane/lanes/release.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 818adc910..7f3af671d 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -292,11 +292,11 @@ def report_milestone_error(error_title:)
 end
 
 def delete_all_metadata_release_notes(store_metadata_folder: STORE_METADATA_FOLDER)
-  pattern = File.join(store_metadata_folder, '**', 'release_notes.txt')
-  Dir[pattern].each { |path| File.delete(path) }
-  git_add(path: pattern, shell_escape: true)
+  files = Dir.glob(File.join(store_metadata_folder, '**', 'release_notes.txt'))
+  files.each { |path| File.delete(path) }
+  git_add(path: files)
   git_commit(
-    path: pattern,
+    path: files,
     message: 'Delete release notes source and localization before code freeze',
     # Even if no locale was translated in the previous cycle, default/relaese_notes.txt should always be present, and therefore deleted at this stage.
     allow_nothing_to_commit: false

From fc327566427251f550b2b072cff96cb462d7bfd5 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 2 Sep 2024 14:45:07 +1000
Subject: [PATCH 463/547] Add lane to start the code freeze in CI

---
 .../configure-git-for-release-management.sh     | 13 +++++++++++++
 .../release-pipelines/start-code-freeze.yml     | 17 +++++++++++++++++
 fastlane/Fastfile                               |  3 ++-
 fastlane/lanes/ci_releases.rb                   | 15 +++++++++++++++
 4 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100755 .buildkite/commands/configure-git-for-release-management.sh
 create mode 100644 .buildkite/release-pipelines/start-code-freeze.yml
 create mode 100644 fastlane/lanes/ci_releases.rb

diff --git a/.buildkite/commands/configure-git-for-release-management.sh b/.buildkite/commands/configure-git-for-release-management.sh
new file mode 100755
index 000000000..215bcaa7e
--- /dev/null
+++ b/.buildkite/commands/configure-git-for-release-management.sh
@@ -0,0 +1,13 @@
+#!/bin/bash -eu
+
+# The Git command line client is not configured in Buildkite.
+# At the moment, steps that need Git access can configure it on deman using this script.
+# Later on, we should be able to configure it on the agent instead.
+
+curl -L https://api.github.com/meta | jq -r '.ssh_keys | .[]' | sed -e 's/^/github.com /' >> ~/.ssh/known_hosts
+git config --global user.email "mobile+wpmobilebot@automattic.com"
+git config --global user.name "Automattic Release Bot"
+
+# Buildkite is currently using the HTTPS URL to checkout.
+# We need to override it to be able to use the deploy key.
+git remote set-url origin git@github.com:Automattic/simplenote-ios.git
diff --git a/.buildkite/release-pipelines/start-code-freeze.yml b/.buildkite/release-pipelines/start-code-freeze.yml
new file mode 100644
index 000000000..dc258e873
--- /dev/null
+++ b/.buildkite/release-pipelines/start-code-freeze.yml
@@ -0,0 +1,17 @@
+steps:
+  - label: Start Code Freeze
+    plugins:
+      - $CI_TOOLKIT_PLUGIN
+    # The first client to implement releases in CI was Android so the automation works in that queue.
+    # We might want to move it to a leaner one in the future.
+    agents:
+        queue: android
+    command: |
+      echo '--- :git: Configure Git for release management'
+      .buildkite/commands/configure-git-for-release-management.sh
+
+      echo '--- :ruby: Setup Ruby tools'
+      install_gems
+
+      echo '--- :shipit: Start code freeze'
+      bundle exec fastlane code_freeze skip_confirm:true
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 10eee470b..2adc1e393 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -50,9 +50,10 @@ require_relative 'lib/env_manager'
 
 # Important: These need to be imported after all the constants have be defined because they access them.
 # A bit of a leaky abstraction but makes for lanes that are easier to write...
+import 'lanes/build.rb'
+import 'lanes/ci_releases.rb'
 import 'lanes/localization.rb'
 import 'lanes/release.rb'
-import 'lanes/build.rb'
 
 before_all do
   # Ensure we use the latest version of the toolkit
diff --git a/fastlane/lanes/ci_releases.rb b/fastlane/lanes/ci_releases.rb
new file mode 100644
index 000000000..777341f29
--- /dev/null
+++ b/fastlane/lanes/ci_releases.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+PIPELINES_ROOT = 'release-pipelines'
+
+platform :ios do
+  lane :trigger_code_freeze_in_ci do
+    buildkite_trigger_build(
+      buildkite_organization: BUILDKITE_ORGANIZATION,
+      buildkite_pipeline: BUILDKITE_PIPELINE,
+      branch: DEFAULT_BRANCH,
+      pipeline_file: File.join(PIPELINES_ROOT, 'start-code-freeze.yml'),
+      message: 'Start Code Freeze'
+    )
+  end
+end

From fc8ebb85f54a024cd5b27ea984afcd4f6f2698e4 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 2 Sep 2024 15:01:27 +1000
Subject: [PATCH 464/547] Split code freeze in start and finish lanes

---
 fastlane/lanes/release.rb | 87 +++++++++++++++++++++++++++++++++++----
 1 file changed, 78 insertions(+), 9 deletions(-)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 7f3af671d..571403e61 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -8,16 +8,14 @@
 
     Fastlane::Helper::GitHelper.checkout_and_pull(DEFAULT_BRANCH)
 
-    check_pods_references
-
     computed_release_branch_name = release_branch_name(release_version: release_version_next)
 
     message = <<~MESSAGE
       Code Freeze:
-      • New release branch from #{DEFAULT_BRANCH}: #{computed_release_branch_name}
+      - New release branch from #{DEFAULT_BRANCH}: #{computed_release_branch_name}
 
-      • Current release version and build code: #{release_version_current} (#{build_code_current}).
-      • New release version and build code: #{release_version_next} (#{build_code_code_freeze}).
+      - Current release version and build code: #{release_version_current} (#{build_code_current}).
+      - New release version and build code: #{release_version_next} (#{build_code_code_freeze}).
     MESSAGE
 
     UI.important(message)
@@ -56,12 +54,10 @@
       release_notes_file_path: changelog_path
     )
 
-    generate_strings_file_for_glotpress
-
     UI.important('Pushing changes to remote, configuring the release on GitHub, and triggering the beta build...')
     UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.") unless skip_confirm || UI.confirm('Do you want to continue?')
 
-    push_to_git_remote(tags: false)
+    push_to_git_remote(tags: false, set_upstream: true)
 
     copy_branch_protection(
       repository: GITHUB_REPO,
@@ -74,9 +70,53 @@
       next_milestone: release_version_next
     )
 
+    check_pods_references
+
+    next unless is_ci
+
+    message = <<~MESSAGE
+      Code freeze started successfully.
+
+      Next steps:
+
+      - Checkout `#{release_branch_name}` branch locally
+      - Update Pods and release notes if needed
+      - Finalize the code freeze
+    MESSAGE
+    buildkite_annotate(context: 'code-freeze-success', style: 'success', message: message)
+  end
+
+  lane :complete_code_freeze do |skip_confirm: false|
+    ensure_git_branch_is_release_branch
+    ensure_git_status_clean
+
+    version = release_version_current
+
+    UI.important("Completing code freeze for: #{version}")
+
+    UI.user_error!('Aborted by user request') unless skip_confirm || UI.confirm('Do you want to continue?')
+
+    generate_strings_file_for_glotpress
+
+    unless skip_confirm || UI.confirm('Ready to push changes to remote and trigger the beta build?')
+      UI.message("Terminating as requested. Don't forget to run the remainder of this automation manually.")
+      next
+    end
+
+    push_to_git_remote(tags: false)
+
     trigger_beta_build(branch_to_build: computed_release_branch_name)
 
-    # TODO: Switch to working branch and open back-merge PR
+    pr_url = create_release_management_pull_request(
+      release_version: version,
+      base_branch: DEFAULT_BRANCH,
+      title: "Merge #{version} code freeze"
+    )
+
+    message = <<~MESSAGE
+      Code freeze completed successfully. Next, review and merge the [integration PR](#{pr_url}).
+    MESSAGE
+    buildkite_annotate(context: 'code-freeze-completed', style: 'success', message: message) if is_ci
   end
 
   lane :new_beta_release do |skip_confirm: false|
@@ -302,3 +342,32 @@ def delete_all_metadata_release_notes(store_metadata_folder: STORE_METADATA_FOLD
     allow_nothing_to_commit: false
   )
 end
+
+def create_release_management_pull_request(release_version:, base_branch:, title:)
+  token = EnvManager.get_required_env!('GITHUB_TOKEN')
+
+  pr_url = create_pull_request(
+    api_token: token,
+    repo: GITHUB_REPO,
+    title: title,
+    head: Fastlane::Helper::GitHelper.current_git_branch,
+    base: base_branch,
+    labels: 'Releases'
+  )
+
+  # Next, set the milestone for the PR
+  #
+  # The create_pull_request action has a 'milestone' parameter, but it expects the milestone id.
+  # We don't know the id of the milestone, but we can use a different action to set it.
+  #
+  # PR URLs are in the format github.com/org/repo/pull/id
+  pr_number = File.basename(pr_url)
+  update_assigned_milestone(
+    repository: GITHUB_REPO,
+    numbers: [pr_number],
+    to_milestone: release_version
+  )
+
+  # Return the PR URL
+  pr_url
+end

From ab5ed1305868cfdbbb9e30efb4b6993c6d15b01f Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 4 Sep 2024 11:53:17 +1000
Subject: [PATCH 465/547] Add missing beta flag to release pipeline

---
 .buildkite/release-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/release-build.yml b/.buildkite/release-build.yml
index 532dc8496..5631eff49 100644
--- a/.buildkite/release-build.yml
+++ b/.buildkite/release-build.yml
@@ -15,7 +15,7 @@ steps:
 
   - label: ":testflight: Upload Simplenote iOS to App Store Connect"
     depends_on: testflight_build
-    command: .buildkite/commands/release-upload.sh
+    command: .buildkite/commands/release-upload.sh $BETA_RELEASE
     priority: 1
     plugins: [$CI_TOOLKIT_PLUGIN]
     notify:

From a12d241e5104614d080bf3c2e9a87439b4660c3d Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 4 Sep 2024 12:03:50 +1000
Subject: [PATCH 466/547] Add Buildkite pipeline and infra to complete the code
 freeze in CI

---
 .../commands/checkout-release-branch.sh       | 14 ++++++++++
 .buildkite/commands/complete-code-freeze.sh   | 26 +++++++++++++++++++
 .buildkite/commands/log-outdated-pods.sh      | 24 +++++++++++++++++
 .../complete-code-freeze.yml                  | 17 ++++++++++++
 fastlane/lanes/ci_releases.rb                 | 11 ++++++++
 fastlane/lanes/release.rb                     |  9 +++++--
 6 files changed, 99 insertions(+), 2 deletions(-)
 create mode 100755 .buildkite/commands/checkout-release-branch.sh
 create mode 100755 .buildkite/commands/complete-code-freeze.sh
 create mode 100755 .buildkite/commands/log-outdated-pods.sh
 create mode 100644 .buildkite/release-pipelines/complete-code-freeze.yml

diff --git a/.buildkite/commands/checkout-release-branch.sh b/.buildkite/commands/checkout-release-branch.sh
new file mode 100755
index 000000000..97fcb76ff
--- /dev/null
+++ b/.buildkite/commands/checkout-release-branch.sh
@@ -0,0 +1,14 @@
+#!/bin/bash -eu
+
+RELEASE_VERSION=$1
+
+if [[ -z "${RELEASE_VERSION}" ]]; then
+    echo "Usage $0 <release version, e.g. 1.2.3>"
+    exit 1
+fi
+
+# Buildkite, by default, checks out a specific commit.
+# For many release actions, we need to be on a release branch instead.
+BRANCH_NAME="release/${RELEASE_VERSION}"
+git fetch origin "$BRANCH_NAME"
+git checkout "$BRANCH_NAME"
diff --git a/.buildkite/commands/complete-code-freeze.sh b/.buildkite/commands/complete-code-freeze.sh
new file mode 100755
index 000000000..569d91177
--- /dev/null
+++ b/.buildkite/commands/complete-code-freeze.sh
@@ -0,0 +1,26 @@
+#!/bin/bash -eu
+
+RELEASE_NUMBER=$1
+
+if [[ -z "${RELEASE_NUMBER}" ]]; then
+    echo "Usage $0 <release number>"
+    exit 1
+fi
+
+echo '--- :git: Configure Git for release management'
+.buildkite/commands/configure-git-for-release-management.sh
+
+echo '--- :git: Checkout release branch'
+.buildkite/commands/checkout-release-branch.sh "$RELEASE_NUMBER"
+
+echo '--- :ruby: Setup Ruby tools'
+install_gems
+
+echo "--- :swift: Set up Swift Packages"
+install_swiftpm_dependencies
+
+echo '--- :closed_lock_with_key: Access secrets'
+bundle exec fastlane run configure_apply
+
+echo '--- :shipit: Complete code freeze'
+bundle exec fastlane complete_code_freeze skip_confirm:true
diff --git a/.buildkite/commands/log-outdated-pods.sh b/.buildkite/commands/log-outdated-pods.sh
new file mode 100755
index 000000000..c389c15ba
--- /dev/null
+++ b/.buildkite/commands/log-outdated-pods.sh
@@ -0,0 +1,24 @@
+#!/bin/bash -eu
+
+RELEASE_VERSION=$1
+
+if [[ -z "${RELEASE_VERSION}" ]]; then
+    echo "Usage $0 <release number>"
+    exit 1
+fi
+
+echo '--- :git: Checkout release branch'
+.buildkite/commands/configure-git-for-release-management.sh
+.buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"
+
+echo '--- :ruby: Setup Ruby tools'
+install_gems
+
+echo '--- :cocoapods: Install Pods (required to check for outdated pods next)'
+install_cocoapods
+
+# Expand this group to surface the information.
+#
+# It's simpler than capturing the CocoaPods output, filtering, and annotating the build with it.
+echo '+++ :cocoapods: Outdated Pods'
+bundle exec pod outdated
diff --git a/.buildkite/release-pipelines/complete-code-freeze.yml b/.buildkite/release-pipelines/complete-code-freeze.yml
new file mode 100644
index 000000000..35d442f67
--- /dev/null
+++ b/.buildkite/release-pipelines/complete-code-freeze.yml
@@ -0,0 +1,17 @@
+env:
+  IMAGE_ID: $IMAGE_ID
+
+# The code freeze completion needs to run on macOS because it uses genstrings under the hood.
+agents:
+    queue: mac
+
+steps:
+  - label: Complete Code Freeze
+    key: complete_code_freeze
+    plugins: [$CI_TOOLKIT_PLUGIN]
+    command: .buildkite/commands/complete-code-freeze.sh $RELEASE_VERSION
+
+  - label: Log Outdated Pods
+    depends_on: complete_code_freeze
+    plugins: [$CI_TOOLKIT_PLUGIN]
+    command: .buildkite/commands/log-outdated-pods.sh $RELEASE_VERSION
diff --git a/fastlane/lanes/ci_releases.rb b/fastlane/lanes/ci_releases.rb
index 777341f29..c59892f45 100644
--- a/fastlane/lanes/ci_releases.rb
+++ b/fastlane/lanes/ci_releases.rb
@@ -12,4 +12,15 @@
       message: 'Start Code Freeze'
     )
   end
+
+  lane :trigger_complete_code_freeze_in_ci do |release_version: release_version_current|
+    buildkite_trigger_build(
+      buildkite_organization: BUILDKITE_ORGANIZATION,
+      buildkite_pipeline: BUILDKITE_PIPELINE,
+      branch: release_branch_name(release_version: release_version),
+      pipeline_file: File.join(PIPELINES_ROOT, 'complete-code-freeze.yml'),
+      message: "Complete code freeze for #{release_version}",
+      environment: { RELEASE_VERSION: release_version }
+    )
+  end
 end
diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 571403e61..f007414b7 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -57,7 +57,10 @@
     UI.important('Pushing changes to remote, configuring the release on GitHub, and triggering the beta build...')
     UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.") unless skip_confirm || UI.confirm('Do you want to continue?')
 
-    push_to_git_remote(tags: false, set_upstream: true)
+    push_to_git_remote(
+      tags: false,
+      set_upstream: is_ci == false # only set upstream when running locally, useless in transient CI builds
+    )
 
     copy_branch_protection(
       repository: GITHUB_REPO,
@@ -113,10 +116,12 @@
       title: "Merge #{version} code freeze"
     )
 
+    next unless is_ci
+
     message = <<~MESSAGE
       Code freeze completed successfully. Next, review and merge the [integration PR](#{pr_url}).
     MESSAGE
-    buildkite_annotate(context: 'code-freeze-completed', style: 'success', message: message) if is_ci
+    buildkite_annotate(context: 'code-freeze-completed', style: 'success', message: message)
   end
 
   lane :new_beta_release do |skip_confirm: false|

From ba38ecba21d81248d8625f653704932765b12e5f Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 4 Sep 2024 12:29:45 +1000
Subject: [PATCH 467/547] Run `update_appstore_strings` from
 `complete_code_freeze`

---
 fastlane/lanes/release.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index f007414b7..324d2a299 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -101,6 +101,8 @@
 
     generate_strings_file_for_glotpress
 
+    update_appstore_strings
+
     unless skip_confirm || UI.confirm('Ready to push changes to remote and trigger the beta build?')
       UI.message("Terminating as requested. Don't forget to run the remainder of this automation manually.")
       next

From 59dca8d5a9a9d2d69b803e002d1c1773919cce80 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 4 Sep 2024 12:31:18 +1000
Subject: [PATCH 468/547] Fix TestFlight submission using release notes path
 instead of content

---
 fastlane/lanes/build.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb
index 84ea7fbb8..f1754d342 100644
--- a/fastlane/lanes/build.rb
+++ b/fastlane/lanes/build.rb
@@ -45,7 +45,7 @@
     api_key_path: APP_STORE_CONNECT_KEY_PATH,
     skip_waiting_for_build_processing: false,
     distribute_external: true,
-    changelog: RELEASE_NOTES_SOURCE_PATH,
+    changelog: File.read(RELEASE_NOTES_SOURCE_PATH),
     reject_build_waiting_for_review: true,
     groups: ['Internal A8C Beta Testers', 'External Beta Testers']
   )

From 0d0b4fd1e9a416e5e7fc8d36f814116629b7de82 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 4 Sep 2024 13:59:42 +1000
Subject: [PATCH 469/547] Fix typo

Co-authored-by: Spencer Transier <17955542+spencertransier@users.noreply.github.com>
---
 fastlane/Fastfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 2adc1e393..4c892e9d3 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -48,7 +48,7 @@ RELEASE_NOTES_SOURCE_PATH = File.join(STORE_METADATA_DEFAULT_LOCALE_FOLDER, 'rel
 
 require_relative 'lib/env_manager'
 
-# Important: These need to be imported after all the constants have be defined because they access them.
+# Important: These need to be imported after all the constants have been defined because they access them.
 # A bit of a leaky abstraction but makes for lanes that are easier to write...
 import 'lanes/build.rb'
 import 'lanes/ci_releases.rb'

From e6dd627e6f53bd1401dc3df04a2bb5080d4c7170 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 4 Sep 2024 14:13:32 +1000
Subject: [PATCH 470/547] Remove log outdated pods from complete code freeze

Code freeze does it already
---
 .buildkite/commands/log-outdated-pods.sh      | 24 -------------------
 .../complete-code-freeze.yml                  |  5 ----
 2 files changed, 29 deletions(-)
 delete mode 100755 .buildkite/commands/log-outdated-pods.sh

diff --git a/.buildkite/commands/log-outdated-pods.sh b/.buildkite/commands/log-outdated-pods.sh
deleted file mode 100755
index c389c15ba..000000000
--- a/.buildkite/commands/log-outdated-pods.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash -eu
-
-RELEASE_VERSION=$1
-
-if [[ -z "${RELEASE_VERSION}" ]]; then
-    echo "Usage $0 <release number>"
-    exit 1
-fi
-
-echo '--- :git: Checkout release branch'
-.buildkite/commands/configure-git-for-release-management.sh
-.buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"
-
-echo '--- :ruby: Setup Ruby tools'
-install_gems
-
-echo '--- :cocoapods: Install Pods (required to check for outdated pods next)'
-install_cocoapods
-
-# Expand this group to surface the information.
-#
-# It's simpler than capturing the CocoaPods output, filtering, and annotating the build with it.
-echo '+++ :cocoapods: Outdated Pods'
-bundle exec pod outdated
diff --git a/.buildkite/release-pipelines/complete-code-freeze.yml b/.buildkite/release-pipelines/complete-code-freeze.yml
index 35d442f67..642188769 100644
--- a/.buildkite/release-pipelines/complete-code-freeze.yml
+++ b/.buildkite/release-pipelines/complete-code-freeze.yml
@@ -10,8 +10,3 @@ steps:
     key: complete_code_freeze
     plugins: [$CI_TOOLKIT_PLUGIN]
     command: .buildkite/commands/complete-code-freeze.sh $RELEASE_VERSION
-
-  - label: Log Outdated Pods
-    depends_on: complete_code_freeze
-    plugins: [$CI_TOOLKIT_PLUGIN]
-    command: .buildkite/commands/log-outdated-pods.sh $RELEASE_VERSION

From 3ad44174258a581732ed74c80559fa0f272a0457 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 4 Sep 2024 14:14:16 +1000
Subject: [PATCH 471/547] Set `retry: manual: allowed: false` for release
 pipelines

Co-authored-by: Spencer Transier <spencer.transier@automattic.com>
---
 .buildkite/release-pipelines/complete-code-freeze.yml | 5 +++++
 .buildkite/release-pipelines/start-code-freeze.yml    | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/.buildkite/release-pipelines/complete-code-freeze.yml b/.buildkite/release-pipelines/complete-code-freeze.yml
index 642188769..198684a79 100644
--- a/.buildkite/release-pipelines/complete-code-freeze.yml
+++ b/.buildkite/release-pipelines/complete-code-freeze.yml
@@ -10,3 +10,8 @@ steps:
     key: complete_code_freeze
     plugins: [$CI_TOOLKIT_PLUGIN]
     command: .buildkite/commands/complete-code-freeze.sh $RELEASE_VERSION
+    retry:
+      manual:
+        # If failed, we prefer retrying via ReleaseV2 rather than Buildkite.
+        # Rationale: ReleaseV2 is the source of truth for the process and track links to the various builds.
+        allowed: false
diff --git a/.buildkite/release-pipelines/start-code-freeze.yml b/.buildkite/release-pipelines/start-code-freeze.yml
index dc258e873..d52dd05c1 100644
--- a/.buildkite/release-pipelines/start-code-freeze.yml
+++ b/.buildkite/release-pipelines/start-code-freeze.yml
@@ -15,3 +15,8 @@ steps:
 
       echo '--- :shipit: Start code freeze'
       bundle exec fastlane code_freeze skip_confirm:true
+    retry:
+      manual:
+        # If failed, we prefer retrying via ReleaseV2 rather than Buildkite.
+        # Rationale: ReleaseV2 is the source of truth for the process and track links to the various builds.
+        allowed: false

From c60f919d7bc223c3e6e287917ddd0307d464fcfd Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 4 Sep 2024 14:33:01 +1000
Subject: [PATCH 472/547] Remove unnecessary SwiftPM cache download from CI
 complete code freeze

Co-authored-by: Spencer Transier <spencer.transier@automattic.com>
---
 .buildkite/commands/complete-code-freeze.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.buildkite/commands/complete-code-freeze.sh b/.buildkite/commands/complete-code-freeze.sh
index 569d91177..94f6bc036 100755
--- a/.buildkite/commands/complete-code-freeze.sh
+++ b/.buildkite/commands/complete-code-freeze.sh
@@ -16,9 +16,6 @@ echo '--- :git: Checkout release branch'
 echo '--- :ruby: Setup Ruby tools'
 install_gems
 
-echo "--- :swift: Set up Swift Packages"
-install_swiftpm_dependencies
-
 echo '--- :closed_lock_with_key: Access secrets'
 bundle exec fastlane run configure_apply
 

From e010be12ee0ca89f91ebb4e4cb87b529aff30d4c Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 4 Sep 2024 14:37:53 +1000
Subject: [PATCH 473/547] Add YAML schema to Buildkite pipelines

---
 .buildkite/pipeline.yml                               | 5 +++++
 .buildkite/release-pipelines/complete-code-freeze.yml | 5 +++++
 .buildkite/release-pipelines/start-code-freeze.yml    | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 434a20632..5e4fb659f 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,3 +1,8 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
+---
+
+# Variables used in this pipeline are defined in `shared-pipeline-vars`, which is `source`'d before calling `buildkite-agent pipeline upload`
+
 agents:
   queue: mac
 
diff --git a/.buildkite/release-pipelines/complete-code-freeze.yml b/.buildkite/release-pipelines/complete-code-freeze.yml
index 198684a79..3011ce954 100644
--- a/.buildkite/release-pipelines/complete-code-freeze.yml
+++ b/.buildkite/release-pipelines/complete-code-freeze.yml
@@ -1,3 +1,8 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
+---
+
+# Variables used in this pipeline are defined in `shared-pipeline-vars`, which is `source`'d before calling `buildkite-agent pipeline upload`
+
 env:
   IMAGE_ID: $IMAGE_ID
 
diff --git a/.buildkite/release-pipelines/start-code-freeze.yml b/.buildkite/release-pipelines/start-code-freeze.yml
index d52dd05c1..d9c7cba2a 100644
--- a/.buildkite/release-pipelines/start-code-freeze.yml
+++ b/.buildkite/release-pipelines/start-code-freeze.yml
@@ -1,3 +1,8 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
+---
+
+# Variables used in this pipeline are defined in `shared-pipeline-vars`, which is `source`'d before calling `buildkite-agent pipeline upload`
+
 steps:
   - label: Start Code Freeze
     plugins:

From b07ebc42f4f789e1ebb33b377778318c65ce6f86 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 4 Sep 2024 14:49:26 +1000
Subject: [PATCH 474/547] Remove the need for the `RELEASE_NUMBER` argument

---
 .buildkite/commands/checkout-release-branch.sh | 10 +++++-----
 .buildkite/commands/complete-code-freeze.sh    |  8 +-------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.buildkite/commands/checkout-release-branch.sh b/.buildkite/commands/checkout-release-branch.sh
index 97fcb76ff..29bbde406 100755
--- a/.buildkite/commands/checkout-release-branch.sh
+++ b/.buildkite/commands/checkout-release-branch.sh
@@ -1,14 +1,14 @@
 #!/bin/bash -eu
 
-RELEASE_VERSION=$1
-
-if [[ -z "${RELEASE_VERSION}" ]]; then
-    echo "Usage $0 <release version, e.g. 1.2.3>"
+# We expect BUILDKITE_RELEASE_VERSION to be as an environment variable, e.g. by the automation that triggers the build on Buildkite.
+# It must use the `BUILDKITE_` prefix to be passed to the agent due to how `hostmgr` works, in case this runs on a Mac agents.
+if [[ -z "${BUILDKITE_RELEASE_VERSION}" ]]; then
+    echo "BUILDKITE_RELEASE_VERSION is not set."
     exit 1
 fi
 
 # Buildkite, by default, checks out a specific commit.
 # For many release actions, we need to be on a release branch instead.
-BRANCH_NAME="release/${RELEASE_VERSION}"
+BRANCH_NAME="release/${BUILDKITE_RELEASE_VERSION}"
 git fetch origin "$BRANCH_NAME"
 git checkout "$BRANCH_NAME"
diff --git a/.buildkite/commands/complete-code-freeze.sh b/.buildkite/commands/complete-code-freeze.sh
index 94f6bc036..b89964871 100755
--- a/.buildkite/commands/complete-code-freeze.sh
+++ b/.buildkite/commands/complete-code-freeze.sh
@@ -1,17 +1,11 @@
 #!/bin/bash -eu
 
-RELEASE_NUMBER=$1
-
-if [[ -z "${RELEASE_NUMBER}" ]]; then
-    echo "Usage $0 <release number>"
-    exit 1
-fi
 
 echo '--- :git: Configure Git for release management'
 .buildkite/commands/configure-git-for-release-management.sh
 
 echo '--- :git: Checkout release branch'
-.buildkite/commands/checkout-release-branch.sh "$RELEASE_NUMBER"
+.buildkite/commands/checkout-release-branch.sh
 
 echo '--- :ruby: Setup Ruby tools'
 install_gems

From 4b6090ee5d5eb8a2bed9a8994c6cc2aca7a44166 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 4 Sep 2024 14:50:06 +1000
Subject: [PATCH 475/547] DRY release-env setup in dedicated script

---
 .buildkite/commands/complete-code-freeze.sh        | 7 +------
 .buildkite/commands/configure-environment.sh       | 7 +++++++
 .buildkite/release-pipelines/start-code-freeze.yml | 6 +-----
 3 files changed, 9 insertions(+), 11 deletions(-)
 create mode 100755 .buildkite/commands/configure-environment.sh

diff --git a/.buildkite/commands/complete-code-freeze.sh b/.buildkite/commands/complete-code-freeze.sh
index b89964871..56089a0c0 100755
--- a/.buildkite/commands/complete-code-freeze.sh
+++ b/.buildkite/commands/complete-code-freeze.sh
@@ -1,15 +1,10 @@
 #!/bin/bash -eu
 
-
-echo '--- :git: Configure Git for release management'
-.buildkite/commands/configure-git-for-release-management.sh
+.buildkite/commands/configure-environment.sh
 
 echo '--- :git: Checkout release branch'
 .buildkite/commands/checkout-release-branch.sh
 
-echo '--- :ruby: Setup Ruby tools'
-install_gems
-
 echo '--- :closed_lock_with_key: Access secrets'
 bundle exec fastlane run configure_apply
 
diff --git a/.buildkite/commands/configure-environment.sh b/.buildkite/commands/configure-environment.sh
new file mode 100755
index 000000000..27e6280e9
--- /dev/null
+++ b/.buildkite/commands/configure-environment.sh
@@ -0,0 +1,7 @@
+#!/bin/bash -eu
+
+echo '--- :git: Configure Git for Release Management'
+.buildkite/commands/configure-git-for-release-management.sh
+
+echo '--- :ruby: Set up Ruby Tools'
+install_gems
diff --git a/.buildkite/release-pipelines/start-code-freeze.yml b/.buildkite/release-pipelines/start-code-freeze.yml
index d9c7cba2a..b80dae166 100644
--- a/.buildkite/release-pipelines/start-code-freeze.yml
+++ b/.buildkite/release-pipelines/start-code-freeze.yml
@@ -12,11 +12,7 @@ steps:
     agents:
         queue: android
     command: |
-      echo '--- :git: Configure Git for release management'
-      .buildkite/commands/configure-git-for-release-management.sh
-
-      echo '--- :ruby: Setup Ruby tools'
-      install_gems
+      .buildkite/commands/configure-environment.sh
 
       echo '--- :shipit: Start code freeze'
       bundle exec fastlane code_freeze skip_confirm:true

From 757b26866bc00790811008113057b00a2093e8a1 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 4 Sep 2024 14:51:59 +1000
Subject: [PATCH 476/547] Inline simplified complete-code-freeze.sh in pipeline

---
 .buildkite/commands/complete-code-freeze.sh          | 12 ------------
 .../release-pipelines/complete-code-freeze.yml       | 12 +++++++++++-
 2 files changed, 11 insertions(+), 13 deletions(-)
 delete mode 100755 .buildkite/commands/complete-code-freeze.sh

diff --git a/.buildkite/commands/complete-code-freeze.sh b/.buildkite/commands/complete-code-freeze.sh
deleted file mode 100755
index 56089a0c0..000000000
--- a/.buildkite/commands/complete-code-freeze.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash -eu
-
-.buildkite/commands/configure-environment.sh
-
-echo '--- :git: Checkout release branch'
-.buildkite/commands/checkout-release-branch.sh
-
-echo '--- :closed_lock_with_key: Access secrets'
-bundle exec fastlane run configure_apply
-
-echo '--- :shipit: Complete code freeze'
-bundle exec fastlane complete_code_freeze skip_confirm:true
diff --git a/.buildkite/release-pipelines/complete-code-freeze.yml b/.buildkite/release-pipelines/complete-code-freeze.yml
index 3011ce954..537241362 100644
--- a/.buildkite/release-pipelines/complete-code-freeze.yml
+++ b/.buildkite/release-pipelines/complete-code-freeze.yml
@@ -14,7 +14,17 @@ steps:
   - label: Complete Code Freeze
     key: complete_code_freeze
     plugins: [$CI_TOOLKIT_PLUGIN]
-    command: .buildkite/commands/complete-code-freeze.sh $RELEASE_VERSION
+    command: |
+      .buildkite/commands/configure-environment.sh
+
+      echo '--- :git: Checkout release branch'
+      .buildkite/commands/checkout-release-branch.sh
+
+      echo '--- :closed_lock_with_key: Access secrets'
+      bundle exec fastlane run configure_apply
+
+      echo '--- :shipit: Complete code freeze'
+      bundle exec fastlane complete_code_freeze skip_confirm:true
     retry:
       manual:
         # If failed, we prefer retrying via ReleaseV2 rather than Buildkite.

From 230b506c8ddeb23f2cbd4d49ecb0b600aac49780 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 4 Sep 2024 15:14:34 +1000
Subject: [PATCH 477/547] Run start code freeze on `tumblr-metal` agent

---
 .buildkite/release-pipelines/start-code-freeze.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.buildkite/release-pipelines/start-code-freeze.yml b/.buildkite/release-pipelines/start-code-freeze.yml
index b80dae166..d6c16760a 100644
--- a/.buildkite/release-pipelines/start-code-freeze.yml
+++ b/.buildkite/release-pipelines/start-code-freeze.yml
@@ -10,9 +10,13 @@ steps:
     # The first client to implement releases in CI was Android so the automation works in that queue.
     # We might want to move it to a leaner one in the future.
     agents:
-        queue: android
+        queue: tumblr-metal
     command: |
-      .buildkite/commands/configure-environment.sh
+      echo '--- :robot_face: Use bot for git operations'
+      source use-bot-for-git
+
+      echo '--- :ruby: Setup Ruby Tools'
+      install_gems
 
       echo '--- :shipit: Start code freeze'
       bundle exec fastlane code_freeze skip_confirm:true

From ad1541176bef7d0b6e80878f15911af27afa4370 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 4 Sep 2024 15:15:12 +1000
Subject: [PATCH 478/547] Inlinie `configure-environment.sh` script

---
 .buildkite/commands/configure-environment.sh          | 7 -------
 .buildkite/release-pipelines/complete-code-freeze.yml | 6 +++++-
 2 files changed, 5 insertions(+), 8 deletions(-)
 delete mode 100755 .buildkite/commands/configure-environment.sh

diff --git a/.buildkite/commands/configure-environment.sh b/.buildkite/commands/configure-environment.sh
deleted file mode 100755
index 27e6280e9..000000000
--- a/.buildkite/commands/configure-environment.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash -eu
-
-echo '--- :git: Configure Git for Release Management'
-.buildkite/commands/configure-git-for-release-management.sh
-
-echo '--- :ruby: Set up Ruby Tools'
-install_gems
diff --git a/.buildkite/release-pipelines/complete-code-freeze.yml b/.buildkite/release-pipelines/complete-code-freeze.yml
index 537241362..4a5990cf1 100644
--- a/.buildkite/release-pipelines/complete-code-freeze.yml
+++ b/.buildkite/release-pipelines/complete-code-freeze.yml
@@ -15,11 +15,15 @@ steps:
     key: complete_code_freeze
     plugins: [$CI_TOOLKIT_PLUGIN]
     command: |
-      .buildkite/commands/configure-environment.sh
+      echo '--- :git: Configure Git for Release Management'
+      .buildkite/commands/configure-git-for-release-management.sh
 
       echo '--- :git: Checkout release branch'
       .buildkite/commands/checkout-release-branch.sh
 
+      echo '--- :ruby: Set up Ruby Tools'
+      install_gems
+
       echo '--- :closed_lock_with_key: Access secrets'
       bundle exec fastlane run configure_apply
 

From 16d6b4c15f882eeb668f62f39f0688337afc9a0c Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 4 Sep 2024 15:15:27 +1000
Subject: [PATCH 479/547] Update `configure-git-for-release-management.sh` to
 use modern setup

With "modern" I mean what's used in later iteration of the setup.

Compare WordPress iOS,
https://github.com/wordpress-mobile/WordPress-iOS/blob/b4de5f928cd784cb85144ca469b27910666d8d30/.buildkite/commands/configure-git-for-release-management.sh
, with WooCommerce iOS
https://github.com/woocommerce/woocommerce-ios/blob/c2f38422ddb12b891afbab9962869affa7722af2/.buildkite/commands/configure-git-for-release-management.sh
---
 .../commands/configure-git-for-release-management.sh       | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.buildkite/commands/configure-git-for-release-management.sh b/.buildkite/commands/configure-git-for-release-management.sh
index 215bcaa7e..6aeae2b3b 100755
--- a/.buildkite/commands/configure-git-for-release-management.sh
+++ b/.buildkite/commands/configure-git-for-release-management.sh
@@ -3,11 +3,6 @@
 # The Git command line client is not configured in Buildkite.
 # At the moment, steps that need Git access can configure it on deman using this script.
 # Later on, we should be able to configure it on the agent instead.
-
-curl -L https://api.github.com/meta | jq -r '.ssh_keys | .[]' | sed -e 's/^/github.com /' >> ~/.ssh/known_hosts
+add_host_to_ssh_known_hosts github.com
 git config --global user.email "mobile+wpmobilebot@automattic.com"
 git config --global user.name "Automattic Release Bot"
-
-# Buildkite is currently using the HTTPS URL to checkout.
-# We need to override it to be able to use the deploy key.
-git remote set-url origin git@github.com:Automattic/simplenote-ios.git

From 16d53c2e7079180fe2c69d50d656de1ce3a06462 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 4 Sep 2024 15:37:08 +1000
Subject: [PATCH 480/547] Pass `wpmobilebot` explicitly in
 `start-code-freeze.yml`

---
 .buildkite/release-pipelines/start-code-freeze.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/release-pipelines/start-code-freeze.yml b/.buildkite/release-pipelines/start-code-freeze.yml
index d6c16760a..476cfc0b1 100644
--- a/.buildkite/release-pipelines/start-code-freeze.yml
+++ b/.buildkite/release-pipelines/start-code-freeze.yml
@@ -13,7 +13,7 @@ steps:
         queue: tumblr-metal
     command: |
       echo '--- :robot_face: Use bot for git operations'
-      source use-bot-for-git
+      source use-bot-for-git wpmobilebot
 
       echo '--- :ruby: Setup Ruby Tools'
       install_gems

From a3ffcd1b0c24d202c6b05664c758d6aff125a6ff Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 4 Sep 2024 15:37:34 +1000
Subject: [PATCH 481/547] Capitalize Git because it's a noun

---
 .buildkite/release-pipelines/start-code-freeze.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/release-pipelines/start-code-freeze.yml b/.buildkite/release-pipelines/start-code-freeze.yml
index 476cfc0b1..16e824516 100644
--- a/.buildkite/release-pipelines/start-code-freeze.yml
+++ b/.buildkite/release-pipelines/start-code-freeze.yml
@@ -12,7 +12,7 @@ steps:
     agents:
         queue: tumblr-metal
     command: |
-      echo '--- :robot_face: Use bot for git operations'
+      echo '--- :robot_face: Use bot for Git operations'
       source use-bot-for-git wpmobilebot
 
       echo '--- :ruby: Setup Ruby Tools'

From d518260e069044a8e5ba9f4c3ecaa42112791a17 Mon Sep 17 00:00:00 2001
From: Automattic Release Bot <mobile+wpmobilebot@automattic.com>
Date: Wed, 4 Sep 2024 01:44:10 -0400
Subject: [PATCH 482/547] Bump version number

---
 config/Version.Public.xcconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/Version.Public.xcconfig b/config/Version.Public.xcconfig
index f78d955d1..0249d51a1 100644
--- a/config/Version.Public.xcconfig
+++ b/config/Version.Public.xcconfig
@@ -1,2 +1,2 @@
-VERSION_LONG = 4.52.0.5
-VERSION_SHORT = 4.52
+VERSION_LONG = 4.53.0.0
+VERSION_SHORT = 4.53

From 41582ce9c83fee0ce731caa8a632fa2c0643d7ca Mon Sep 17 00:00:00 2001
From: Automattic Release Bot <mobile+wpmobilebot@automattic.com>
Date: Wed, 4 Sep 2024 01:44:10 -0400
Subject: [PATCH 483/547] Delete release notes source and localization before
 code freeze

---
 fastlane/metadata/ar-SA/release_notes.txt   | 6 ------
 fastlane/metadata/de-DE/release_notes.txt   | 6 ------
 fastlane/metadata/default/release_notes.txt | 6 ------
 fastlane/metadata/es-ES/release_notes.txt   | 6 ------
 fastlane/metadata/fr-FR/release_notes.txt   | 6 ------
 fastlane/metadata/he/release_notes.txt      | 6 ------
 fastlane/metadata/id/release_notes.txt      | 6 ------
 fastlane/metadata/it/release_notes.txt      | 6 ------
 fastlane/metadata/ja/release_notes.txt      | 6 ------
 fastlane/metadata/ko/release_notes.txt      | 6 ------
 fastlane/metadata/nl-NL/release_notes.txt   | 6 ------
 fastlane/metadata/pt-BR/release_notes.txt   | 6 ------
 fastlane/metadata/ru/release_notes.txt      | 6 ------
 fastlane/metadata/sv/release_notes.txt      | 6 ------
 fastlane/metadata/tr/release_notes.txt      | 6 ------
 fastlane/metadata/zh-Hans/release_notes.txt | 6 ------
 fastlane/metadata/zh-Hant/release_notes.txt | 6 ------
 17 files changed, 102 deletions(-)
 delete mode 100644 fastlane/metadata/ar-SA/release_notes.txt
 delete mode 100644 fastlane/metadata/de-DE/release_notes.txt
 delete mode 100644 fastlane/metadata/default/release_notes.txt
 delete mode 100644 fastlane/metadata/es-ES/release_notes.txt
 delete mode 100644 fastlane/metadata/fr-FR/release_notes.txt
 delete mode 100644 fastlane/metadata/he/release_notes.txt
 delete mode 100644 fastlane/metadata/id/release_notes.txt
 delete mode 100644 fastlane/metadata/it/release_notes.txt
 delete mode 100644 fastlane/metadata/ja/release_notes.txt
 delete mode 100644 fastlane/metadata/ko/release_notes.txt
 delete mode 100644 fastlane/metadata/nl-NL/release_notes.txt
 delete mode 100644 fastlane/metadata/pt-BR/release_notes.txt
 delete mode 100644 fastlane/metadata/ru/release_notes.txt
 delete mode 100644 fastlane/metadata/sv/release_notes.txt
 delete mode 100644 fastlane/metadata/tr/release_notes.txt
 delete mode 100644 fastlane/metadata/zh-Hans/release_notes.txt
 delete mode 100644 fastlane/metadata/zh-Hant/release_notes.txt

diff --git a/fastlane/metadata/ar-SA/release_notes.txt b/fastlane/metadata/ar-SA/release_notes.txt
deleted file mode 100644
index a91c96a46..000000000
--- a/fastlane/metadata/ar-SA/release_notes.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- تم تمديد دعم اختصارات نظام التشغيل iOS
-- تم إصلاح مشكلة تتمثَّل في فقدان تحديد الملاحظات عند تشغيل التطبيق في الخلفية
-- تم إصلاح مشكلة قد تؤدي إلى تفعيل مفتاح faceid من دون رمز مرور
-- دعم تسجيل الدخول عبر رابط سحري
-- تم تجديد واجهة مستخدم تسجيل الدخول
-
diff --git a/fastlane/metadata/de-DE/release_notes.txt b/fastlane/metadata/de-DE/release_notes.txt
deleted file mode 100644
index 3f6dfa710..000000000
--- a/fastlane/metadata/de-DE/release_notes.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Erweiterter Support für iOS-Kurzbefehle
-- Fehler behoben, durch den die Notizenauswahl verloren ging, wenn die App im Hintergrund lief
-- Fehler behoben, durch den der Wechsel zu Face ID ohne Zugangscode aktiviert wurde
-- Support für die Anmeldung mit magischem Link
-- Anmelde-UI wurde überarbeitet
-
diff --git a/fastlane/metadata/default/release_notes.txt b/fastlane/metadata/default/release_notes.txt
deleted file mode 100644
index a9bcf28d6..000000000
--- a/fastlane/metadata/default/release_notes.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Extended support for iOS Shortcuts
-- Fixed issue where notes selection was lost when app backgrounded
-- Fixed an issue can activate the faceid switch without a passcode
-- Magic Link Login Support
-- Login UI has been overhauled
-
diff --git a/fastlane/metadata/es-ES/release_notes.txt b/fastlane/metadata/es-ES/release_notes.txt
deleted file mode 100644
index 4feea5979..000000000
--- a/fastlane/metadata/es-ES/release_notes.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Mayor compatibilidad con los accesos directos de iOS
-- Se ha solucionado un problema por el que se perdía la selección de notas al pasar la aplicación a segundo plano
-- Se ha solucionado un problema; ya se puede activar el interruptor de ID facial sin un código de acceso
-- Compatibilidad con el acceso mediante enlaces mágicos
-- Se ha revisado la interfaz de acceso
-
diff --git a/fastlane/metadata/fr-FR/release_notes.txt b/fastlane/metadata/fr-FR/release_notes.txt
deleted file mode 100644
index cafd3fe43..000000000
--- a/fastlane/metadata/fr-FR/release_notes.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Prise en charge étendue des raccourcis sur iOS
-- Correction d’un problème de perte de la sélection de notes lors du passage de l’application en arrière-plan
-- Correction d’un problème susceptible d’activer le basculement vers Face ID sans mot de passe
-- Prise en charge de la connexion par lien magique
-- Interface utilisateur de connexion remaniée
-
diff --git a/fastlane/metadata/he/release_notes.txt b/fastlane/metadata/he/release_notes.txt
deleted file mode 100644
index d91b5a301..000000000
--- a/fastlane/metadata/he/release_notes.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- תמיכה מורחבת לקיצורים של iOS
-- תיקנו בעיה שגרמה לאיבוד של בחירת פתקים כאשר האפליקציה מועברת לרקע
-- תיקנו בעיה שאפשרה הפעלה של Face ID גם בלי קוד סיסמה
-- תמיכה בהתחברות באמצעות קישור ישיר
-- ממשק המשתמש של תהליך ההתחברות שודרג
-
diff --git a/fastlane/metadata/id/release_notes.txt b/fastlane/metadata/id/release_notes.txt
deleted file mode 100644
index 4a225afaa..000000000
--- a/fastlane/metadata/id/release_notes.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Peningkatan dukungan untuk Pintasan iOS
-- Perbaikan masalah hilangnya pemilihan catatan saat aplikasi dijalankan di latar belakang
-- Perbaikan masalah aktivasi tombol faceid tanpa kode sandi
-- Dukungan Login Tautan Ajaib
-- Perombakan UI Login
-
diff --git a/fastlane/metadata/it/release_notes.txt b/fastlane/metadata/it/release_notes.txt
deleted file mode 100644
index f5ee20a2e..000000000
--- a/fastlane/metadata/it/release_notes.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Supporto esteso per Tasti di scelta rapida di iOS
-- Risolto un problema per cui la selezione delle note andava persa quando l'app era in background
-- Risolto un problema per cui FaceID poteva essere attivato senza PIN
-- Supporto per l'accesso tramite link magico
-- La UI di accesso è stata revisionata
-
diff --git a/fastlane/metadata/ja/release_notes.txt b/fastlane/metadata/ja/release_notes.txt
deleted file mode 100644
index abf6d8542..000000000
--- a/fastlane/metadata/ja/release_notes.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- iOS ショートカットのサポートを拡張しました
-- アプリがバックグランドで実行される際、メモの選択が失われていた問題を修正しました
-- パスコードなしで FaceID の切り替えを有効化できた問題を修正しました
-- マジックリンクでのログインに対するサポート
-- ログイン UI が刷新されました
-
diff --git a/fastlane/metadata/ko/release_notes.txt b/fastlane/metadata/ko/release_notes.txt
deleted file mode 100644
index 42dff9082..000000000
--- a/fastlane/metadata/ko/release_notes.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- iOS Shortcuts에 대한 지원 연장됨
-- 앱이 백그라운드에서 실행될 때 메모 선택 항목이 사라지던 문제가 해결됨
-- 비밀번호 없이도 FaceID 스위치를 활성화할 수 있는 문제가 해결됨
-- 매직 링크 로그인 지원
-- 로그인 UI가 개편됨
-
diff --git a/fastlane/metadata/nl-NL/release_notes.txt b/fastlane/metadata/nl-NL/release_notes.txt
deleted file mode 100644
index fabc36568..000000000
--- a/fastlane/metadata/nl-NL/release_notes.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Uitgebreide ondersteuning voor iOS Shortcuts
-- Probleem opgelost waarbij de selectie van notities verloren ging als de app op de achtergrond draaide
-- Probleem opgelost waarbij de FaceID veranderd kon worden zonder wachtwoordcode
-- Ondersteuning voor inloggen via magische link
-- De UI voor het inloggen heeft een opknapbeurt gekregen
-
diff --git a/fastlane/metadata/pt-BR/release_notes.txt b/fastlane/metadata/pt-BR/release_notes.txt
deleted file mode 100644
index 4bcf14a70..000000000
--- a/fastlane/metadata/pt-BR/release_notes.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Suporte estendido para os Atalhos do iOS
-- Problema corrigido em que a seleção de notas era perdida quando o aplicativo ficava em segundo plano
-- Problema corrigido para ativar a configuração do Face ID sem uma senha
-- Suporte para login com link mágico
-- A IU de login foi modificada
-
diff --git a/fastlane/metadata/ru/release_notes.txt b/fastlane/metadata/ru/release_notes.txt
deleted file mode 100644
index 4a73a2020..000000000
--- a/fastlane/metadata/ru/release_notes.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Расширенная поддержка ярлыков iOS.
-- Исправлена ошибка, из-за которой выбор заметок сбрасывался при переходе приложения в фоновый режим.
-- Исправлена ошибка, из-за которой Face ID переключался без пароля.
-- Поддержка входа по волшебной ссылке.
-- Переработан интерфейс входа в систему.
-
diff --git a/fastlane/metadata/sv/release_notes.txt b/fastlane/metadata/sv/release_notes.txt
deleted file mode 100644
index 9a83a80f9..000000000
--- a/fastlane/metadata/sv/release_notes.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- Vi har utökat stödet för iOS-genvägar
-- Vi har åtgärdat ett problem som gjorde att anteckningsval gick förlorade när appen placerades i bakgrunden
-- Vi har åtgärdat ett problem som gjorde att omkopplaren för ansiktsidentifiering kunde aktiveras utan en lösenkod
-- Stöd för inloggning via magisk länk
-- Användargränssnittet för inloggning har fått en översyn
-
diff --git a/fastlane/metadata/tr/release_notes.txt b/fastlane/metadata/tr/release_notes.txt
deleted file mode 100644
index cb9b7078e..000000000
--- a/fastlane/metadata/tr/release_notes.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- iOS Kısayollar için genişletilmiş destek
-- Uygulama arkaplandayken not seçiminin kaybolmasına neden olan sorun düzeltildi
-- Şifre olmadan FaceID anahtarını etkinleştirebilen bir sorun düzeltildi
-- Sihirli Bağlantı Oturum Açma Desteği
-- Oturum açma kullanıcı arayüzü değiştirildi
-
diff --git a/fastlane/metadata/zh-Hans/release_notes.txt b/fastlane/metadata/zh-Hans/release_notes.txt
deleted file mode 100644
index c7042ba86..000000000
--- a/fastlane/metadata/zh-Hans/release_notes.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- 扩展了对 iOS 快捷方式的支持
-- 修复了当应用程序处于后台时丢失注释选择的问题
-- 修复了无需密码即可激活 FaceID 切换开关的问题
-- 新增对使用免密登录链接进行登录的支持
-- 登录用户界面已全面改版
-
diff --git a/fastlane/metadata/zh-Hant/release_notes.txt b/fastlane/metadata/zh-Hant/release_notes.txt
deleted file mode 100644
index 2949fda75..000000000
--- a/fastlane/metadata/zh-Hant/release_notes.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-- 已延長 iOS 捷徑支援
-- 已修正應用程式在背景執行時遺失備註選取的問題
-- 已修正不須使用密碼啟用 FaceID 切換的問題
-- 神奇連結登入支援
-- 登入 UI 已經過徹底改造
-

From 2c1c48f84ba54871216dac6e165c8f72b2ac46e4 Mon Sep 17 00:00:00 2001
From: Automattic Release Bot <mobile+wpmobilebot@automattic.com>
Date: Wed, 4 Sep 2024 01:44:10 -0400
Subject: [PATCH 484/547] Update draft release notes for 4.53.

---
 fastlane/metadata/default/release_notes.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/default/release_notes.txt

diff --git a/fastlane/metadata/default/release_notes.txt b/fastlane/metadata/default/release_notes.txt
new file mode 100644
index 000000000..139597f9c
--- /dev/null
+++ b/fastlane/metadata/default/release_notes.txt
@@ -0,0 +1,2 @@
+
+

From 8e08aae72ccb907269190a133997e197676b3686 Mon Sep 17 00:00:00 2001
From: Automattic Release Bot <mobile+wpmobilebot@automattic.com>
Date: Wed, 4 Sep 2024 01:44:10 -0400
Subject: [PATCH 485/547] Release Notes: add new section for next version
 (4.54)

---
 RELEASE-NOTES.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 83a0ae689..e0417557d 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,3 +1,7 @@
+4.54
+-----
+
+
 4.53
 -----
 

From 47c810432d83fc3ffa945fb9cae94cb54fec7314 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 4 Sep 2024 15:47:43 +1000
Subject: [PATCH 486/547] Update `release_notes.txt` with copy for 4.53

---
 fastlane/metadata/default/release_notes.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fastlane/metadata/default/release_notes.txt b/fastlane/metadata/default/release_notes.txt
index 139597f9c..b216c8740 100644
--- a/fastlane/metadata/default/release_notes.txt
+++ b/fastlane/metadata/default/release_notes.txt
@@ -1,2 +1 @@
-
-
+Improvements under the hood.

From abbf62de4782b57ea9b42e0d2b0f35753ab8e4d6 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 4 Sep 2024 15:55:59 +1000
Subject: [PATCH 487/547] Fix a `ensure_git_branch_is_release_branch!` usage
 without `!`

---
 fastlane/lanes/release.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 324d2a299..1b476d3ba 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -90,7 +90,7 @@
   end
 
   lane :complete_code_freeze do |skip_confirm: false|
-    ensure_git_branch_is_release_branch
+    ensure_git_branch_is_release_branch!
     ensure_git_status_clean
 
     version = release_version_current

From d8044168657d17d482dc338056ef8d48bdbe609d Mon Sep 17 00:00:00 2001
From: Automattic Release Bot <mobile+wpmobilebot@automattic.com>
Date: Tue, 3 Sep 2024 23:09:16 -0700
Subject: [PATCH 488/547] Freeze strings for localization

---
 Simplenote/en.lproj/Localizable.strings | Bin 72540 -> 69070 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Simplenote/en.lproj/Localizable.strings b/Simplenote/en.lproj/Localizable.strings
index c12de2933068731f6a561d70406f7c4f2c7f3fc6..efc04d5d429dd389cac291f2b71cd650f832ac96 100644
GIT binary patch
delta 367
zcmcb!jpf{ImJKpulk+<HChM69Y}OFB5m{WI!?<~et`qO%54>EHWo-C1*H|xNoviSe
z!!(T{lOdI%m_dP|6iB8r6aiT!42cZsKsp7;&jI2RAXZ>V1BzyX`6-hHUF5luWG6F<
z3QzWO65&S@1DP{9aKG?oImaJTlMnE+P4<i6*enp+!8uv&yTaxxS$a&9bCw8A{<Vu|
z^MTx3YMTqDF5?7=Y_6F9gK_er`BIa2Eaur<u;>rtWC2Ez%@Ira*eqQc@)(jC@_}wG
z0=p67@)97g66m%(EUpIm1nBO`Z&yf9Hc%Ft%(FrQOvgRrn_TfvW^!Alz+^rZj?J@H
zXUI-=n8PwT?v&1Cw^K5cTTZD=zNf}D+2K6P<c2dWlMPPmZ920{Y_eWF&*lY>!^Ae%
I{ko?B0MxvADF6Tf

delta 2443
zcmd5;U2Ixq82*kHS}0Ij3Y1aWv;K^AZLlOp4co-l*{sV}Gh2J1F@^!9-GE`C)p>(W
zmR*=QHE#l&da=f2H@c?gm}#sT&S>I=8hf)u(@aggGRuZ{z0hvYdw@ba*mj|bIr%u>
z`M&q}dH?wF{kpZwb<6EG<B*U=QcR1JVpgQ+*LEi@t!WzrB8Vr9n<OptIdxIoN5qVX
z)9*&7B?{WG2#An41@39==IPdc$4<ZK!uNixE-@r(P)UATJ!(;8+hi+U-(}c4EapTC
z&q)yn;{*i1hA&y{5swHx1P!Z7l29H21x&zO22Vl^(1N?0)^_!{S1J@g0KK%LMD{dE
znkn|0R<Cs`&-G6koAi*&&p}lSz!<VW%r5^EaM7pswnkY@;U)~nLds`PtY~OLZc}{z
z-*!A0h?*e7M*eXJ<&FC01FFYv)z?i3U6l}4r2u@N7_Ex@!aF(|ynHDA41~_IAHoOI
z$Hcfef_TKSA}}>1o)yQ$aqNOn^t7rnRfO1$=*oaG3|@ve35qZ{Q;@;o;21Lp??Ngh
zf#SI=Vh8}!%ZDL83^5#;sPJGnj$N!Mb_QfIoV}{vMzLd0;}92BxmY}_Ie^oY2+)GT
zo@S%ez~Frf_j8b1POJai-Q)N6_uqE6`7U=U@T8T-4v#cexJs}5VNG-D&j6+wfEC5>
z>nel=h-Lv+5SDZFN(IEArvSJt+?#p9GL8b$u(}HQ5X7Eyh+`iF<P%t&74A)$D#btr
zi44I7q8hRJKNxJQZm_Z#eCZ*&`MFjT0bnV*I%w^`Uk@5llcGd#(f9$)3cWbxpl=4v
zg)ik+xZa&z)<_1*|Dv}R!Xm4na!5Ep0lK}<PKjYNeLUV^8Ds5yiZx#dDZM=0=_==X
z4GPLknkX^drkLJ3tE<1eS#=tVO$zN3?Tp^lT9u{Dx}+(5E{<C0jSo6#-#L$S0_nlk
z+lwcJH#dQTMG3ln+U_XTA=?;7n#5F3kbd;`PrVvWubq_6x~S*;LAu~=puaO_`s&;v
zy5cotFX$wXa`AkZL>u82>tr!$LwIuvbE^92uXR^*2zwqhaU>k$5u?Bv3%!{&*Rw6S
zrRI#4zWdNX8yVA<vx{d;^ptl8ePPinH{RRO(4YBsnlzcHqg$_hxj5~jo0kl<<kF^(
z!S?cuDS1^GYU)^1X9^dGEOwWhTd~+T$D`=OeQ7RnpW}%ni&6ZRqqhBguh7$_k97T8
z1}(U_gyZ4_cHC?k_1YuX(OZ_vT-CJUoV-pujpe#%Ah(<5a~%{t(m=kiTWGnpl^z>u
zq4;P6oo+L`?&%{@Zm6%~Pr?0d-8$L2%eL~Au4e0;ay9pZjg~!nE*847swJOApY`Y^
zZ8ooy>L~NG&B}?w1r!4`JY3ZD%zEo3%i}zA7>B|?fh4{{6?!<UYcn@(W2Paqg%V9D
t+ixFLzQ5LEqqFO+fq1bxS<CjO%au~fg6GxyYBXiPtJ1JqC4b|(d<Te}F!BHZ


From d7cc1dc4c4a4c50ccb9de94fb1c0d48b2101a9c3 Mon Sep 17 00:00:00 2001
From: Automattic Release Bot <mobile+wpmobilebot@automattic.com>
Date: Tue, 3 Sep 2024 23:09:16 -0700
Subject: [PATCH 489/547] Update metadata strings

---
 Simplenote/Resources/AppStoreStrings.pot | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/Simplenote/Resources/AppStoreStrings.pot b/Simplenote/Resources/AppStoreStrings.pot
index 4e8da139b..f1ded4613 100644
--- a/Simplenote/Resources/AppStoreStrings.pot
+++ b/Simplenote/Resources/AppStoreStrings.pot
@@ -66,13 +66,8 @@ msgctxt "app_store_keywords"
 msgid "notes,note,markdown,journal,sync,to-do,list,cloud,notebook,simple,notepad,tag,todo,writing,memo"
 msgstr ""
 
-msgctxt "v4.52-whats-new"
+msgctxt "v4.53-whats-new"
 msgid ""
-"- Extended support for iOS Shortcuts\n"
-"- Fixed issue where notes selection was lost when app backgrounded\n"
-"- Fixed an issue can activate the faceid switch without a passcode\n"
-"- Magic Link Login Support\n"
-"- Login UI has been overhauled\n"
-"\n"
+"Improvements under the hood.\n"
 msgstr ""
 

From 965846eea913e06c4796ec7cd871973550672662 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 4 Sep 2024 16:11:23 +1000
Subject: [PATCH 490/547] Remove usage of undefined
 `computed_release_branch_name`

See failure in
https://buildkite.com/automattic/simplenote-ios/builds/1100#0191bba6-0150-4b86-bf0f-1fdab906a02a
---
 fastlane/lanes/release.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 1b476d3ba..981270824 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -110,7 +110,7 @@
 
     push_to_git_remote(tags: false)
 
-    trigger_beta_build(branch_to_build: computed_release_branch_name)
+    trigger_beta_build(branch_to_build: release_branch_name(release_version: version))
 
     pr_url = create_release_management_pull_request(
       release_version: version,

From 9f4ff12d641fb13b6eade9b2af56096b07b2a8ff Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 4 Sep 2024 16:12:11 +1000
Subject: [PATCH 491/547] Revert previous localizations changes to retry CI
 code freeze completion

The CI code freeze completion failed, see
https://buildkite.com/automattic/simplenote-ios/builds/1100#0191bba6-0150-4b86-bf0f-1fdab906a02a

The previous commit, 965846eea913e06c4796ec7cd871973550672662,
should fix the issue but in order to retry the full process to have an
authentic test, we need to reset the state.

As such, this reverts:

- d7cc1dc4c4a4c50ccb9de94fb1c0d48b2101a9c3
- d8044168657d17d482dc338056ef8d48bdbe609d
---
 Simplenote/Resources/AppStoreStrings.pot |   9 +++++++--
 Simplenote/en.lproj/Localizable.strings  | Bin 69070 -> 72540 bytes
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Simplenote/Resources/AppStoreStrings.pot b/Simplenote/Resources/AppStoreStrings.pot
index f1ded4613..4e8da139b 100644
--- a/Simplenote/Resources/AppStoreStrings.pot
+++ b/Simplenote/Resources/AppStoreStrings.pot
@@ -66,8 +66,13 @@ msgctxt "app_store_keywords"
 msgid "notes,note,markdown,journal,sync,to-do,list,cloud,notebook,simple,notepad,tag,todo,writing,memo"
 msgstr ""
 
-msgctxt "v4.53-whats-new"
+msgctxt "v4.52-whats-new"
 msgid ""
-"Improvements under the hood.\n"
+"- Extended support for iOS Shortcuts\n"
+"- Fixed issue where notes selection was lost when app backgrounded\n"
+"- Fixed an issue can activate the faceid switch without a passcode\n"
+"- Magic Link Login Support\n"
+"- Login UI has been overhauled\n"
+"\n"
 msgstr ""
 
diff --git a/Simplenote/en.lproj/Localizable.strings b/Simplenote/en.lproj/Localizable.strings
index efc04d5d429dd389cac291f2b71cd650f832ac96..c12de2933068731f6a561d70406f7c4f2c7f3fc6 100644
GIT binary patch
delta 2443
zcmd5;U2Ixq82*kHS}0Ij3Y1aWv;K^AZLlOp4co-l*{sV}Gh2J1F@^!9-GE`C)p>(W
zmR*=QHE#l&da=f2H@c?gm}#sT&S>I=8hf)u(@aggGRuZ{z0hvYdw@ba*mj|bIr%u>
z`M&q}dH?wF{kpZwb<6EG<B*U=QcR1JVpgQ+*LEi@t!WzrB8Vr9n<OptIdxIoN5qVX
z)9*&7B?{WG2#An41@39==IPdc$4<ZK!uNixE-@r(P)UATJ!(;8+hi+U-(}c4EapTC
z&q)yn;{*i1hA&y{5swHx1P!Z7l29H21x&zO22Vl^(1N?0)^_!{S1J@g0KK%LMD{dE
znkn|0R<Cs`&-G6koAi*&&p}lSz!<VW%r5^EaM7pswnkY@;U)~nLds`PtY~OLZc}{z
z-*!A0h?*e7M*eXJ<&FC01FFYv)z?i3U6l}4r2u@N7_Ex@!aF(|ynHDA41~_IAHoOI
z$Hcfef_TKSA}}>1o)yQ$aqNOn^t7rnRfO1$=*oaG3|@ve35qZ{Q;@;o;21Lp??Ngh
zf#SI=Vh8}!%ZDL83^5#;sPJGnj$N!Mb_QfIoV}{vMzLd0;}92BxmY}_Ie^oY2+)GT
zo@S%ez~Frf_j8b1POJai-Q)N6_uqE6`7U=U@T8T-4v#cexJs}5VNG-D&j6+wfEC5>
z>nel=h-Lv+5SDZFN(IEArvSJt+?#p9GL8b$u(}HQ5X7Eyh+`iF<P%t&74A)$D#btr
zi44I7q8hRJKNxJQZm_Z#eCZ*&`MFjT0bnV*I%w^`Uk@5llcGd#(f9$)3cWbxpl=4v
zg)ik+xZa&z)<_1*|Dv}R!Xm4na!5Ep0lK}<PKjYNeLUV^8Ds5yiZx#dDZM=0=_==X
z4GPLknkX^drkLJ3tE<1eS#=tVO$zN3?Tp^lT9u{Dx}+(5E{<C0jSo6#-#L$S0_nlk
z+lwcJH#dQTMG3ln+U_XTA=?;7n#5F3kbd;`PrVvWubq_6x~S*;LAu~=puaO_`s&;v
zy5cotFX$wXa`AkZL>u82>tr!$LwIuvbE^92uXR^*2zwqhaU>k$5u?Bv3%!{&*Rw6S
zrRI#4zWdNX8yVA<vx{d;^ptl8ePPinH{RRO(4YBsnlzcHqg$_hxj5~jo0kl<<kF^(
z!S?cuDS1^GYU)^1X9^dGEOwWhTd~+T$D`=OeQ7RnpW}%ni&6ZRqqhBguh7$_k97T8
z1}(U_gyZ4_cHC?k_1YuX(OZ_vT-CJUoV-pujpe#%Ah(<5a~%{t(m=kiTWGnpl^z>u
zq4;P6oo+L`?&%{@Zm6%~Pr?0d-8$L2%eL~Au4e0;ay9pZjg~!nE*847swJOApY`Y^
zZ8ooy>L~NG&B}?w1r!4`JY3ZD%zEo3%i}zA7>B|?fh4{{6?!<UYcn@(W2Paqg%V9D
t+ixFLzQ5LEqqFO+fq1bxS<CjO%au~fg6GxyYBXiPtJ1JqC4b|(d<Te}F!BHZ

delta 367
zcmcb!jpf{ImJKpulk+<HChM69Y}OFB5m{WI!?<~et`qO%54>EHWo-C1*H|xNoviSe
z!!(T{lOdI%m_dP|6iB8r6aiT!42cZsKsp7;&jI2RAXZ>V1BzyX`6-hHUF5luWG6F<
z3QzWO65&S@1DP{9aKG?oImaJTlMnE+P4<i6*enp+!8uv&yTaxxS$a&9bCw8A{<Vu|
z^MTx3YMTqDF5?7=Y_6F9gK_er`BIa2Eaur<u;>rtWC2Ez%@Ira*eqQc@)(jC@_}wG
z0=p67@)97g66m%(EUpIm1nBO`Z&yf9Hc%Ft%(FrQOvgRrn_TfvW^!Alz+^rZj?J@H
zXUI-=n8PwT?v&1Cw^K5cTTZD=zNf}D+2K6P<c2dWlMPPmZ920{Y_eWF&*lY>!^Ae%
I{ko?B0MxvADF6Tf


From 27f7fe64ce81eaf75e8cacb687669a78bff80289 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 4 Sep 2024 16:15:40 +1000
Subject: [PATCH 492/547] Remove outdated comment from `start-code-freeze.yml`

Co-authored-by: Spencer Transier <spencer.transier@automattic.com>
---
 .buildkite/release-pipelines/start-code-freeze.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.buildkite/release-pipelines/start-code-freeze.yml b/.buildkite/release-pipelines/start-code-freeze.yml
index 16e824516..2d4ee58ae 100644
--- a/.buildkite/release-pipelines/start-code-freeze.yml
+++ b/.buildkite/release-pipelines/start-code-freeze.yml
@@ -7,8 +7,6 @@ steps:
   - label: Start Code Freeze
     plugins:
       - $CI_TOOLKIT_PLUGIN
-    # The first client to implement releases in CI was Android so the automation works in that queue.
-    # We might want to move it to a leaner one in the future.
     agents:
         queue: tumblr-metal
     command: |

From 412c24ccdf787d61a7e31f9b4b242081c8955240 Mon Sep 17 00:00:00 2001
From: Automattic Release Bot <mobile+wpmobilebot@automattic.com>
Date: Tue, 3 Sep 2024 23:16:20 -0700
Subject: [PATCH 493/547] Freeze strings for localization

---
 Simplenote/en.lproj/Localizable.strings | Bin 72540 -> 69070 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Simplenote/en.lproj/Localizable.strings b/Simplenote/en.lproj/Localizable.strings
index c12de2933068731f6a561d70406f7c4f2c7f3fc6..efc04d5d429dd389cac291f2b71cd650f832ac96 100644
GIT binary patch
delta 367
zcmcb!jpf{ImJKpulk+<HChM69Y}OFB5m{WI!?<~et`qO%54>EHWo-C1*H|xNoviSe
z!!(T{lOdI%m_dP|6iB8r6aiT!42cZsKsp7;&jI2RAXZ>V1BzyX`6-hHUF5luWG6F<
z3QzWO65&S@1DP{9aKG?oImaJTlMnE+P4<i6*enp+!8uv&yTaxxS$a&9bCw8A{<Vu|
z^MTx3YMTqDF5?7=Y_6F9gK_er`BIa2Eaur<u;>rtWC2Ez%@Ira*eqQc@)(jC@_}wG
z0=p67@)97g66m%(EUpIm1nBO`Z&yf9Hc%Ft%(FrQOvgRrn_TfvW^!Alz+^rZj?J@H
zXUI-=n8PwT?v&1Cw^K5cTTZD=zNf}D+2K6P<c2dWlMPPmZ920{Y_eWF&*lY>!^Ae%
I{ko?B0MxvADF6Tf

delta 2443
zcmd5;U2Ixq82*kHS}0Ij3Y1aWv;K^AZLlOp4co-l*{sV}Gh2J1F@^!9-GE`C)p>(W
zmR*=QHE#l&da=f2H@c?gm}#sT&S>I=8hf)u(@aggGRuZ{z0hvYdw@ba*mj|bIr%u>
z`M&q}dH?wF{kpZwb<6EG<B*U=QcR1JVpgQ+*LEi@t!WzrB8Vr9n<OptIdxIoN5qVX
z)9*&7B?{WG2#An41@39==IPdc$4<ZK!uNixE-@r(P)UATJ!(;8+hi+U-(}c4EapTC
z&q)yn;{*i1hA&y{5swHx1P!Z7l29H21x&zO22Vl^(1N?0)^_!{S1J@g0KK%LMD{dE
znkn|0R<Cs`&-G6koAi*&&p}lSz!<VW%r5^EaM7pswnkY@;U)~nLds`PtY~OLZc}{z
z-*!A0h?*e7M*eXJ<&FC01FFYv)z?i3U6l}4r2u@N7_Ex@!aF(|ynHDA41~_IAHoOI
z$Hcfef_TKSA}}>1o)yQ$aqNOn^t7rnRfO1$=*oaG3|@ve35qZ{Q;@;o;21Lp??Ngh
zf#SI=Vh8}!%ZDL83^5#;sPJGnj$N!Mb_QfIoV}{vMzLd0;}92BxmY}_Ie^oY2+)GT
zo@S%ez~Frf_j8b1POJai-Q)N6_uqE6`7U=U@T8T-4v#cexJs}5VNG-D&j6+wfEC5>
z>nel=h-Lv+5SDZFN(IEArvSJt+?#p9GL8b$u(}HQ5X7Eyh+`iF<P%t&74A)$D#btr
zi44I7q8hRJKNxJQZm_Z#eCZ*&`MFjT0bnV*I%w^`Uk@5llcGd#(f9$)3cWbxpl=4v
zg)ik+xZa&z)<_1*|Dv}R!Xm4na!5Ep0lK}<PKjYNeLUV^8Ds5yiZx#dDZM=0=_==X
z4GPLknkX^drkLJ3tE<1eS#=tVO$zN3?Tp^lT9u{Dx}+(5E{<C0jSo6#-#L$S0_nlk
z+lwcJH#dQTMG3ln+U_XTA=?;7n#5F3kbd;`PrVvWubq_6x~S*;LAu~=puaO_`s&;v
zy5cotFX$wXa`AkZL>u82>tr!$LwIuvbE^92uXR^*2zwqhaU>k$5u?Bv3%!{&*Rw6S
zrRI#4zWdNX8yVA<vx{d;^ptl8ePPinH{RRO(4YBsnlzcHqg$_hxj5~jo0kl<<kF^(
z!S?cuDS1^GYU)^1X9^dGEOwWhTd~+T$D`=OeQ7RnpW}%ni&6ZRqqhBguh7$_k97T8
z1}(U_gyZ4_cHC?k_1YuX(OZ_vT-CJUoV-pujpe#%Ah(<5a~%{t(m=kiTWGnpl^z>u
zq4;P6oo+L`?&%{@Zm6%~Pr?0d-8$L2%eL~Au4e0;ay9pZjg~!nE*847swJOApY`Y^
zZ8ooy>L~NG&B}?w1r!4`JY3ZD%zEo3%i}zA7>B|?fh4{{6?!<UYcn@(W2Paqg%V9D
t+ixFLzQ5LEqqFO+fq1bxS<CjO%au~fg6GxyYBXiPtJ1JqC4b|(d<Te}F!BHZ


From 92fd936a500ed11ec70dbfc16c13c4318350d065 Mon Sep 17 00:00:00 2001
From: Automattic Release Bot <mobile+wpmobilebot@automattic.com>
Date: Tue, 3 Sep 2024 23:16:20 -0700
Subject: [PATCH 494/547] Update metadata strings

---
 Simplenote/Resources/AppStoreStrings.pot | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/Simplenote/Resources/AppStoreStrings.pot b/Simplenote/Resources/AppStoreStrings.pot
index 4e8da139b..f1ded4613 100644
--- a/Simplenote/Resources/AppStoreStrings.pot
+++ b/Simplenote/Resources/AppStoreStrings.pot
@@ -66,13 +66,8 @@ msgctxt "app_store_keywords"
 msgid "notes,note,markdown,journal,sync,to-do,list,cloud,notebook,simple,notepad,tag,todo,writing,memo"
 msgstr ""
 
-msgctxt "v4.52-whats-new"
+msgctxt "v4.53-whats-new"
 msgid ""
-"- Extended support for iOS Shortcuts\n"
-"- Fixed issue where notes selection was lost when app backgrounded\n"
-"- Fixed an issue can activate the faceid switch without a passcode\n"
-"- Magic Link Login Support\n"
-"- Login UI has been overhauled\n"
-"\n"
+"Improvements under the hood.\n"
 msgstr ""
 

From 08c75e953f0e8c2717eb150dcfc6bad7054b2193 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 4 Sep 2024 16:21:49 +1000
Subject: [PATCH 495/547] Make method to trigger Buildkite build annotate the
 caller, if any

---
 fastlane/lanes/release.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 981270824..13d79c0ed 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -255,6 +255,11 @@ def trigger_buildkite_release_build(branch:, beta:)
     environment: { BETA_RELEASE: beta },
     pipeline_file: 'release-build.yml'
   )
+
+  return unless is_ci
+
+  message = "This build triggered #{build_url} on <code>#{branch}</code>."
+  buildkite_annotate(style: 'info', context: 'trigger-release-build', message: message)
 end
 
 def create_release_backmerge_pr(version_to_merge:, next_version:)

From 46134a33534823e348a31294453f41985aad5a5b Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Fri, 6 Sep 2024 16:05:19 +1000
Subject: [PATCH 496/547] Store `build_url` before using it -.-'

Co-authored-by: Olivier Halligon <olivier.halligon@automattic.com>
---
 fastlane/lanes/release.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 13d79c0ed..699dac777 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -248,7 +248,7 @@ def check_pods_references
 end
 
 def trigger_buildkite_release_build(branch:, beta:)
-  buildkite_trigger_build(
+  build_url = buildkite_trigger_build(
     buildkite_organization: BUILDKITE_ORGANIZATION,
     buildkite_pipeline: BUILDKITE_PIPELINE,
     branch: branch,

From 439bc6c96c4ccd059fa6b18daf7724f9e0e112de Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Fri, 6 Sep 2024 16:11:50 +1000
Subject: [PATCH 497/547] Reword a release notes commit message and fix a typo

Co-authored-by: Olivier Halligon <olivier.halligon@automattic.com>
---
 fastlane/lanes/release.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 699dac777..4f69efd97 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -349,8 +349,8 @@ def delete_all_metadata_release_notes(store_metadata_folder: STORE_METADATA_FOLD
   git_add(path: files)
   git_commit(
     path: files,
-    message: 'Delete release notes source and localization before code freeze',
-    # Even if no locale was translated in the previous cycle, default/relaese_notes.txt should always be present, and therefore deleted at this stage.
+    message: 'Delete previous version release notes before code freeze',
+    # Even if no locale was translated in the previous cycle, default/release_notes.txt should always be present, and therefore deleted at this stage.
     allow_nothing_to_commit: false
   )
 end

From 2fd50309208e1d6156dab6962c6c6198a409c6d1 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Tue, 10 Sep 2024 19:33:25 -1000
Subject: [PATCH 498/547] Add fall back login with username and password option
 to login

---
 Simplenote/AuthenticationMode.swift           | 30 +++++++++++++++----
 Simplenote/Classes/SPAuthViewController.swift | 10 +++++--
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/Simplenote/AuthenticationMode.swift b/Simplenote/AuthenticationMode.swift
index 3d9fc3fa9..9d025a02d 100644
--- a/Simplenote/AuthenticationMode.swift
+++ b/Simplenote/AuthenticationMode.swift
@@ -89,10 +89,12 @@ extension AuthenticationMode {
 
     /// Login with Password
     ///
-    static func loginWithPassword(header: String? = nil) -> AuthenticationMode {
+    static func loginWithPassword(header: String? = nil, includeUsername: Bool = false) -> AuthenticationMode {
+        var inputElements: AuthenticationInputElements  = includeUsername ? [.username, .password] : [.password]
+
         return .init(title: NSLocalizedString("Log In with Password", comment: "LogIn Interface Title"),
                      header: header,
-                     inputElements: [.password],
+                     inputElements: inputElements,
                      validationStyle: .legacy,
                      actions: [
                         AuthenticationActionDescriptor(name: .primary,
@@ -114,6 +116,7 @@ extension AuthenticationMode {
                         AuthenticationActionDescriptor(name: .primary,
                                                        selector: #selector(SPAuthViewController.requestLogInCode),
                                                        text: NSLocalizedString("Log in with email", comment: "Sends the User an email with an Authentication Code")),
+                        AuthenticationActionDescriptor(name: .secondary, selector: #selector(SPAuthViewController.presentUsernameAndPasswordInterface), text: nil, attributedText: Strings.usernameAndPasswordOption),
                         AuthenticationActionDescriptor(name: .tertiary,
                                                        selector: #selector(SPAuthViewController.performLogInWithWPCOM),
                                                        text: NSLocalizedString("Log in with WordPress.com", comment: "Password fallback Action"))
@@ -150,15 +153,15 @@ extension AuthenticationMode {
                         AuthenticationActionDescriptor(name: .secondary,
                                                        selector: #selector(SPAuthViewController.presentTermsOfService),
                                                        text: nil,
-                                                       attributedText: SignupStrings.termsOfService)
+                                                       attributedText: Strings.termsOfService)
                      ])
     }
 }
 
 
-// MARK: - Mode: .signup
+// MARK: - String Constants
 //
-private enum SignupStrings {
+private enum Strings {
 
     /// Returns a formatted Secondary Action String for Signup
     ///
@@ -176,4 +179,21 @@ private enum SignupStrings {
 
         return output
     }
+
+    /// Returns a formatted Secondary Action String for Optional Username and password login
+    ///
+    static var usernameAndPasswordOption: NSAttributedString {
+        let output = NSMutableAttributedString(string: String(), attributes: [
+            .font: UIFont.preferredFont(forTextStyle: .subheadline)
+        ])
+
+        let prefix = NSLocalizedString("We'll email you a code to log in, or you can", comment: "Option to login with username and password *PREFIX*: printed in dark color")
+        let suffix = NSLocalizedString("log in manually.", comment: "Option to login with username and password *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue")
+
+        output.append(string: prefix, foregroundColor: .simplenoteGray60Color)
+        output.append(string: " ")
+        output.append(string: suffix, foregroundColor: .simplenoteBlue60Color)
+
+        return output
+    }
 }
diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index e6577a508..8dc396d1f 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -549,15 +549,19 @@ extension SPAuthViewController {
     @IBAction func presentPasswordInterface() {
         presentPasswordInterfaceWithHeader(header: AuthenticationStrings.loginWithEmailEmailHeader)
     }
-    
+
     @IBAction func presentPasswordInterfaceWithRateLimitingHeader() {
         presentPasswordInterfaceWithHeader(header: AuthenticationStrings.loginWithEmailLimitHeader)
     }
 
-    @IBAction func presentPasswordInterfaceWithHeader(header: String?) {
-        let viewController = SPAuthViewController(controller: controller, mode: .loginWithPassword(header: header), state: state)
+    @IBAction func presentPasswordInterfaceWithHeader(header: String?, includeUsername: Bool = false) {
+        let viewController = SPAuthViewController(controller: controller, mode: .loginWithPassword(header: header, includeUsername: includeUsername), state: state)
         navigationController?.pushViewController(viewController, animated: true)
     }
+
+    @IBAction func presentUsernameAndPasswordInterface() {
+        presentPasswordInterfaceWithHeader(header: AuthenticationStrings.loginWithEmailLimitHeader, includeUsername: true)
+    }
 }
 
 

From 93c8848c24230c21f2e73cd6b5ea1292453933a9 Mon Sep 17 00:00:00 2001
From: Kat Hagan <kat@codebykat.com>
Date: Wed, 11 Sep 2024 21:26:52 -0400
Subject: [PATCH 499/547] updated link to privacy notice for CA users

---
 RELEASE-NOTES.txt                                    | 2 +-
 Simplenote/Classes/SPAboutViewController.swift       | 2 +-
 Simplenote/Resources/AppStoreStrings.pot             | 2 +-
 fastlane/appstoreres/metadata/source/description.txt | 2 +-
 fastlane/metadata/ar-SA/description.txt              | 2 +-
 fastlane/metadata/de-DE/description.txt              | 2 +-
 fastlane/metadata/default/description.txt            | 2 +-
 fastlane/metadata/es-ES/description.txt              | 2 +-
 fastlane/metadata/fr-FR/description.txt              | 2 +-
 fastlane/metadata/he/description.txt                 | 2 +-
 fastlane/metadata/id/description.txt                 | 2 +-
 fastlane/metadata/it/description.txt                 | 2 +-
 fastlane/metadata/ja/description.txt                 | 2 +-
 fastlane/metadata/ko/description.txt                 | 2 +-
 fastlane/metadata/nl-NL/description.txt              | 2 +-
 fastlane/metadata/pt-BR/description.txt              | 2 +-
 fastlane/metadata/ru/description.txt                 | 2 +-
 fastlane/metadata/sv/description.txt                 | 2 +-
 fastlane/metadata/tr/description.txt                 | 2 +-
 fastlane/metadata/zh-Hans/description.txt            | 2 +-
 fastlane/metadata/zh-Hant/description.txt            | 2 +-
 21 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index e0417557d..6e405dc3a 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,6 +1,6 @@
 4.54
 -----
-
+- Updated link to privacy notice for California users
 
 4.53
 -----
diff --git a/Simplenote/Classes/SPAboutViewController.swift b/Simplenote/Classes/SPAboutViewController.swift
index 22798c719..e9739e734 100644
--- a/Simplenote/Classes/SPAboutViewController.swift
+++ b/Simplenote/Classes/SPAboutViewController.swift
@@ -333,7 +333,7 @@ private enum Constants {
     static let termsString      = NSLocalizedString("Terms of Service", comment: "Simplenote terms of service")
     static let termsURLString   = "https://simplenote.com/terms/"
     static let californiaString = NSLocalizedString("Privacy Notice for California Users", comment: "Simplenote terms of service")
-    static let californiaURLString = "https://automattic.com/privacy/#california-consumer-privacy-act-ccpa"
+    static let californiaURLString = "https://automattic.com/privacy/#us-privacy-laws"
 
     static let titles: [String] = [
         NSLocalizedString("Blog", comment: "The Simplenote blog"),
diff --git a/Simplenote/Resources/AppStoreStrings.pot b/Simplenote/Resources/AppStoreStrings.pot
index f1ded4613..5d1802a71 100644
--- a/Simplenote/Resources/AppStoreStrings.pot
+++ b/Simplenote/Resources/AppStoreStrings.pot
@@ -53,7 +53,7 @@ msgid ""
 "\n"
 "Privacy Policy: https://automattic.com/privacy/\n"
 "Terms of Service: https://simplenote.com/terms/\n"
-"California Users Privacy Notice: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa\n"
+"Privacy Notice for California Users: https://automattic.com/privacy/#us-privacy-laws\n"
 "\n"
 "--\n"
 "\n"
diff --git a/fastlane/appstoreres/metadata/source/description.txt b/fastlane/appstoreres/metadata/source/description.txt
index ef31ca421..737c98735 100644
--- a/fastlane/appstoreres/metadata/source/description.txt
+++ b/fastlane/appstoreres/metadata/source/description.txt
@@ -30,7 +30,7 @@ ORGANIZE AND SEARCH
 
 Privacy Policy: https://automattic.com/privacy/
 Terms of Service: https://simplenote.com/terms/
-California Users Privacy Notice: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+Privacy Notice for California Users: https://automattic.com/privacy/#us-privacy-laws
 
 --
 
diff --git a/fastlane/metadata/ar-SA/description.txt b/fastlane/metadata/ar-SA/description.txt
index dc6b27caa..0dae58d3d 100644
--- a/fastlane/metadata/ar-SA/description.txt
+++ b/fastlane/metadata/ar-SA/description.txt
@@ -30,7 +30,7 @@
 
 سياسة الخصوصية: https://automattic.com/privacy/
 شروط الخدمة: https://simplenote.com/terms/
-إشعار الخصوصية الخاص بالمستخدمين في كاليفورنيا: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+إشعار الخصوصية الخاص بالمستخدمين في كاليفورنيا: https://automattic.com/privacy/#us-privacy-laws
 
 --
 
diff --git a/fastlane/metadata/de-DE/description.txt b/fastlane/metadata/de-DE/description.txt
index d199909b0..036efd313 100644
--- a/fastlane/metadata/de-DE/description.txt
+++ b/fastlane/metadata/de-DE/description.txt
@@ -30,7 +30,7 @@ ORGANISEREN UND SUCHEN
 
 Datenschutzerklärung: https://automattic.com/privacy/
 Geschäftsbedingungen: https://simplenote.com/terms/
-Datenschutzhinweis für Benutzer in Kalifornien: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+Datenschutzhinweis für Benutzer in Kalifornien: https://automattic.com/privacy/#us-privacy-laws
 
 --
 
diff --git a/fastlane/metadata/default/description.txt b/fastlane/metadata/default/description.txt
index ef31ca421..16942a1a6 100644
--- a/fastlane/metadata/default/description.txt
+++ b/fastlane/metadata/default/description.txt
@@ -30,7 +30,7 @@ ORGANIZE AND SEARCH
 
 Privacy Policy: https://automattic.com/privacy/
 Terms of Service: https://simplenote.com/terms/
-California Users Privacy Notice: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+California Users Privacy Notice: https://automattic.com/privacy/#us-privacy-laws
 
 --
 
diff --git a/fastlane/metadata/es-ES/description.txt b/fastlane/metadata/es-ES/description.txt
index df6438d0b..61c787455 100644
--- a/fastlane/metadata/es-ES/description.txt
+++ b/fastlane/metadata/es-ES/description.txt
@@ -30,7 +30,7 @@ ORGANIZA Y BUSCA
 
 Política de privacidad: https://automattic.com/privacy/
 Condiciones del servicio: https://simplenote.com/terms/
-Aviso de privacidad para usuarios de California: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+Aviso de privacidad para usuarios de California: https://automattic.com/privacy/#us-privacy-laws
 
 --
 
diff --git a/fastlane/metadata/fr-FR/description.txt b/fastlane/metadata/fr-FR/description.txt
index 86d417d77..9590adbec 100644
--- a/fastlane/metadata/fr-FR/description.txt
+++ b/fastlane/metadata/fr-FR/description.txt
@@ -30,7 +30,7 @@ ORGANISATION ET RECHERCHE
 
 Politique de confidentialité : https://automattic.com/privacy/
 Conditions d’utilisation : https://simplenote.com/terms/
-Avis de confidentialité pour les utilisateurs californiens : https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+Avis de confidentialité pour les utilisateurs californiens : https://automattic.com/privacy/#us-privacy-laws
 
 --
 
diff --git a/fastlane/metadata/he/description.txt b/fastlane/metadata/he/description.txt
index f0df9e38d..0eaf80445 100644
--- a/fastlane/metadata/he/description.txt
+++ b/fastlane/metadata/he/description.txt
@@ -30,7 +30,7 @@
 
 מדיניות פרטיות: https://automattic.com/privacy/
 תנאי שימוש: https://simplenote.com/terms/
-הודעת פרטיות למשתמשים בקליפורניה: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+הודעת פרטיות למשתמשים בקליפורניה: https://automattic.com/privacy/#us-privacy-laws
 
 --
 
diff --git a/fastlane/metadata/id/description.txt b/fastlane/metadata/id/description.txt
index 4d51008f2..a6125a3c2 100644
--- a/fastlane/metadata/id/description.txt
+++ b/fastlane/metadata/id/description.txt
@@ -30,7 +30,7 @@ ATUR DAN CARI
 
 Kebijakan Privasi: https://automattic.com/privacy/
 Ketentuan Layanan: https://simplenote.com/terms/
-Pemberitahuan Privasi Pengguna California: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+Pemberitahuan Privasi Pengguna California: https://automattic.com/privacy/#us-privacy-laws
 
 --
 
diff --git a/fastlane/metadata/it/description.txt b/fastlane/metadata/it/description.txt
index fdcb2d48f..78efc7446 100644
--- a/fastlane/metadata/it/description.txt
+++ b/fastlane/metadata/it/description.txt
@@ -30,7 +30,7 @@ ORGANIZZA E CERCA
 
 Politica sulla privacy: https://automattic.com/privacy/
 Termini di servizio: https://simplenote.com/terms/
-Nota sulla privacy per utenti in California: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+Nota sulla privacy per utenti in California: https://automattic.com/privacy/#us-privacy-laws
 
 --
 
diff --git a/fastlane/metadata/ja/description.txt b/fastlane/metadata/ja/description.txt
index 60fc83dbd..5077813bb 100644
--- a/fastlane/metadata/ja/description.txt
+++ b/fastlane/metadata/ja/description.txt
@@ -30,7 +30,7 @@ Simplenote では、メモ書き、ToDo リストの作成、アイデアのメ
 
 プライバシーポリシー : https://automattic.com/privacy/
 利用規約 : https://simplenote.com/terms/
-カリフォルニア州のユーザーへの新しいプライバシー通知 : https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+カリフォルニア州のユーザーへの新しいプライバシー通知 : https://automattic.com/privacy/#us-privacy-laws
 
 --
 
diff --git a/fastlane/metadata/ko/description.txt b/fastlane/metadata/ko/description.txt
index 5c1b76e84..8f7681845 100644
--- a/fastlane/metadata/ko/description.txt
+++ b/fastlane/metadata/ko/description.txt
@@ -30,7 +30,7 @@ Simplenote로 손쉽게 메모를 작성하고 할 일 목록을 만들고 아
 
 개인정보 취급방침: https://automattic.com/privacy/
 서비스 약관: https://simplenote.com/terms/
-캘리포니아 사용자 개인정보 고지사항: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+캘리포니아 사용자 개인정보 고지사항: https://automattic.com/privacy/#us-privacy-laws
 
 --
 
diff --git a/fastlane/metadata/nl-NL/description.txt b/fastlane/metadata/nl-NL/description.txt
index 03c6474cb..0ef1f5061 100644
--- a/fastlane/metadata/nl-NL/description.txt
+++ b/fastlane/metadata/nl-NL/description.txt
@@ -30,7 +30,7 @@ ORGANISEREN EN ZOEKEN
 
 Privacybeleid: https://automattic.com/privacy/
 Servicevoorwaarden: https://simplenote.com/terms/
-Privacyverklaring voor gebruikers in Californië: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+Privacyverklaring voor gebruikers in Californië: https://automattic.com/privacy/#us-privacy-laws
 
 --
 
diff --git a/fastlane/metadata/pt-BR/description.txt b/fastlane/metadata/pt-BR/description.txt
index 2202b3e17..2acd593e5 100644
--- a/fastlane/metadata/pt-BR/description.txt
+++ b/fastlane/metadata/pt-BR/description.txt
@@ -30,7 +30,7 @@ ORGANIZE E PESQUISE
 
 Política de privacidade: https://automattic.com/privacy/
 Termos de serviço: https://simplenote.com/terms/
-Aviso de privacidade para usuários residentes da Califórnia: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+Aviso de privacidade para usuários residentes da Califórnia: https://automattic.com/privacy/#us-privacy-laws
 
 --
 
diff --git a/fastlane/metadata/ru/description.txt b/fastlane/metadata/ru/description.txt
index f12d5f60f..870d89c24 100644
--- a/fastlane/metadata/ru/description.txt
+++ b/fastlane/metadata/ru/description.txt
@@ -30,7 +30,7 @@ Simplenote — это простой способ делать заметки,
 
 Политика конфиденциальности: https://automattic.com/privacy/
 Условия предоставления услуг: https://simplenote.com/terms/
-Заявление о защите конфиденциальности пользователей из Калифорнии: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+Заявление о защите конфиденциальности пользователей из Калифорнии: https://automattic.com/privacy/#us-privacy-laws
 
 --
 
diff --git a/fastlane/metadata/sv/description.txt b/fastlane/metadata/sv/description.txt
index 56bdef89b..a75ec01ef 100644
--- a/fastlane/metadata/sv/description.txt
+++ b/fastlane/metadata/sv/description.txt
@@ -30,7 +30,7 @@ Skydda ditt innehåll med ett lösenordslås.
 
 Sekretesspolicy: https://automattic.com/privacy/
 Användarvillkor: https://simplenote.com/terms/
-Sekretessmeddelande för användare i Kalifornien: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+Sekretessmeddelande för användare i Kalifornien: https://automattic.com/privacy/#us-privacy-laws
 
 –
 
diff --git a/fastlane/metadata/tr/description.txt b/fastlane/metadata/tr/description.txt
index af4cbaf09..b1dcca8c4 100644
--- a/fastlane/metadata/tr/description.txt
+++ b/fastlane/metadata/tr/description.txt
@@ -30,7 +30,7 @@ DÜZENLEYİN VE ARAYIN
 
 Gizlilik Politikası: https://automattic.com/privacy/
 Hizmet Şartları: https://simplenote.com/terms/
-Kaliforniya'daki Kullanıcılar için Gizlilik Bildirimi: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+Kaliforniya'daki Kullanıcılar için Gizlilik Bildirimi: https://automattic.com/privacy/#us-privacy-laws
 
 --
 
diff --git a/fastlane/metadata/zh-Hans/description.txt b/fastlane/metadata/zh-Hans/description.txt
index 0792a09af..f66262b4b 100644
--- a/fastlane/metadata/zh-Hans/description.txt
+++ b/fastlane/metadata/zh-Hans/description.txt
@@ -30,7 +30,7 @@ Simplenote 可帮助您轻松记录笔记、创建任务清单、捕捉想法等
 
 隐私政策：https://automattic.com/privacy/
 服务条款：https://simplenote.com/terms/
-加州用户隐私声明：https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+加州用户隐私声明：hhttps://automattic.com/privacy/#us-privacy-laws
 
 --
 
diff --git a/fastlane/metadata/zh-Hant/description.txt b/fastlane/metadata/zh-Hant/description.txt
index fd89291dd..b6039298f 100644
--- a/fastlane/metadata/zh-Hant/description.txt
+++ b/fastlane/metadata/zh-Hant/description.txt
@@ -30,7 +30,7 @@ Simplenote 讓你輕鬆做筆記、建立待辦事項清單、記下想法等等
 
 隱私權政策：https://automattic.com/privacy/
 服務條款：https://simplenote.com/terms/
-加州使用者隱私權聲明：https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+加州使用者隱私權聲明：https://automattic.com/privacy/#us-privacy-laws
 
 --
 

From 8b5c3aaec9550fd73427cfd9a836393a1a908e21 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Wed, 11 Sep 2024 18:02:18 -1000
Subject: [PATCH 500/547] Removed header on the login with username/password
 page

---
 Simplenote/Classes/SPAuthViewController.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
index 8dc396d1f..e53ce56b8 100644
--- a/Simplenote/Classes/SPAuthViewController.swift
+++ b/Simplenote/Classes/SPAuthViewController.swift
@@ -560,7 +560,7 @@ extension SPAuthViewController {
     }
 
     @IBAction func presentUsernameAndPasswordInterface() {
-        presentPasswordInterfaceWithHeader(header: AuthenticationStrings.loginWithEmailLimitHeader, includeUsername: true)
+        presentPasswordInterfaceWithHeader(header: nil, includeUsername: true)
     }
 }
 

From 1687750f0052bc074b22577d12594a4d473eb413 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Fri, 13 Sep 2024 14:43:46 +1000
Subject: [PATCH 501/547] =?UTF-8?q?Update=20app=20translations=20=E2=80=93?=
 =?UTF-8?q?=20`Localizable.strings`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Simplenote/ar.lproj/Localizable.strings       | 64 ++++---------------
 Simplenote/cy.lproj/Localizable.strings       | 38 ++---------
 Simplenote/de.lproj/Localizable.strings       | 64 ++++---------------
 Simplenote/el.lproj/Localizable.strings       | 29 ++-------
 Simplenote/es.lproj/Localizable.strings       | 64 ++++---------------
 Simplenote/fa.lproj/Localizable.strings       | 16 ++---
 Simplenote/fr.lproj/Localizable.strings       | 64 ++++---------------
 Simplenote/he.lproj/Localizable.strings       | 64 ++++---------------
 Simplenote/id.lproj/Localizable.strings       | 64 ++++---------------
 Simplenote/it.lproj/Localizable.strings       | 64 ++++---------------
 Simplenote/ja.lproj/Localizable.strings       | 64 ++++---------------
 Simplenote/ko.lproj/Localizable.strings       | 64 ++++---------------
 Simplenote/nl.lproj/Localizable.strings       | 64 ++++---------------
 Simplenote/pt-BR.lproj/Localizable.strings    | 64 ++++---------------
 Simplenote/ru.lproj/Localizable.strings       | 64 ++++---------------
 Simplenote/sv.lproj/Localizable.strings       | 64 ++++---------------
 Simplenote/tr.lproj/Localizable.strings       | 64 ++++---------------
 .../zh-Hans-CN.lproj/Localizable.strings      | 64 ++++---------------
 .../zh-Hant-TW.lproj/Localizable.strings      | 64 ++++---------------
 19 files changed, 224 insertions(+), 883 deletions(-)

diff --git a/Simplenote/ar.lproj/Localizable.strings b/Simplenote/ar.lproj/Localizable.strings
index ab81a2921..1a2af3414 100644
--- a/Simplenote/ar.lproj/Localizable.strings
+++ b/Simplenote/ar.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-08-06 21:54:03+0000 */
+/* Translation-Revision-Date: 2024-09-12 11:54:02+0000 */
 /* Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: ar */
@@ -94,9 +94,6 @@
    Title: No filters applied */
 "All Notes" = "كل الملاحظات";
 
-/* A short description to access the account login screen */
-"Already have an account?" = "هل لديك حساب بالفعل؟";
-
 /* Delete account confirmation instructions */
 "An email has been sent to %@. Check your inbox and follow the instructions to confirm account deletion.\n\nYour account won't be deleted until we receive your confirmation." = "تم إرسال بريد إلكتروني إلى %@، راجع علبة الوارد لديك واتبع الإرشادات لتأكيد حذف الحساب.\n\nلن يتم حذف حسابك حتى نتلقى تأكيدك";
 
@@ -145,14 +142,10 @@
 /* Delete account confirmation alert message */
 "By deleting the account for %@, all notes created with this account will be permanently deleted. This action is not reversible" = "عن طريق حذف الحساب الخاص بـ %@,، سيتم حذف جميع الملحوظات التي تم إنشاؤها باستخدام هذا الحساب نهائيًا. لا يمكن التراجع عن هذا الإجراء";
 
-/* Terms Button Text */
-"By signing up, you agree to our Terms of Service »" = "يعني تسجيلك موافقتك على شروط الخدمة »";
-
 /* Cancel Action
    Cancel action button
    Cancel action for password alert
    Cancel action on share extension.
-   Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
    Dismissing an interface
@@ -208,8 +201,7 @@
 /* Option to make the note list show only 1 line of text. The default is 3. */
 "Condensed Note List" = "قائمة الملاحظات الموجزة";
 
-/* Confirm button -> Review you account screen
-   Hint displayed in the password confirmation field */
+/* Confirm button -> Review you account screen */
 "Confirm" = "تأكيد";
 
 /* Title on the PinLock screen asking to confirm a passcode */
@@ -234,6 +226,9 @@
 /* Error for bad email or password */
 "Could not create an account with the provided email address and password." = "تعذر إنشاء حساب بعنوان البريد الإلكتروني وكلمة المرور اللذين تم إدخالهما.";
 
+/* Notifies user tag delete failed */
+"Could not delete tag" = "تعذر حذف الوسم";
+
 /* Note fetch error title */
 "Could not fetch Notes" = "يتعذر إحضار الملاحظات";
 
@@ -338,9 +333,6 @@
 /* Card title showing information about the note (metrics, references) */
 "Document" = "مستند";
 
-/* A short description to access the account creation screen */
-"Don't have an account?" = "ليس لديك حساب؟";
-
 /* Dismisses the Note Information UI
    Dismisses the Note Options UI
    Done editing tags
@@ -388,12 +380,6 @@
    Error Title */
 "Error" = "خطأ";
 
-/* No comment provided by engineer. */
-"Error: NSManagedObjectContext's persistentStoreCoordinator must be nil. Simperium will handle CoreData connections for you." = "خطأ: يجب أن يكون persistentStoreCoordinator الخاص بـ NSManagedObjectContext عديم القيمة. سيقوم Simperium بمعالجة اتصالات CoreData من أجلك.";
-
-/* No comment provided by engineer. */
-"Error: you must initialize your context with 'NSMainQueueConcurrencyType' concurrency type." = "خطأ: تجب عليك تهيئة سياقك الذي يحمل نوع التزامن \"NSMainQueueConcurrencyType\".";
-
 /* Get Help Description Label */
 "FAQ or contact us" = "الأسئلة المتداولة أو اتصل بنا";
 
@@ -403,9 +389,6 @@
 /* Accessibility hint used when previous versions of a note are being fetched */
 "Fetching Version" = "سحب الإصدار";
 
-/* Forgot password Button Text */
-"Forgot password? »" = "هل نسيت كلمة المرور؟ »";
-
 /* Password Reset Action */
 "Forgot your password?" = "هل نسيت كلمة مرورك؟";
 
@@ -581,9 +564,6 @@
 /* Message shown in note list when no notes are untagged */
 "No untagged notes" = "لا توجد أي ملاحظات غير موسومة";
 
-/* Error when you enter a bad email address */
-"Not a valid email address" = "ليس بريدًا إلكترونيًا صالحًا";
-
 /* Note Widget Title */
 "Note" = "ملاحظة";
 
@@ -639,23 +619,18 @@
 /* Pin Lock */
 "Passcodes did not match. Try again." = "رموز المرور غير متطابقة. حاول مرة أخرى.";
 
-/* Hint displayed in the password field
-   Password TextField Placeholder */
+/* Password TextField Placeholder */
 "Password" = "كلمة المرور";
 
 /* Message displayed when password is invalid (Signup) */
 "Password cannot match email" = "يتعذر تطابق كلمة المرور مع البريد الإلكتروني";
 
-/* Message displayed when password is too short. Please preserve the Percent D!
-   Message displayed when password is too short. The %%d is a placeholder for a numeral. Please preserve it! */
+/* Message displayed when password is too short. Please preserve the Percent D! */
 "Password must contain at least %d characters" = "يجب أن تحتوي كلمة المرور على %d من الأحرف على الأقل";
 
 /* Message displayed when a password contains a disallowed character */
 "Password must not contain tabs nor newlines" = "يجب ألا تحتوي كلمة المرور على علامات جدولة أو خطوط جديدة";
 
-/* Password Validation: Confirmation doesn't match */
-"Passwords do not match" = "كلمات المرور غير متطابقة";
-
 /* Number of changes pending to be sent */
 "Pendings" = "معلّق";
 
@@ -675,6 +650,9 @@
 /* Extension Missing Token Alert Title */
 "Please log into your Simplenote account first by using the Simplenote app." = "يرجى تسجيل الدخول إلى حسابك على Simplenote أولاً عن طريق استخدام تطبيق Simplenote.";
 
+/* Encourages trying delete again */
+"Please try again" = "يرجى المحاولة مجددًا";
+
 /* Upgrade Alert Message */
 "Please upgrade to the latest iOS release to restore purchases" = "ترجى الترقية إلى أحدث إصدار من نظام التشغيل iOS لاستعادة عمليات الشراء";
 
@@ -817,21 +795,11 @@
 /* UI region to the left of the note list which shows all of a users tags */
 "Sidebar" = "الشريط الجانبي";
 
-/* Title of button for logging in (must be short) */
-"Sign In" = "تسجيل الدخول";
-
-/* SignUp Action
-   Signup Action
-   SignUp Interface Title
-   Title of button to create a new account (must be short) */
+/* Signup Action
+   SignUp Action
+   SignUp Interface Title */
 "Sign Up" = "التسجيل";
 
-/* A short link to access the account login screen */
-"Sign in" = "تسجيل الدخول";
-
-/* A short link to access the account creation screen */
-"Sign up" = "التسجيل";
-
 /* Alert message displayed when an account has unsynced notes */
 "Signing out will delete any unsynced notes. You can verify your synced notes by signing in to the Web App." = "سيؤدي تسجيل الخروج إلى حذف أي ملحوظات غير متزامنة. يمكنك التحقق من ملحوظاتك المتزامنة عن طريق تسجيل الدخول إلى تطبيق الويب.";
 
@@ -907,9 +875,6 @@
 /* Current Sustainer Details */
 "Thank you for your continued support" = "شكرًا لك على دعمك المتواصل";
 
-/* Error when address is in use */
-"That email is already being used" = "يتم استخدام ذلك البريد الإلكتروني بالفعل";
-
 /* Email TextField Placeholder */
 "The authentication code you've requested has expired. Please request a new one" = "انتهت صلاحية كود المصادقة الذي طلبته. يرجى طلب واحد جديد";
 
@@ -977,9 +942,6 @@
 /* Undo action */
 "Undo" = "تراجع";
 
-/* WebSocket not initialized */
-"Uninitialized" = "غير مهيأ";
-
 /* Default title for an unnamed tag */
 "Unnamed Tag" = "وسم بلا اسم.";
 
diff --git a/Simplenote/cy.lproj/Localizable.strings b/Simplenote/cy.lproj/Localizable.strings
index 7064b75e1..7141a3f50 100644
--- a/Simplenote/cy.lproj/Localizable.strings
+++ b/Simplenote/cy.lproj/Localizable.strings
@@ -34,20 +34,13 @@
    Title: No filters applied */
 "All Notes" = "Pob Nodyn";
 
-/* A short description to access the account login screen */
-"Already have an account?" = "Eisoes â chyfrif?";
-
 /* The Simplenote blog */
 "Blog" = "Blog";
 
-/* Terms Button Text */
-"By signing up, you agree to our Terms of Service »" = "Drwy ymuno, rydych yn cytuno i'n Amodau Gwasanaeth »";
-
 /* Cancel Action
    Cancel action button
    Cancel action for password alert
    Cancel action on share extension.
-   Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
    Dismissing an interface
@@ -64,8 +57,7 @@
 /* Option to make the note list show only 1 line of text. The default is 3. */
 "Condensed Note List" = "Rhestr Gryno o Nodiadau";
 
-/* Confirm button -> Review you account screen
-   Hint displayed in the password confirmation field */
+/* Confirm button -> Review you account screen */
 "Confirm" = "Cadarnhau";
 
 /* Rating view - initial - could be better button */
@@ -102,9 +94,6 @@
 /* Dismiss Keyboard Button */
 "Dismiss keyboard" = "Cau'r bysellfwrdd";
 
-/* A short description to access the account creation screen */
-"Don't have an account?" = "Heb greu cyfrif?";
-
 /* Dismisses the Note Information UI
    Dismisses the Note Options UI
    Done editing tags
@@ -127,9 +116,6 @@
    Error Title */
 "Error" = "Gwall";
 
-/* Forgot password Button Text */
-"Forgot password? »" = "Wedi anghofio eich cyfrinair? »";
-
 /* Opens the Note's History */
 "History" = "Hanes";
 
@@ -186,12 +172,10 @@
 /* Pin Lock */
 "Passcodes did not match. Try again." = "Nid oedd y codau cyfrin yn cyfateb. Rhowch gynnig arall arni.";
 
-/* Hint displayed in the password field
-   Password TextField Placeholder */
+/* Password TextField Placeholder */
 "Password" = "Cyfrinair";
 
-/* Message displayed when password is too short. Please preserve the Percent D!
-   Message displayed when password is too short. The %%d is a placeholder for a numeral. Please preserve it! */
+/* Message displayed when password is too short. Please preserve the Percent D! */
 "Password must contain at least %d characters" = "Rhaid i'r cyfrinair gynnwys o leiaf %d nod.";
 
 /* Pin State Accessibility Hint */
@@ -246,21 +230,11 @@
 /* UI region to the left of the note list which shows all of a users tags */
 "Sidebar" = "Bar ochr";
 
-/* Title of button for logging in (must be short) */
-"Sign In" = "Mewngofnodi";
-
-/* SignUp Action
-   Signup Action
-   SignUp Interface Title
-   Title of button to create a new account (must be short) */
+/* Signup Action
+   SignUp Action
+   SignUp Interface Title */
 "Sign Up" = "Cofrestru";
 
-/* A short link to access the account login screen */
-"Sign in" = "Mewngofnodi";
-
-/* A short link to access the account creation screen */
-"Sign up" = "Cofrestru";
-
 /* Alert message displayed when an account has unsynced notes */
 "Signing out will delete any unsynced notes. You can verify your synced notes by signing in to the Web App." = "Bydd all-gofnodi'n dileu unrhyw nodau heb eu cydweddu. Gallwch ddilysu eich nodau wedi eu cydweddu drwy fewngofnodi i'r Web App.";
 
diff --git a/Simplenote/de.lproj/Localizable.strings b/Simplenote/de.lproj/Localizable.strings
index 3fb9eb5a9..41222eb95 100644
--- a/Simplenote/de.lproj/Localizable.strings
+++ b/Simplenote/de.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-08-07 09:54:03+0000 */
+/* Translation-Revision-Date: 2024-09-11 12:54:02+0000 */
 /* Plural-Forms: nplurals=2; plural=n != 1; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: de */
@@ -94,9 +94,6 @@
    Title: No filters applied */
 "All Notes" = "Alle Notizen";
 
-/* A short description to access the account login screen */
-"Already have an account?" = "Du hast bereits ein Konto?";
-
 /* Delete account confirmation instructions */
 "An email has been sent to %@. Check your inbox and follow the instructions to confirm account deletion.\n\nYour account won't be deleted until we receive your confirmation." = "Wir haben eine E-Mail an %@ gesendet. Bitte sieh in deinem Posteingang nach und folge den Anweisungen, um die Kontolöschung zu bestätigen.\n\nDein Konto wird erst gelöscht, wenn wir die Bestätigung dafür erhalten haben.";
 
@@ -145,14 +142,10 @@
 /* Delete account confirmation alert message */
 "By deleting the account for %@, all notes created with this account will be permanently deleted. This action is not reversible" = "Wenn du das Konto für %@ löschst, werden alle Notizen, die in diesem Konto erstellt wurden, unwiderruflich gelöscht. Dieser Vorgang kann nicht rückgängig gemacht werden.";
 
-/* Terms Button Text */
-"By signing up, you agree to our Terms of Service »" = "Indem du dich registrierst, stimmst du unseren Geschäftsbedingungen zu »";
-
 /* Cancel Action
    Cancel action button
    Cancel action for password alert
    Cancel action on share extension.
-   Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
    Dismissing an interface
@@ -208,8 +201,7 @@
 /* Option to make the note list show only 1 line of text. The default is 3. */
 "Condensed Note List" = "Notizenliste Kurzfassung";
 
-/* Confirm button -> Review you account screen
-   Hint displayed in the password confirmation field */
+/* Confirm button -> Review you account screen */
 "Confirm" = "Bestätigen";
 
 /* Title on the PinLock screen asking to confirm a passcode */
@@ -234,6 +226,9 @@
 /* Error for bad email or password */
 "Could not create an account with the provided email address and password." = "Mit der angegebenen E-Mail-Adresse und dem Passwort konnte kein Konto erstellt werden.";
 
+/* Notifies user tag delete failed */
+"Could not delete tag" = "Schlagwort konnte nicht gelöscht werden";
+
 /* Note fetch error title */
 "Could not fetch Notes" = "Notizen konnten nicht abgerufen werden";
 
@@ -338,9 +333,6 @@
 /* Card title showing information about the note (metrics, references) */
 "Document" = "Dokument";
 
-/* A short description to access the account creation screen */
-"Don't have an account?" = "Du hast noch kein Konto?";
-
 /* Dismisses the Note Information UI
    Dismisses the Note Options UI
    Done editing tags
@@ -388,12 +380,6 @@
    Error Title */
 "Error" = "Fehler";
 
-/* No comment provided by engineer. */
-"Error: NSManagedObjectContext's persistentStoreCoordinator must be nil. Simperium will handle CoreData connections for you." = "Fehler: Der persistente Store-Koordinator von NSManagedObjectContext muss null sein. Simperium kümmert sich um Core Data-Verbindungen.";
-
-/* No comment provided by engineer. */
-"Error: you must initialize your context with 'NSMainQueueConcurrencyType' concurrency type." = "Fehler: Du musst deinen Kontext mit dem Parallelitätstyp „NSMainQueueConcurrencyType“ initialisieren.";
-
 /* Get Help Description Label */
 "FAQ or contact us" = "FAQ oder Kontakt";
 
@@ -403,9 +389,6 @@
 /* Accessibility hint used when previous versions of a note are being fetched */
 "Fetching Version" = "Version wird abgerufen";
 
-/* Forgot password Button Text */
-"Forgot password? »" = "Passwort vergessen? »";
-
 /* Password Reset Action */
 "Forgot your password?" = "Passwort vergessen?";
 
@@ -581,9 +564,6 @@
 /* Message shown in note list when no notes are untagged */
 "No untagged notes" = "Keine nicht markierten Notizen";
 
-/* Error when you enter a bad email address */
-"Not a valid email address" = "Keine gültige E-Mail-Adresse";
-
 /* Note Widget Title */
 "Note" = "Notiz";
 
@@ -639,23 +619,18 @@
 /* Pin Lock */
 "Passcodes did not match. Try again." = "Die Passcodes stimmten nicht überein. Versuch's nochmal.";
 
-/* Hint displayed in the password field
-   Password TextField Placeholder */
+/* Password TextField Placeholder */
 "Password" = "Passwort";
 
 /* Message displayed when password is invalid (Signup) */
 "Password cannot match email" = "Das Passwort darf nicht der E-Mail entsprechen.";
 
-/* Message displayed when password is too short. Please preserve the Percent D!
-   Message displayed when password is too short. The %%d is a placeholder for a numeral. Please preserve it! */
+/* Message displayed when password is too short. Please preserve the Percent D! */
 "Password must contain at least %d characters" = "Das Passwort muss mindestens %d Zeichen enthalten.";
 
 /* Message displayed when a password contains a disallowed character */
 "Password must not contain tabs nor newlines" = "Das Passwort darf keine Tabs oder Zeilenvorschübe enthalten.";
 
-/* Password Validation: Confirmation doesn't match */
-"Passwords do not match" = "Passwörter stimmen nicht überein";
-
 /* Number of changes pending to be sent */
 "Pendings" = "Ausstehend";
 
@@ -675,6 +650,9 @@
 /* Extension Missing Token Alert Title */
 "Please log into your Simplenote account first by using the Simplenote app." = "Bitte melde dich zuerst über die Simplenote-App bei deinem Simplenote-Konto an.";
 
+/* Encourages trying delete again */
+"Please try again" = "Bitte versuche es erneut";
+
 /* Upgrade Alert Message */
 "Please upgrade to the latest iOS release to restore purchases" = "Führe ein Upgrade auf die neueste iOS-Version durch, um Käufe wiederherzustellen";
 
@@ -817,21 +795,11 @@
 /* UI region to the left of the note list which shows all of a users tags */
 "Sidebar" = "Seitenleiste";
 
-/* Title of button for logging in (must be short) */
-"Sign In" = "Anmelden";
-
-/* SignUp Action
-   Signup Action
-   SignUp Interface Title
-   Title of button to create a new account (must be short) */
+/* Signup Action
+   SignUp Action
+   SignUp Interface Title */
 "Sign Up" = "Registrieren";
 
-/* A short link to access the account login screen */
-"Sign in" = "Anmelden";
-
-/* A short link to access the account creation screen */
-"Sign up" = "Registrieren";
-
 /* Alert message displayed when an account has unsynced notes */
 "Signing out will delete any unsynced notes. You can verify your synced notes by signing in to the Web App." = "Bei der Abmeldung werden alle nicht synchronisierten Notizen gelöscht. Du kannst überprüfen, ob deine Notizen synchronisiert wurden, indem du dich in der Web-App anmeldest.";
 
@@ -907,9 +875,6 @@
 /* Current Sustainer Details */
 "Thank you for your continued support" = "Danke für deine kontinuierliche Unterstützung";
 
-/* Error when address is in use */
-"That email is already being used" = "Diese E-Mail-Adresse wird bereits verwendet";
-
 /* Email TextField Placeholder */
 "The authentication code you've requested has expired. Please request a new one" = "Der angeforderte Authentifizierungscode ist abgelaufen. Bitte fordere einen neuen an";
 
@@ -977,9 +942,6 @@
 /* Undo action */
 "Undo" = "Rückgängig";
 
-/* WebSocket not initialized */
-"Uninitialized" = "Nicht initialisiert";
-
 /* Default title for an unnamed tag */
 "Unnamed Tag" = "Unbenanntes Schlagwort";
 
diff --git a/Simplenote/el.lproj/Localizable.strings b/Simplenote/el.lproj/Localizable.strings
index 43e526aa1..9dec8d35e 100644
--- a/Simplenote/el.lproj/Localizable.strings
+++ b/Simplenote/el.lproj/Localizable.strings
@@ -29,14 +29,10 @@
 /* Label on button to add a new tag to a note */
 "Add tag" = "Προσθήκη ετικέτας";
 
-/* A short description to access the account login screen */
-"Already have an account?" = "Έχετε ήδη λογαριασμό;";
-
 /* Cancel Action
    Cancel action button
    Cancel action for password alert
    Cancel action on share extension.
-   Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
    Dismissing an interface
@@ -50,8 +46,7 @@
 /* Noun - collaborators are other Simplenote users who you chose to share a note with */
 "Collaborators" = "Συνεργάτες";
 
-/* Confirm button -> Review you account screen
-   Hint displayed in the password confirmation field */
+/* Confirm button -> Review you account screen */
 "Confirm" = "Επιβεβαίωση";
 
 /* Error for bad email or password */
@@ -69,9 +64,6 @@
 /* Dismiss Keyboard Button */
 "Dismiss keyboard" = "Απόκρυψη";
 
-/* A short description to access the account creation screen */
-"Don't have an account?" = "Δεν έχετε λογαριασμό;";
-
 /* Dismisses the Note Information UI
    Dismisses the Note Options UI
    Done editing tags
@@ -119,8 +111,7 @@
 /* Pin Lock */
 "Passcodes did not match. Try again." = "Τα συνθηματικά δεν συμφωνούν. Δοκιμάστε ξανά.";
 
-/* Hint displayed in the password field
-   Password TextField Placeholder */
+/* Password TextField Placeholder */
 "Password" = "Κωδικός";
 
 /* Pin State Accessibility Hint */
@@ -156,21 +147,11 @@
 /* UI region to the left of the note list which shows all of a users tags */
 "Sidebar" = "Στήλη";
 
-/* Title of button for logging in (must be short) */
-"Sign In" = "Σύνδεση";
-
-/* SignUp Action
-   Signup Action
-   SignUp Interface Title
-   Title of button to create a new account (must be short) */
+/* Signup Action
+   SignUp Action
+   SignUp Interface Title */
 "Sign Up" = "Εγγραφή";
 
-/* A short link to access the account login screen */
-"Sign in" = "Σύνδεση";
-
-/* A short link to access the account creation screen */
-"Sign up" = "Εγγραφή";
-
 /* Displayed as a date in the case where a note was modified today, for example */
 "Today" = "Σήμερα";
 
diff --git a/Simplenote/es.lproj/Localizable.strings b/Simplenote/es.lproj/Localizable.strings
index 8ca408e55..c61baf15e 100644
--- a/Simplenote/es.lproj/Localizable.strings
+++ b/Simplenote/es.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-08-08 11:54:02+0000 */
+/* Translation-Revision-Date: 2024-09-11 16:54:02+0000 */
 /* Plural-Forms: nplurals=2; plural=n != 1; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: es */
@@ -94,9 +94,6 @@
    Title: No filters applied */
 "All Notes" = "Todas las notas";
 
-/* A short description to access the account login screen */
-"Already have an account?" = "Ya esta registrado?";
-
 /* Delete account confirmation instructions */
 "An email has been sent to %@. Check your inbox and follow the instructions to confirm account deletion.\n\nYour account won't be deleted until we receive your confirmation." = "Se ha enviado un correo electrónico a %@ Comprueba tu bandeja de entrada y sigue las instrucciones para confirmar la eliminación de la cuenta.\n\nTu cuenta no se eliminará hasta que recibamos tu confirmación.";
 
@@ -145,14 +142,10 @@
 /* Delete account confirmation alert message */
 "By deleting the account for %@, all notes created with this account will be permanently deleted. This action is not reversible" = "Si eliminas la cuenta de  %@, se eliminarán de forma permanente todas las notas que hayas creado con ella. Esta acción es irreversible.";
 
-/* Terms Button Text */
-"By signing up, you agree to our Terms of Service »" = "Al registrarte, aceptas nuestros Términos de servicio »";
-
 /* Cancel Action
    Cancel action button
    Cancel action for password alert
    Cancel action on share extension.
-   Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
    Dismissing an interface
@@ -208,8 +201,7 @@
 /* Option to make the note list show only 1 line of text. The default is 3. */
 "Condensed Note List" = "Lista de notas condensada";
 
-/* Confirm button -> Review you account screen
-   Hint displayed in the password confirmation field */
+/* Confirm button -> Review you account screen */
 "Confirm" = "Confirmar";
 
 /* Title on the PinLock screen asking to confirm a passcode */
@@ -234,6 +226,9 @@
 /* Error for bad email or password */
 "Could not create an account with the provided email address and password." = "No se ha podido crear una cuenta con el correo y contraseña ingresados.";
 
+/* Notifies user tag delete failed */
+"Could not delete tag" = "No se ha podido borrar la etiqueta";
+
 /* Note fetch error title */
 "Could not fetch Notes" = "No se han podido recuperar las notas";
 
@@ -338,9 +333,6 @@
 /* Card title showing information about the note (metrics, references) */
 "Document" = "Documento";
 
-/* A short description to access the account creation screen */
-"Don't have an account?" = "Aun no tiene una cuenta?";
-
 /* Dismisses the Note Information UI
    Dismisses the Note Options UI
    Done editing tags
@@ -388,12 +380,6 @@
    Error Title */
 "Error" = "Error";
 
-/* No comment provided by engineer. */
-"Error: NSManagedObjectContext's persistentStoreCoordinator must be nil. Simperium will handle CoreData connections for you." = "Error: persistentStoreCoordinator de NSManagedObjectContext debe ser nulo. Simperium gestionará las conexiones CoreData automáticamente.";
-
-/* No comment provided by engineer. */
-"Error: you must initialize your context with 'NSMainQueueConcurrencyType' concurrency type." = "Error: inicializa el contexto con el tipo de concurrencia \"NSMainQueueConcurrencyType\".";
-
 /* Get Help Description Label */
 "FAQ or contact us" = "Consulta las preguntas frecuentes o contacta con nosotros";
 
@@ -403,9 +389,6 @@
 /* Accessibility hint used when previous versions of a note are being fetched */
 "Fetching Version" = "Recuperando version";
 
-/* Forgot password Button Text */
-"Forgot password? »" = "¿Olvidaste tu contraseña? »";
-
 /* Password Reset Action */
 "Forgot your password?" = "¿Has olvidado tu contraseña?";
 
@@ -581,9 +564,6 @@
 /* Message shown in note list when no notes are untagged */
 "No untagged notes" = "No se han encontrado notas sin etiquetar";
 
-/* Error when you enter a bad email address */
-"Not a valid email address" = "No es un email valido";
-
 /* Note Widget Title */
 "Note" = "Nota";
 
@@ -639,23 +619,18 @@
 /* Pin Lock */
 "Passcodes did not match. Try again." = "Contraseña incorrecta. Intente nuevamente.";
 
-/* Hint displayed in the password field
-   Password TextField Placeholder */
+/* Password TextField Placeholder */
 "Password" = "Contraseña";
 
 /* Message displayed when password is invalid (Signup) */
 "Password cannot match email" = "La contraseña no puede coincidir con el correo electrónico";
 
-/* Message displayed when password is too short. Please preserve the Percent D!
-   Message displayed when password is too short. The %%d is a placeholder for a numeral. Please preserve it! */
+/* Message displayed when password is too short. Please preserve the Percent D! */
 "Password must contain at least %d characters" = "La contraseña debe contener al menos %d caracteres";
 
 /* Message displayed when a password contains a disallowed character */
 "Password must not contain tabs nor newlines" = "La contraseña no debe contener pestañas ni saltos de línea";
 
-/* Password Validation: Confirmation doesn't match */
-"Passwords do not match" = "La contraseña no coincide";
-
 /* Number of changes pending to be sent */
 "Pendings" = "Pendientes";
 
@@ -675,6 +650,9 @@
 /* Extension Missing Token Alert Title */
 "Please log into your Simplenote account first by using the Simplenote app." = "Inicia sesión en tu cuenta de Simplenote desde la aplicación.";
 
+/* Encourages trying delete again */
+"Please try again" = "Inténtalo de nuevo";
+
 /* Upgrade Alert Message */
 "Please upgrade to the latest iOS release to restore purchases" = "Mejora a la versión más reciente de iOS para restablecer las compras";
 
@@ -817,21 +795,11 @@
 /* UI region to the left of the note list which shows all of a users tags */
 "Sidebar" = "Barra Lateral";
 
-/* Title of button for logging in (must be short) */
-"Sign In" = "Iniciar Sesion";
-
-/* SignUp Action
-   Signup Action
-   SignUp Interface Title
-   Title of button to create a new account (must be short) */
+/* Signup Action
+   SignUp Action
+   SignUp Interface Title */
 "Sign Up" = "Crear Cuenta";
 
-/* A short link to access the account login screen */
-"Sign in" = "Iniciar Sesion";
-
-/* A short link to access the account creation screen */
-"Sign up" = "Crear Cuenta";
-
 /* Alert message displayed when an account has unsynced notes */
 "Signing out will delete any unsynced notes. You can verify your synced notes by signing in to the Web App." = "Si cierras sesión, se eliminarán las notas no sincronizadas. Inicia sesión en la aplicación web para verificar tus notas sincronizadas.";
 
@@ -907,9 +875,6 @@
 /* Current Sustainer Details */
 "Thank you for your continued support" = "Gracias por apoyarnos siempre";
 
-/* Error when address is in use */
-"That email is already being used" = "El email ya se encuentra en uso";
-
 /* Email TextField Placeholder */
 "The authentication code you've requested has expired. Please request a new one" = "El código de autenticación que has solicitado ha caducado. Solicita uno nuevo";
 
@@ -977,9 +942,6 @@
 /* Undo action */
 "Undo" = "Deshacer";
 
-/* WebSocket not initialized */
-"Uninitialized" = "Sin iniciar";
-
 /* Default title for an unnamed tag */
 "Unnamed Tag" = "Etiqueta sin nombre";
 
diff --git a/Simplenote/fa.lproj/Localizable.strings b/Simplenote/fa.lproj/Localizable.strings
index 16b7920c4..777d53652 100644
--- a/Simplenote/fa.lproj/Localizable.strings
+++ b/Simplenote/fa.lproj/Localizable.strings
@@ -106,15 +106,13 @@
 /* Rating view - liked or disliked - no thanks button */
 "No thanks" = "نه ممنون";
 
-/* Hint displayed in the password field
-   Password TextField Placeholder */
+/* Password TextField Placeholder */
 "Password" = "گذرواژه";
 
 /* Message displayed when password is invalid (Signup) */
 "Password cannot match email" = "گذرواژه نمی‌تواند مطابقِ ایمیل باشد";
 
-/* Message displayed when password is too short. Please preserve the Percent D!
-   Message displayed when password is too short. The %%d is a placeholder for a numeral. Please preserve it! */
+/* Message displayed when password is too short. Please preserve the Percent D! */
 "Password must contain at least %d characters" = "گذرواژه دست‌ِکم باید حاویِ %d نویسه باشد";
 
 /* Message displayed when a password contains a disallowed character */
@@ -168,15 +166,11 @@
 /* UI region to the left of the note list which shows all of a users tags */
 "Sidebar" = "نوارِ کناری";
 
-/* SignUp Action
-   Signup Action
-   SignUp Interface Title
-   Title of button to create a new account (must be short) */
+/* Signup Action
+   SignUp Action
+   SignUp Interface Title */
 "Sign Up" = "نام‌نویسی";
 
-/* A short link to access the account creation screen */
-"Sign up" = "نام‌نویسی";
-
 /* Simplenote's Feedback Email Title */
 "Simplenote iOS Feedback" = "بازخوردِ Simplenote iOS";
 
diff --git a/Simplenote/fr.lproj/Localizable.strings b/Simplenote/fr.lproj/Localizable.strings
index ec25242dc..882a74000 100644
--- a/Simplenote/fr.lproj/Localizable.strings
+++ b/Simplenote/fr.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-08-07 12:54:03+0000 */
+/* Translation-Revision-Date: 2024-09-12 09:54:03+0000 */
 /* Plural-Forms: nplurals=2; plural=n > 1; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: fr */
@@ -94,9 +94,6 @@
    Title: No filters applied */
 "All Notes" = "Toutes les notes";
 
-/* A short description to access the account login screen */
-"Already have an account?" = "Déjà un compte ?";
-
 /* Delete account confirmation instructions */
 "An email has been sent to %@. Check your inbox and follow the instructions to confirm account deletion.\n\nYour account won't be deleted until we receive your confirmation." = "Un e-mail a été envoyé à %@ Consultez votre boîte de réception et suivez les instructions pour confirmer la suppression du compte.\n\nVotre compte ne sera pas supprimé tant que nous n’aurons pas reçu votre confirmation.";
 
@@ -145,14 +142,10 @@
 /* Delete account confirmation alert message */
 "By deleting the account for %@, all notes created with this account will be permanently deleted. This action is not reversible" = "En supprimant le compte associé à %@, toutes les notes créées avec ce compte seront définitivement supprimées. Cette action est irréversible.";
 
-/* Terms Button Text */
-"By signing up, you agree to our Terms of Service »" = "En vous inscrivant, vous acceptez les conditions d'utilisation »";
-
 /* Cancel Action
    Cancel action button
    Cancel action for password alert
    Cancel action on share extension.
-   Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
    Dismissing an interface
@@ -208,8 +201,7 @@
 /* Option to make the note list show only 1 line of text. The default is 3. */
 "Condensed Note List" = "Liste de notes condensée";
 
-/* Confirm button -> Review you account screen
-   Hint displayed in the password confirmation field */
+/* Confirm button -> Review you account screen */
 "Confirm" = "Confirmer";
 
 /* Title on the PinLock screen asking to confirm a passcode */
@@ -234,6 +226,9 @@
 /* Error for bad email or password */
 "Could not create an account with the provided email address and password." = "Impossible de créer un compte avec l'e-mail et le mot de passe fourni.";
 
+/* Notifies user tag delete failed */
+"Could not delete tag" = "Impossible de supprimer l’étiquette";
+
 /* Note fetch error title */
 "Could not fetch Notes" = "Impossible d’extraire les notes";
 
@@ -338,9 +333,6 @@
 /* Card title showing information about the note (metrics, references) */
 "Document" = "Document";
 
-/* A short description to access the account creation screen */
-"Don't have an account?" = "Vous n'avez pas encore de compte ?";
-
 /* Dismisses the Note Information UI
    Dismisses the Note Options UI
    Done editing tags
@@ -388,12 +380,6 @@
    Error Title */
 "Error" = "Erreur";
 
-/* No comment provided by engineer. */
-"Error: NSManagedObjectContext's persistentStoreCoordinator must be nil. Simperium will handle CoreData connections for you." = "Erreur : « NSManagedObjectContext’s persistentStoreCoordinator » doit être nul. Simperium se chargera des connexions CoreData pour vous.";
-
-/* No comment provided by engineer. */
-"Error: you must initialize your context with 'NSMainQueueConcurrencyType' concurrency type." = "Erreur : vous devez initialiser votre contexte avec le type de concurrence « NSMainQueueConcurrencyType ».";
-
 /* Get Help Description Label */
 "FAQ or contact us" = "FAQ ou nous contacter";
 
@@ -403,9 +389,6 @@
 /* Accessibility hint used when previous versions of a note are being fetched */
 "Fetching Version" = "Récupération de version";
 
-/* Forgot password Button Text */
-"Forgot password? »" = "Mot de passe oublié ?";
-
 /* Password Reset Action */
 "Forgot your password?" = "Mot de passe oublié ?";
 
@@ -581,9 +564,6 @@
 /* Message shown in note list when no notes are untagged */
 "No untagged notes" = "Aucune note sans étiquette";
 
-/* Error when you enter a bad email address */
-"Not a valid email address" = "Adresse e-mail non valide";
-
 /* Note Widget Title */
 "Note" = "Remarque&nbsp;:";
 
@@ -639,23 +619,18 @@
 /* Pin Lock */
 "Passcodes did not match. Try again." = "Codes PIN différents. Essayez de nouveau.";
 
-/* Hint displayed in the password field
-   Password TextField Placeholder */
+/* Password TextField Placeholder */
 "Password" = "Mot de passe";
 
 /* Message displayed when password is invalid (Signup) */
 "Password cannot match email" = "Le mot de passe et l'adresse e-mail ne doivent pas être identiques";
 
-/* Message displayed when password is too short. Please preserve the Percent D!
-   Message displayed when password is too short. The %%d is a placeholder for a numeral. Please preserve it! */
+/* Message displayed when password is too short. Please preserve the Percent D! */
 "Password must contain at least %d characters" = "Le mot de passe doit contenir au moins %d caractères.";
 
 /* Message displayed when a password contains a disallowed character */
 "Password must not contain tabs nor newlines" = "Le mot de passe ne doit contenir ni tabulation ni retours à la ligne";
 
-/* Password Validation: Confirmation doesn't match */
-"Passwords do not match" = "Les mots de passe ne correspondent pas";
-
 /* Number of changes pending to be sent */
 "Pendings" = "En attente";
 
@@ -675,6 +650,9 @@
 /* Extension Missing Token Alert Title */
 "Please log into your Simplenote account first by using the Simplenote app." = "Commencez par vous connecter à votre compte Simplenote à l’aide de l’application Simplenote.";
 
+/* Encourages trying delete again */
+"Please try again" = "Veuillez réessayer";
+
 /* Upgrade Alert Message */
 "Please upgrade to the latest iOS release to restore purchases" = "Veuillez mettre à niveau vers la dernière version d’iOS pour rétablir les achats.";
 
@@ -817,21 +795,11 @@
 /* UI region to the left of the note list which shows all of a users tags */
 "Sidebar" = "Barre latérale";
 
-/* Title of button for logging in (must be short) */
-"Sign In" = "Se connecter";
-
-/* SignUp Action
-   Signup Action
-   SignUp Interface Title
-   Title of button to create a new account (must be short) */
+/* Signup Action
+   SignUp Action
+   SignUp Interface Title */
 "Sign Up" = "S'inscrire";
 
-/* A short link to access the account login screen */
-"Sign in" = "Se connecter";
-
-/* A short link to access the account creation screen */
-"Sign up" = "S'inscrire";
-
 /* Alert message displayed when an account has unsynced notes */
 "Signing out will delete any unsynced notes. You can verify your synced notes by signing in to the Web App." = "La déconnexion entraînera la suppression de l’ensemble des notes non synchronisées. Vous pouvez vérifier vos notes synchronisées en vous connectant à l’application Web. ";
 
@@ -907,9 +875,6 @@
 /* Current Sustainer Details */
 "Thank you for your continued support" = "Nous vous remercions de votre soutien continu !";
 
-/* Error when address is in use */
-"That email is already being used" = "Cette adresse e-mail est déjà utilisée";
-
 /* Email TextField Placeholder */
 "The authentication code you've requested has expired. Please request a new one" = "Le code d’authentification que vous avez demandé a expiré. Veuillez en demander un nouveau";
 
@@ -977,9 +942,6 @@
 /* Undo action */
 "Undo" = "Annuler";
 
-/* WebSocket not initialized */
-"Uninitialized" = "Non initialisé";
-
 /* Default title for an unnamed tag */
 "Unnamed Tag" = "Étiquette sans nom";
 
diff --git a/Simplenote/he.lproj/Localizable.strings b/Simplenote/he.lproj/Localizable.strings
index 06f458a61..9eedfccd9 100644
--- a/Simplenote/he.lproj/Localizable.strings
+++ b/Simplenote/he.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-08-07 17:54:03+0000 */
+/* Translation-Revision-Date: 2024-09-11 16:54:02+0000 */
 /* Plural-Forms: nplurals=2; plural=n != 1; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: he_IL */
@@ -94,9 +94,6 @@
    Title: No filters applied */
 "All Notes" = "כל הפתקים";
 
-/* A short description to access the account login screen */
-"Already have an account?" = "יש לך כבר חשבון?";
-
 /* Delete account confirmation instructions */
 "An email has been sent to %@. Check your inbox and follow the instructions to confirm account deletion.\n\nYour account won't be deleted until we receive your confirmation." = "הודעת אימייל נשלחה לכתובת %@. יש לבדוק את תיבת הדואר הנכנס ולפעול לפי ההוראות לאישור המחיקה של החשבון.\n\nהחשבון שלך לא יימחק עד שנקבל את אישורך";
 
@@ -145,14 +142,10 @@
 /* Delete account confirmation alert message */
 "By deleting the account for %@, all notes created with this account will be permanently deleted. This action is not reversible" = "על ידי מחיקת החשבון עבור %@, כל הפתקים שנוצרו באמצעות החשבון הזה יימחקו לצמיתות. לא ניתן לבטל את הפעולה הזאת";
 
-/* Terms Button Text */
-"By signing up, you agree to our Terms of Service »" = "הרשמתך מהווה הסכמה לתנאי השימוש שלנו »";
-
 /* Cancel Action
    Cancel action button
    Cancel action for password alert
    Cancel action on share extension.
-   Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
    Dismissing an interface
@@ -208,8 +201,7 @@
 /* Option to make the note list show only 1 line of text. The default is 3. */
 "Condensed Note List" = "רשימת פתקים מכווצת";
 
-/* Confirm button -> Review you account screen
-   Hint displayed in the password confirmation field */
+/* Confirm button -> Review you account screen */
 "Confirm" = "פעם נוספת";
 
 /* Title on the PinLock screen asking to confirm a passcode */
@@ -234,6 +226,9 @@
 /* Error for bad email or password */
 "Could not create an account with the provided email address and password." = "לא ניתן ליצור חשבון באמצעות כתובת האימייל והסיסמה שסופקו.";
 
+/* Notifies user tag delete failed */
+"Could not delete tag" = "לא ניתן למחוק את התגית";
+
 /* Note fetch error title */
 "Could not fetch Notes" = "לא ניתן היה להביא 'פתקים'";
 
@@ -338,9 +333,6 @@
 /* Card title showing information about the note (metrics, references) */
 "Document" = "מסמך";
 
-/* A short description to access the account creation screen */
-"Don't have an account?" = "אין לך חשבון עדיין?";
-
 /* Dismisses the Note Information UI
    Dismisses the Note Options UI
    Done editing tags
@@ -388,12 +380,6 @@
    Error Title */
 "Error" = "שגיאה";
 
-/* No comment provided by engineer. */
-"Error: NSManagedObjectContext's persistentStoreCoordinator must be nil. Simperium will handle CoreData connections for you." = "שגיאה: הערך 'persistentStoreCoordinator' של 'NSManagedObjectContext' חייב להיות \"nil\". השירות של Simperium יטפל בחיבורים של CoreData עבורך.";
-
-/* No comment provided by engineer. */
-"Error: you must initialize your context with 'NSMainQueueConcurrencyType' concurrency type." = "שגיאה: עליך להפעיל את ההקשר באמצעות סוג המטבע 'NSMainQueueConcurrencyType'.";
-
 /* Get Help Description Label */
 "FAQ or contact us" = "שאלות נפוצות או יצירת קשר";
 
@@ -403,9 +389,6 @@
 /* Accessibility hint used when previous versions of a note are being fetched */
 "Fetching Version" = "מוריד גרסה";
 
-/* Forgot password Button Text */
-"Forgot password? »" = "שכחת את הסיסמה? »";
-
 /* Password Reset Action */
 "Forgot your password?" = "שכחת סיסמה?";
 
@@ -581,9 +564,6 @@
 /* Message shown in note list when no notes are untagged */
 "No untagged notes" = "אין פתקים ללא תגיות";
 
-/* Error when you enter a bad email address */
-"Not a valid email address" = "כתובת האימייל לא חוקית";
-
 /* Note Widget Title */
 "Note" = "פתק";
 
@@ -639,23 +619,18 @@
 /* Pin Lock */
 "Passcodes did not match. Try again." = "קודי הסיסמה לא התאימו. יש לנסות שוב.";
 
-/* Hint displayed in the password field
-   Password TextField Placeholder */
+/* Password TextField Placeholder */
 "Password" = "סיסמה";
 
 /* Message displayed when password is invalid (Signup) */
 "Password cannot match email" = "הסיסמה לא יכולה להיות כתובת האימייל";
 
-/* Message displayed when password is too short. Please preserve the Percent D!
-   Message displayed when password is too short. The %%d is a placeholder for a numeral. Please preserve it! */
+/* Message displayed when password is too short. Please preserve the Percent D! */
 "Password must contain at least %d characters" = "הסיסמה חייבת להכיל לפחות %d תווים";
 
 /* Message displayed when a password contains a disallowed character */
 "Password must not contain tabs nor newlines" = "הסיסמה לא יכולה להכיל סימני Tab או שורות חדשות";
 
-/* Password Validation: Confirmation doesn't match */
-"Passwords do not match" = "הסיסמאות לא תואמות";
-
 /* Number of changes pending to be sent */
 "Pendings" = "בהמתנה";
 
@@ -675,6 +650,9 @@
 /* Extension Missing Token Alert Title */
 "Please log into your Simplenote account first by using the Simplenote app." = "ראשית עליך להתחבר לחשבון שלך ב-Simplenote באמצעות האפליקציה של Simplenote.";
 
+/* Encourages trying delete again */
+"Please try again" = "יש לנסות שוב";
+
 /* Upgrade Alert Message */
 "Please upgrade to the latest iOS release to restore purchases" = "יש לשדרג לגרסה האחרונה של iOS כדי לשחזר רכישות";
 
@@ -817,21 +795,11 @@
 /* UI region to the left of the note list which shows all of a users tags */
 "Sidebar" = "סרגל צדדי";
 
-/* Title of button for logging in (must be short) */
-"Sign In" = "התחברות";
-
-/* SignUp Action
-   Signup Action
-   SignUp Interface Title
-   Title of button to create a new account (must be short) */
+/* Signup Action
+   SignUp Action
+   SignUp Interface Title */
 "Sign Up" = "הרשמה";
 
-/* A short link to access the account login screen */
-"Sign in" = "כניסה למערכת";
-
-/* A short link to access the account creation screen */
-"Sign up" = "הרשמה";
-
 /* Alert message displayed when an account has unsynced notes */
 "Signing out will delete any unsynced notes. You can verify your synced notes by signing in to the Web App." = "לאחר ההתנתקות, כל הפתקים שלא סוכרנו יימחקו. אפשר לאמת אילו פתקים סונכרנו באמצעות התחברות לאפליקציית הרשת.";
 
@@ -907,9 +875,6 @@
 /* Current Sustainer Details */
 "Thank you for your continued support" = "תודה על התמיכה המתמשכת";
 
-/* Error when address is in use */
-"That email is already being used" = "כתובת האימייל הזאת כבר נמצאת בשימוש";
-
 /* Email TextField Placeholder */
 "The authentication code you've requested has expired. Please request a new one" = "פג תוקפו של קוד האימות שביקשת. יש לבקש קוד חדש";
 
@@ -977,9 +942,6 @@
 /* Undo action */
 "Undo" = "ביטול פעולה אחרונה";
 
-/* WebSocket not initialized */
-"Uninitialized" = "לא הופעל";
-
 /* Default title for an unnamed tag */
 "Unnamed Tag" = "תגית ללא שם";
 
diff --git a/Simplenote/id.lproj/Localizable.strings b/Simplenote/id.lproj/Localizable.strings
index 640a7df5d..fe74cb71a 100644
--- a/Simplenote/id.lproj/Localizable.strings
+++ b/Simplenote/id.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-08-07 09:54:03+0000 */
+/* Translation-Revision-Date: 2024-09-12 09:54:03+0000 */
 /* Plural-Forms: nplurals=2; plural=n > 1; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: id */
@@ -94,9 +94,6 @@
    Title: No filters applied */
 "All Notes" = "Semua Catatan";
 
-/* A short description to access the account login screen */
-"Already have an account?" = "Sudah memiliki akun?";
-
 /* Delete account confirmation instructions */
 "An email has been sent to %@. Check your inbox and follow the instructions to confirm account deletion.\n\nYour account won't be deleted until we receive your confirmation." = "Email sudah dikirimkan ke %@ Periksa kotak masuk Anda dan ikuti petunjuk untuk mengonfirmasi penghapusan akun.\n\nAkun tidak akan dihapus hingga kami menerima konfirmasi Anda.";
 
@@ -142,14 +139,10 @@
 /* Delete account confirmation alert message */
 "By deleting the account for %@, all notes created with this account will be permanently deleted. This action is not reversible" = "Dengan menghapus akun untuk  %@, semua catatan yang dibuat dengan akun ini akan dihapus secara permanen. Tindakan ini tidak dapat dibatalkan";
 
-/* Terms Button Text */
-"By signing up, you agree to our Terms of Service »" = "Dengan mendaftar, berarti Anda menyetujui Ketentuan Layanan »";
-
 /* Cancel Action
    Cancel action button
    Cancel action for password alert
    Cancel action on share extension.
-   Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
    Dismissing an interface
@@ -205,8 +198,7 @@
 /* Option to make the note list show only 1 line of text. The default is 3. */
 "Condensed Note List" = "Daftar Catatan Ringkas";
 
-/* Confirm button -> Review you account screen
-   Hint displayed in the password confirmation field */
+/* Confirm button -> Review you account screen */
 "Confirm" = "Konfirmasi";
 
 /* Title on the PinLock screen asking to confirm a passcode */
@@ -231,6 +223,9 @@
 /* Error for bad email or password */
 "Could not create an account with the provided email address and password." = "Tidak dapat membuat akun dengan alamat email dan kata sandi yang diberikan.";
 
+/* Notifies user tag delete failed */
+"Could not delete tag" = "Tidak dapat menghapus tag";
+
 /* Note fetch error title */
 "Could not fetch Notes" = "Tidak dapat mengambil Catatan";
 
@@ -335,9 +330,6 @@
 /* Card title showing information about the note (metrics, references) */
 "Document" = "Dokumen";
 
-/* A short description to access the account creation screen */
-"Don't have an account?" = "Belum memiliki akun?";
-
 /* Dismisses the Note Information UI
    Dismisses the Note Options UI
    Done editing tags
@@ -385,12 +377,6 @@
    Error Title */
 "Error" = "Kesalahan";
 
-/* No comment provided by engineer. */
-"Error: NSManagedObjectContext's persistentStoreCoordinator must be nil. Simperium will handle CoreData connections for you." = "Error: persistentStoreCoordinator NSManagedObjectContext harus nol. Simperium akan menangani penyambungan CoreData untuk Anda.";
-
-/* No comment provided by engineer. */
-"Error: you must initialize your context with 'NSMainQueueConcurrencyType' concurrency type." = "Error: Anda harus memulai konteks dengan tipe konkurensi 'NSMainQueueConcurrencyType'.";
-
 /* Get Help Description Label */
 "FAQ or contact us" = "FAQ atau hubungi kami";
 
@@ -400,9 +386,6 @@
 /* Accessibility hint used when previous versions of a note are being fetched */
 "Fetching Version" = "Mengambil Versi";
 
-/* Forgot password Button Text */
-"Forgot password? »" = "Lupa kata sandi? »";
-
 /* Password Reset Action */
 "Forgot your password?" = "Lupa kata sandi?";
 
@@ -578,9 +561,6 @@
 /* Message shown in note list when no notes are untagged */
 "No untagged notes" = "Tidak ada catatan tanpa tag";
 
-/* Error when you enter a bad email address */
-"Not a valid email address" = "Bukan alamat email yang valid";
-
 /* Note Widget Title */
 "Note" = "Catatan";
 
@@ -636,23 +616,18 @@
 /* Pin Lock */
 "Passcodes did not match. Try again." = "Kode sandi tidak cocok. Coba lagi.";
 
-/* Hint displayed in the password field
-   Password TextField Placeholder */
+/* Password TextField Placeholder */
 "Password" = "Kata sandi";
 
 /* Message displayed when password is invalid (Signup) */
 "Password cannot match email" = "Kata sandi tidak boleh sama dengan email";
 
-/* Message displayed when password is too short. Please preserve the Percent D!
-   Message displayed when password is too short. The %%d is a placeholder for a numeral. Please preserve it! */
+/* Message displayed when password is too short. Please preserve the Percent D! */
 "Password must contain at least %d characters" = "Kata sandi harus berisi setidaknya %d karakter";
 
 /* Message displayed when a password contains a disallowed character */
 "Password must not contain tabs nor newlines" = "Kata sandi tidak boleh berisi tab atau baris baru";
 
-/* Password Validation: Confirmation doesn't match */
-"Passwords do not match" = "Kata sandi tidak cocok";
-
 /* Number of changes pending to be sent */
 "Pendings" = "Tertunda";
 
@@ -672,6 +647,9 @@
 /* Extension Missing Token Alert Title */
 "Please log into your Simplenote account first by using the Simplenote app." = "Silakan masuk ke akun Simplenote Anda terlebih dahulu menggunakan aplikasi Simplenote.";
 
+/* Encourages trying delete again */
+"Please try again" = "Coba lagi";
+
 /* Upgrade Alert Message */
 "Please upgrade to the latest iOS release to restore purchases" = "Upgrade ke rilis iOS terbaru untuk memulihkan pembelian";
 
@@ -814,21 +792,11 @@
 /* UI region to the left of the note list which shows all of a users tags */
 "Sidebar" = "Panel Sisi";
 
-/* Title of button for logging in (must be short) */
-"Sign In" = "Masuk";
-
-/* SignUp Action
-   Signup Action
-   SignUp Interface Title
-   Title of button to create a new account (must be short) */
+/* Signup Action
+   SignUp Action
+   SignUp Interface Title */
 "Sign Up" = "Mendaftar";
 
-/* A short link to access the account login screen */
-"Sign in" = "Masuk";
-
-/* A short link to access the account creation screen */
-"Sign up" = "Mendaftar";
-
 /* Alert message displayed when an account has unsynced notes */
 "Signing out will delete any unsynced notes. You can verify your synced notes by signing in to the Web App." = "Catatan yang tidak disinkronkan akan dihapus saat Anda keluar. Anda dapat memverifikasi catatan Anda yang disinkronkan dengan masuk ke Aplikasi Web.";
 
@@ -904,9 +872,6 @@
 /* Current Sustainer Details */
 "Thank you for your continued support" = "Terima kasih atas dukungan Anda yang berkelanjutan";
 
-/* Error when address is in use */
-"That email is already being used" = "Email sudah digunakan";
-
 /* Email TextField Placeholder */
 "The authentication code you've requested has expired. Please request a new one" = "Kode autentikasi yang diminta telah kedaluwarsa. Silakan minta kode yang baru";
 
@@ -974,9 +939,6 @@
 /* Undo action */
 "Undo" = "Urungkan";
 
-/* WebSocket not initialized */
-"Uninitialized" = "Belum Dimulai";
-
 /* Default title for an unnamed tag */
 "Unnamed Tag" = "Tag Tanpa Nama";
 
diff --git a/Simplenote/it.lproj/Localizable.strings b/Simplenote/it.lproj/Localizable.strings
index 7d467e95e..1c908e346 100644
--- a/Simplenote/it.lproj/Localizable.strings
+++ b/Simplenote/it.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-08-07 09:54:03+0000 */
+/* Translation-Revision-Date: 2024-09-12 11:54:03+0000 */
 /* Plural-Forms: nplurals=2; plural=n != 1; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: it */
@@ -94,9 +94,6 @@
    Title: No filters applied */
 "All Notes" = "Tutte le note";
 
-/* A short description to access the account login screen */
-"Already have an account?" = "Hai già un account?";
-
 /* Delete account confirmation instructions */
 "An email has been sent to %@. Check your inbox and follow the instructions to confirm account deletion.\n\nYour account won't be deleted until we receive your confirmation." = "È stata inviata un'e-mail a %@ Controlla la posta in arrivo e segui le istruzioni per confermare l'eliminazione dell'account.\n\nIl tuo account non verrà eliminato fino alla ricezione della conferma";
 
@@ -145,14 +142,10 @@
 /* Delete account confirmation alert message */
 "By deleting the account for %@, all notes created with this account will be permanently deleted. This action is not reversible" = "Eliminando il tuo account per %@, tutte le note create con esso verranno eliminate definitivamente. Questa azione non potrà essere annullata";
 
-/* Terms Button Text */
-"By signing up, you agree to our Terms of Service »" = "Iscrivendoti, accetti i nostri Termini di servizio »";
-
 /* Cancel Action
    Cancel action button
    Cancel action for password alert
    Cancel action on share extension.
-   Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
    Dismissing an interface
@@ -208,8 +201,7 @@
 /* Option to make the note list show only 1 line of text. The default is 3. */
 "Condensed Note List" = "Elenco note ristretto";
 
-/* Confirm button -> Review you account screen
-   Hint displayed in the password confirmation field */
+/* Confirm button -> Review you account screen */
 "Confirm" = "Conferma";
 
 /* Title on the PinLock screen asking to confirm a passcode */
@@ -234,6 +226,9 @@
 /* Error for bad email or password */
 "Could not create an account with the provided email address and password." = "Non è possibile creare un account con l'indirizzo email e la password forniti.";
 
+/* Notifies user tag delete failed */
+"Could not delete tag" = "Impossibile eliminare il tag";
+
 /* Note fetch error title */
 "Could not fetch Notes" = "Impossibile recuperare le note";
 
@@ -338,9 +333,6 @@
 /* Card title showing information about the note (metrics, references) */
 "Document" = "Documento";
 
-/* A short description to access the account creation screen */
-"Don't have an account?" = "Non hai un account?";
-
 /* Dismisses the Note Information UI
    Dismisses the Note Options UI
    Done editing tags
@@ -388,12 +380,6 @@
    Error Title */
 "Error" = "Errore";
 
-/* No comment provided by engineer. */
-"Error: NSManagedObjectContext's persistentStoreCoordinator must be nil. Simperium will handle CoreData connections for you." = "Errore: NSManagedObjectContext's persistentStoreCoordinator deve essere nil. Simperium gestirà le connessioni CoreData per te.";
-
-/* No comment provided by engineer. */
-"Error: you must initialize your context with 'NSMainQueueConcurrencyType' concurrency type." = "Errore: devi inizializzare il tuo contesto con il tipo di concomitanza 'NSMainQueueConcurrencyType'.";
-
 /* Get Help Description Label */
 "FAQ or contact us" = "FAQ o contattaci";
 
@@ -403,9 +389,6 @@
 /* Accessibility hint used when previous versions of a note are being fetched */
 "Fetching Version" = "Recupero della versione";
 
-/* Forgot password Button Text */
-"Forgot password? »" = "Hai dimenticato la tua password? »";
-
 /* Password Reset Action */
 "Forgot your password?" = "Password dimenticata?";
 
@@ -581,9 +564,6 @@
 /* Message shown in note list when no notes are untagged */
 "No untagged notes" = "Nessuna nota senza tag";
 
-/* Error when you enter a bad email address */
-"Not a valid email address" = "Indirizzo e-mail non valido";
-
 /* Note Widget Title */
 "Note" = "Nota";
 
@@ -639,23 +619,18 @@
 /* Pin Lock */
 "Passcodes did not match. Try again." = "PIN non coincidono. Prova ancora.";
 
-/* Hint displayed in the password field
-   Password TextField Placeholder */
+/* Password TextField Placeholder */
 "Password" = "Password";
 
 /* Message displayed when password is invalid (Signup) */
 "Password cannot match email" = "La password non può corrispondere all'e-mail";
 
-/* Message displayed when password is too short. Please preserve the Percent D!
-   Message displayed when password is too short. The %%d is a placeholder for a numeral. Please preserve it! */
+/* Message displayed when password is too short. Please preserve the Percent D! */
 "Password must contain at least %d characters" = "La password deve contenere almeno %d caratteri";
 
 /* Message displayed when a password contains a disallowed character */
 "Password must not contain tabs nor newlines" = "La password non deve contenere schede o nuove righe";
 
-/* Password Validation: Confirmation doesn't match */
-"Passwords do not match" = "Le password non corrispondono";
-
 /* Number of changes pending to be sent */
 "Pendings" = "In attesa";
 
@@ -675,6 +650,9 @@
 /* Extension Missing Token Alert Title */
 "Please log into your Simplenote account first by using the Simplenote app." = "Accedi al tuo account Simplenote prima usando l'app Simplenote.";
 
+/* Encourages trying delete again */
+"Please try again" = "Riprova";
+
 /* Upgrade Alert Message */
 "Please upgrade to the latest iOS release to restore purchases" = "Per ripristinare gli acquisti, effettua l'aggiornamento alla versione iOS più recente";
 
@@ -817,21 +795,11 @@
 /* UI region to the left of the note list which shows all of a users tags */
 "Sidebar" = "Barra laterale";
 
-/* Title of button for logging in (must be short) */
-"Sign In" = "Accedi";
-
-/* SignUp Action
-   Signup Action
-   SignUp Interface Title
-   Title of button to create a new account (must be short) */
+/* Signup Action
+   SignUp Action
+   SignUp Interface Title */
 "Sign Up" = "Crea account";
 
-/* A short link to access the account login screen */
-"Sign in" = "Accedi";
-
-/* A short link to access the account creation screen */
-"Sign up" = "Registrati";
-
 /* Alert message displayed when an account has unsynced notes */
 "Signing out will delete any unsynced notes. You can verify your synced notes by signing in to the Web App." = "La disconnessione causerà l’eliminazione di tutte le note non sincronizzate. È possibile verificare le note sincronizzate accedendo all’app web.";
 
@@ -907,9 +875,6 @@
 /* Current Sustainer Details */
 "Thank you for your continued support" = "Grazie per il supporto continuo";
 
-/* Error when address is in use */
-"That email is already being used" = "Quell'indirizzo e-mail è già in uso";
-
 /* Email TextField Placeholder */
 "The authentication code you've requested has expired. Please request a new one" = "Il codice di autenticazione che hai richiesto è scaduto. Richiedine uno nuovo";
 
@@ -977,9 +942,6 @@
 /* Undo action */
 "Undo" = "Annulla";
 
-/* WebSocket not initialized */
-"Uninitialized" = "Non inizializzato";
-
 /* Default title for an unnamed tag */
 "Unnamed Tag" = "Tag senza nome";
 
diff --git a/Simplenote/ja.lproj/Localizable.strings b/Simplenote/ja.lproj/Localizable.strings
index 5200e7fa4..ce92e35bd 100644
--- a/Simplenote/ja.lproj/Localizable.strings
+++ b/Simplenote/ja.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-08-07 09:54:03+0000 */
+/* Translation-Revision-Date: 2024-09-12 09:54:03+0000 */
 /* Plural-Forms: nplurals=1; plural=0; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: ja_JP */
@@ -94,9 +94,6 @@
    Title: No filters applied */
 "All Notes" = "すべてのノート";
 
-/* A short description to access the account login screen */
-"Already have an account?" = "すでにアカウントを持ちですか ?";
-
 /* Delete account confirmation instructions */
 "An email has been sent to %@. Check your inbox and follow the instructions to confirm account deletion.\n\nYour account won't be deleted until we receive your confirmation." = "%@ にメールが送信されました。受信トレイを確認し、手順に従ってアカウントの削除を確定してください。\n\n当社がお客様から確認を得るまでアカウントは削除されません。";
 
@@ -145,14 +142,10 @@
 /* Delete account confirmation alert message */
 "By deleting the account for %@, all notes created with this account will be permanently deleted. This action is not reversible" = "%@ のアカウントを削除すると、このアカウントで作成したすべてのメモが完全に削除されます。 この操作を元に戻すことはできません";
 
-/* Terms Button Text */
-"By signing up, you agree to our Terms of Service »" = "登録すると、利用規約に合意したものとみなされます。»";
-
 /* Cancel Action
    Cancel action button
    Cancel action for password alert
    Cancel action on share extension.
-   Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
    Dismissing an interface
@@ -208,8 +201,7 @@
 /* Option to make the note list show only 1 line of text. The default is 3. */
 "Condensed Note List" = "要約ノート一覧";
 
-/* Confirm button -> Review you account screen
-   Hint displayed in the password confirmation field */
+/* Confirm button -> Review you account screen */
 "Confirm" = "確認";
 
 /* Title on the PinLock screen asking to confirm a passcode */
@@ -234,6 +226,9 @@
 /* Error for bad email or password */
 "Could not create an account with the provided email address and password." = "入力されたメールアドレスとパスワードではアカウントを作成できませんでした。";
 
+/* Notifies user tag delete failed */
+"Could not delete tag" = "タグを削除できませんでした";
+
 /* Note fetch error title */
 "Could not fetch Notes" = "メモを取得できませんでした";
 
@@ -338,9 +333,6 @@
 /* Card title showing information about the note (metrics, references) */
 "Document" = "文書";
 
-/* A short description to access the account creation screen */
-"Don't have an account?" = "アカウントが無い場合";
-
 /* Dismisses the Note Information UI
    Dismisses the Note Options UI
    Done editing tags
@@ -388,12 +380,6 @@
    Error Title */
 "Error" = "エラー";
 
-/* No comment provided by engineer. */
-"Error: NSManagedObjectContext's persistentStoreCoordinator must be nil. Simperium will handle CoreData connections for you." = "エラー: NSManagedObjectContext の persistentStoreCoordinator が nil です。 Simperium が CoreData の接続に対応します。";
-
-/* No comment provided by engineer. */
-"Error: you must initialize your context with 'NSMainQueueConcurrencyType' concurrency type." = "エラー: 「NSMainQueueConcurrencyType」同時実行タイプでコンテキストを初期化する必要があります。";
-
 /* Get Help Description Label */
 "FAQ or contact us" = "FAQ またはお問い合わせ";
 
@@ -403,9 +389,6 @@
 /* Accessibility hint used when previous versions of a note are being fetched */
 "Fetching Version" = "バージョンを取得中";
 
-/* Forgot password Button Text */
-"Forgot password? »" = "パスワードをお忘れですか ? »";
-
 /* Password Reset Action */
 "Forgot your password?" = "パスワードを忘れた場合";
 
@@ -581,9 +564,6 @@
 /* Message shown in note list when no notes are untagged */
 "No untagged notes" = "タグが付けられていないメモはありません";
 
-/* Error when you enter a bad email address */
-"Not a valid email address" = "メールアドレスが無効です";
-
 /* Note Widget Title */
 "Note" = "ノート";
 
@@ -639,23 +619,18 @@
 /* Pin Lock */
 "Passcodes did not match. Try again." = "パスコードが一致しませんでした。もう一度お試しください。";
 
-/* Hint displayed in the password field
-   Password TextField Placeholder */
+/* Password TextField Placeholder */
 "Password" = "パスワード";
 
 /* Message displayed when password is invalid (Signup) */
 "Password cannot match email" = "パスワードがメールと一致しません";
 
-/* Message displayed when password is too short. Please preserve the Percent D!
-   Message displayed when password is too short. The %%d is a placeholder for a numeral. Please preserve it! */
+/* Message displayed when password is too short. Please preserve the Percent D! */
 "Password must contain at least %d characters" = "パスワードは%d文字以上にしてください";
 
 /* Message displayed when a password contains a disallowed character */
 "Password must not contain tabs nor newlines" = "パスワードにタブや改行を含めることはできません";
 
-/* Password Validation: Confirmation doesn't match */
-"Passwords do not match" = "パスワードが一致しません";
-
 /* Number of changes pending to be sent */
 "Pendings" = "保留中";
 
@@ -675,6 +650,9 @@
 /* Extension Missing Token Alert Title */
 "Please log into your Simplenote account first by using the Simplenote app." = "まず、Simplenote アプリを使用して Simplenote アカウントにログインしてください。";
 
+/* Encourages trying delete again */
+"Please try again" = "もう一度お試しください";
+
 /* Upgrade Alert Message */
 "Please upgrade to the latest iOS release to restore purchases" = "最新の iOS リリースをアップグレードして購入したものを復元してください";
 
@@ -817,21 +795,11 @@
 /* UI region to the left of the note list which shows all of a users tags */
 "Sidebar" = "サイドバー";
 
-/* Title of button for logging in (must be short) */
-"Sign In" = "ログイン";
-
-/* SignUp Action
-   Signup Action
-   SignUp Interface Title
-   Title of button to create a new account (must be short) */
+/* Signup Action
+   SignUp Action
+   SignUp Interface Title */
 "Sign Up" = "登録";
 
-/* A short link to access the account login screen */
-"Sign in" = "ログイン";
-
-/* A short link to access the account creation screen */
-"Sign up" = "登録";
-
 /* Alert message displayed when an account has unsynced notes */
 "Signing out will delete any unsynced notes. You can verify your synced notes by signing in to the Web App." = "ログアウトすると、同期されていないメモはすべて削除されます。同期したメモを確認するには、Web アプリにログインします。";
 
@@ -907,9 +875,6 @@
 /* Current Sustainer Details */
 "Thank you for your continued support" = "今後とも末永くご支援いただきますよう、宜しくお願い申し上げます";
 
-/* Error when address is in use */
-"That email is already being used" = "そのメールアドレスはすでに使用されています";
-
 /* Email TextField Placeholder */
 "The authentication code you've requested has expired. Please request a new one" = "リクエストした認証コードの有効期限が切れています。 新しいコードをリクエストしてください";
 
@@ -977,9 +942,6 @@
 /* Undo action */
 "Undo" = "元に戻す";
 
-/* WebSocket not initialized */
-"Uninitialized" = "未初期化";
-
 /* Default title for an unnamed tag */
 "Unnamed Tag" = "名前のないタグ";
 
diff --git a/Simplenote/ko.lproj/Localizable.strings b/Simplenote/ko.lproj/Localizable.strings
index 3091b4cba..637c2e5d0 100644
--- a/Simplenote/ko.lproj/Localizable.strings
+++ b/Simplenote/ko.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-08-07 09:54:03+0000 */
+/* Translation-Revision-Date: 2024-09-12 09:54:03+0000 */
 /* Plural-Forms: nplurals=1; plural=0; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: ko_KR */
@@ -94,9 +94,6 @@
    Title: No filters applied */
 "All Notes" = "모든 메모";
 
-/* A short description to access the account login screen */
-"Already have an account?" = "이미 계정이 있으세요?";
-
 /* Delete account confirmation instructions */
 "An email has been sent to %@. Check your inbox and follow the instructions to confirm account deletion.\n\nYour account won't be deleted until we receive your confirmation." = "이메일을 %@(으)로 보냈으니 받은 편지함을 확인하고 지침에 따라 계정 삭제를 확인하세요.\n\n시스템에 확인이 수신될 때까지 계정이 삭제되지 않음";
 
@@ -145,14 +142,10 @@
 /* Delete account confirmation alert message */
 "By deleting the account for %@, all notes created with this account will be permanently deleted. This action is not reversible" = "%@에 대한 계정을 삭제하면 이 계정을 통해 생성된 모든 메모가 영구적으로 삭제됩니다. 이 작업은 되돌릴 수 없습니다.";
 
-/* Terms Button Text */
-"By signing up, you agree to our Terms of Service »" = "가입하려면 서비스 약관에 동의해야 합니다. »";
-
 /* Cancel Action
    Cancel action button
    Cancel action for password alert
    Cancel action on share extension.
-   Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
    Dismissing an interface
@@ -208,8 +201,7 @@
 /* Option to make the note list show only 1 line of text. The default is 3. */
 "Condensed Note List" = "메모 요약 목록";
 
-/* Confirm button -> Review you account screen
-   Hint displayed in the password confirmation field */
+/* Confirm button -> Review you account screen */
 "Confirm" = "확인";
 
 /* Title on the PinLock screen asking to confirm a passcode */
@@ -234,6 +226,9 @@
 /* Error for bad email or password */
 "Could not create an account with the provided email address and password." = "입력하신 이메일 주소와 비밀번호로 계정을 만들지 못했습니다.";
 
+/* Notifies user tag delete failed */
+"Could not delete tag" = "태그를 삭제할 수 없습니다";
+
 /* Note fetch error title */
 "Could not fetch Notes" = "메모를 가져올 수 없음";
 
@@ -338,9 +333,6 @@
 /* Card title showing information about the note (metrics, references) */
 "Document" = "문서";
 
-/* A short description to access the account creation screen */
-"Don't have an account?" = "아직 계정이 없으세요?";
-
 /* Dismisses the Note Information UI
    Dismisses the Note Options UI
    Done editing tags
@@ -388,12 +380,6 @@
    Error Title */
 "Error" = "오류";
 
-/* No comment provided by engineer. */
-"Error: NSManagedObjectContext's persistentStoreCoordinator must be nil. Simperium will handle CoreData connections for you." = "오류: NSManagedObjectContext의 persistentStoreCoordinator는 nil이어야 합니다. Simperium에서 자동으로 CoreData 연결을 처리합니다.";
-
-/* No comment provided by engineer. */
-"Error: you must initialize your context with 'NSMainQueueConcurrencyType' concurrency type." = "오류: 동시성 유형 'NSMainQueueConcurrencyType'으로 컨텍스트를 초기화해야 합니다.";
-
 /* Get Help Description Label */
 "FAQ or contact us" = "FAQ 또는 문의";
 
@@ -403,9 +389,6 @@
 /* Accessibility hint used when previous versions of a note are being fetched */
 "Fetching Version" = "버전 가져오기";
 
-/* Forgot password Button Text */
-"Forgot password? »" = "비밀번호를 잊으셨나요? »";
-
 /* Password Reset Action */
 "Forgot your password?" = "비밀번호를 잊으셨나요?";
 
@@ -581,9 +564,6 @@
 /* Message shown in note list when no notes are untagged */
 "No untagged notes" = "태그 없는 메모 없음";
 
-/* Error when you enter a bad email address */
-"Not a valid email address" = "유효한 이메일 주소가 아닙니다.";
-
 /* Note Widget Title */
 "Note" = "메모";
 
@@ -639,23 +619,18 @@
 /* Pin Lock */
 "Passcodes did not match. Try again." = "패스코드가 일치하지 않습니다. 다시 시도해 주세요.";
 
-/* Hint displayed in the password field
-   Password TextField Placeholder */
+/* Password TextField Placeholder */
 "Password" = "비밀번호";
 
 /* Message displayed when password is invalid (Signup) */
 "Password cannot match email" = "비밀번호는 이메일과 일치할 수 없습니다.";
 
-/* Message displayed when password is too short. Please preserve the Percent D!
-   Message displayed when password is too short. The %%d is a placeholder for a numeral. Please preserve it! */
+/* Message displayed when password is too short. Please preserve the Percent D! */
 "Password must contain at least %d characters" = "비밀번호는 %d자 이상이어야 합니다.";
 
 /* Message displayed when a password contains a disallowed character */
 "Password must not contain tabs nor newlines" = "비밀번호에는 탭이나 줄 바꿈이 없어야 합니다.";
 
-/* Password Validation: Confirmation doesn't match */
-"Passwords do not match" = "비밀번호가 일치하지 않습니다.";
-
 /* Number of changes pending to be sent */
 "Pendings" = "대기 중";
 
@@ -675,6 +650,9 @@
 /* Extension Missing Token Alert Title */
 "Please log into your Simplenote account first by using the Simplenote app." = "Simplenote 앱을 사용하여 먼저 Simplenote에 로그인하세요.";
 
+/* Encourages trying delete again */
+"Please try again" = "다시 시도해 주세요.";
+
 /* Upgrade Alert Message */
 "Please upgrade to the latest iOS release to restore purchases" = "구매 항목을 복원하려면 최신 iOS 릴리스로 업그레이드하세요.";
 
@@ -817,21 +795,11 @@
 /* UI region to the left of the note list which shows all of a users tags */
 "Sidebar" = "사이드바";
 
-/* Title of button for logging in (must be short) */
-"Sign In" = "로그인";
-
-/* SignUp Action
-   Signup Action
-   SignUp Interface Title
-   Title of button to create a new account (must be short) */
+/* Signup Action
+   SignUp Action
+   SignUp Interface Title */
 "Sign Up" = "가입";
 
-/* A short link to access the account login screen */
-"Sign in" = "로그인";
-
-/* A short link to access the account creation screen */
-"Sign up" = "가입";
-
 /* Alert message displayed when an account has unsynced notes */
 "Signing out will delete any unsynced notes. You can verify your synced notes by signing in to the Web App." = "로그아웃하면 동기화되지 않은 모든 메모가 삭제됩니다. 웹 앱에 로그인하여 동기화된 메모를 확인할 수 있습니다.";
 
@@ -907,9 +875,6 @@
 /* Current Sustainer Details */
 "Thank you for your continued support" = "계속 지지해 주셔서 감사합니다.";
 
-/* Error when address is in use */
-"That email is already being used" = "해당 이메일 주소가 이미 사용되고 있습니다.";
-
 /* Email TextField Placeholder */
 "The authentication code you've requested has expired. Please request a new one" = "요청하신 인증 코드가 만료되었습니다. 새 인증 코드를 요청하세요.";
 
@@ -977,9 +942,6 @@
 /* Undo action */
 "Undo" = "실행 취소";
 
-/* WebSocket not initialized */
-"Uninitialized" = "초기화되지 않음";
-
 /* Default title for an unnamed tag */
 "Unnamed Tag" = "이름 없는 태그";
 
diff --git a/Simplenote/nl.lproj/Localizable.strings b/Simplenote/nl.lproj/Localizable.strings
index 0d7daf868..0706e97ef 100644
--- a/Simplenote/nl.lproj/Localizable.strings
+++ b/Simplenote/nl.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-08-08 11:54:03+0000 */
+/* Translation-Revision-Date: 2024-09-12 15:54:02+0000 */
 /* Plural-Forms: nplurals=2; plural=n != 1; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: nl */
@@ -94,9 +94,6 @@
    Title: No filters applied */
 "All Notes" = "Alle notities";
 
-/* A short description to access the account login screen */
-"Already have an account?" = "Heb je al een account?";
-
 /* Delete account confirmation instructions */
 "An email has been sent to %@. Check your inbox and follow the instructions to confirm account deletion.\n\nYour account won't be deleted until we receive your confirmation." = "Er is een e-mail verzonden naar %@ Controleer je inbox en volg de instructies om het verwijderen van je account te bevestigen.\n\nJe account zal niet worden verwijderd totdat we je bevestiging hebben ontvangen";
 
@@ -145,14 +142,10 @@
 /* Delete account confirmation alert message */
 "By deleting the account for %@, all notes created with this account will be permanently deleted. This action is not reversible" = "Door het account voor %@ te verwijderen zullen alle opmerkingen die gemaakt zijn met dit account permanent worden verwijderd. Dit kan niet worden teruggedraaid";
 
-/* Terms Button Text */
-"By signing up, you agree to our Terms of Service »" = "Als je je registreert, ga je akkoord met onze Terms of Service »";
-
 /* Cancel Action
    Cancel action button
    Cancel action for password alert
    Cancel action on share extension.
-   Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
    Dismissing an interface
@@ -208,8 +201,7 @@
 /* Option to make the note list show only 1 line of text. The default is 3. */
 "Condensed Note List" = "Beknopte notitielijst";
 
-/* Confirm button -> Review you account screen
-   Hint displayed in the password confirmation field */
+/* Confirm button -> Review you account screen */
 "Confirm" = "Bevestigen";
 
 /* Title on the PinLock screen asking to confirm a passcode */
@@ -234,6 +226,9 @@
 /* Error for bad email or password */
 "Could not create an account with the provided email address and password." = "Kan geen account maken met het opgegeven e-mailadres en wachtwoord.";
 
+/* Notifies user tag delete failed */
+"Could not delete tag" = "Kon de tag niet verwijderen";
+
 /* Note fetch error title */
 "Could not fetch Notes" = "Het is niet gelukt om notities op te halen";
 
@@ -338,9 +333,6 @@
 /* Card title showing information about the note (metrics, references) */
 "Document" = "Document";
 
-/* A short description to access the account creation screen */
-"Don't have an account?" = "Heb je nog geen account?";
-
 /* Dismisses the Note Information UI
    Dismisses the Note Options UI
    Done editing tags
@@ -388,12 +380,6 @@
    Error Title */
 "Error" = "Fout";
 
-/* No comment provided by engineer. */
-"Error: NSManagedObjectContext's persistentStoreCoordinator must be nil. Simperium will handle CoreData connections for you." = "Fout: NSManagedObjectContext's persistentStoreCoordinator moet nul zijn. Simperium verwerkt CoreData-verbindingen voor je.";
-
-/* No comment provided by engineer. */
-"Error: you must initialize your context with 'NSMainQueueConcurrencyType' concurrency type." = "Fout: je moet je context laten beginnen met het gelijktijdigheidstype ‘NSMainQueueConcurrencyType’.";
-
 /* Get Help Description Label */
 "FAQ or contact us" = "Veelgestelde vragen of neem contact met ons op";
 
@@ -403,9 +389,6 @@
 /* Accessibility hint used when previous versions of a note are being fetched */
 "Fetching Version" = "Versie ophalen";
 
-/* Forgot password Button Text */
-"Forgot password? »" = "Wachtwoord vergeten? »";
-
 /* Password Reset Action */
 "Forgot your password?" = "Wachtwoord vergeten?";
 
@@ -581,9 +564,6 @@
 /* Message shown in note list when no notes are untagged */
 "No untagged notes" = "Geen niet-getagde opmerkingen";
 
-/* Error when you enter a bad email address */
-"Not a valid email address" = "Geen geldig e-mailadres";
-
 /* Note Widget Title */
 "Note" = "Notitie";
 
@@ -639,23 +619,18 @@
 /* Pin Lock */
 "Passcodes did not match. Try again." = "Wachtwoordcodes komen niet overeen. Probeer het opnieuw.";
 
-/* Hint displayed in the password field
-   Password TextField Placeholder */
+/* Password TextField Placeholder */
 "Password" = "Wachtwoord";
 
 /* Message displayed when password is invalid (Signup) */
 "Password cannot match email" = "Wachtwoord mag niet hetzelfde zijn als e-mailadres";
 
-/* Message displayed when password is too short. Please preserve the Percent D!
-   Message displayed when password is too short. The %%d is a placeholder for a numeral. Please preserve it! */
+/* Message displayed when password is too short. Please preserve the Percent D! */
 "Password must contain at least %d characters" = "Wachtwoord moet minstens %d tekens bevatten";
 
 /* Message displayed when a password contains a disallowed character */
 "Password must not contain tabs nor newlines" = "Wachtwoord mag geen tabs of nieuwe regels bevatten";
 
-/* Password Validation: Confirmation doesn't match */
-"Passwords do not match" = "Wachtwoorden komen niet overeen";
-
 /* Number of changes pending to be sent */
 "Pendings" = "Aantal in behandeling";
 
@@ -675,6 +650,9 @@
 /* Extension Missing Token Alert Title */
 "Please log into your Simplenote account first by using the Simplenote app." = "Log eerst in bij je Simplenote-account met behulp van de Simplenote-app.";
 
+/* Encourages trying delete again */
+"Please try again" = "Probeer het nog eens";
+
 /* Upgrade Alert Message */
 "Please upgrade to the latest iOS release to restore purchases" = "Upgrade naar de nieuwste versie van iOS om aankopen te herstellen";
 
@@ -817,21 +795,11 @@
 /* UI region to the left of the note list which shows all of a users tags */
 "Sidebar" = "Sidebar";
 
-/* Title of button for logging in (must be short) */
-"Sign In" = "Aanmelden";
-
-/* SignUp Action
-   Signup Action
-   SignUp Interface Title
-   Title of button to create a new account (must be short) */
+/* Signup Action
+   SignUp Action
+   SignUp Interface Title */
 "Sign Up" = "Registreren";
 
-/* A short link to access the account login screen */
-"Sign in" = "Aanmelden";
-
-/* A short link to access the account creation screen */
-"Sign up" = "Registreren";
-
 /* Alert message displayed when an account has unsynced notes */
 "Signing out will delete any unsynced notes. You can verify your synced notes by signing in to the Web App." = "Door je af te melden worden gesynchroniseerde notities verwijderd. Je kunt je gesynchroniseerde notities verifiëren door je aan te melden via de web-app.";
 
@@ -907,9 +875,6 @@
 /* Current Sustainer Details */
 "Thank you for your continued support" = "Bedankt voor je voortdurende ondersteuning";
 
-/* Error when address is in use */
-"That email is already being used" = "Dit e-mailadres is al in gebruik";
-
 /* Email TextField Placeholder */
 "The authentication code you've requested has expired. Please request a new one" = "De authenticatiecode die je aangevraagd hebt, is verlopen. Vraag een nieuwe aan";
 
@@ -977,9 +942,6 @@
 /* Undo action */
 "Undo" = "Ongedaan maken";
 
-/* WebSocket not initialized */
-"Uninitialized" = "Niet gestart";
-
 /* Default title for an unnamed tag */
 "Unnamed Tag" = "Ongetitelde tag";
 
diff --git a/Simplenote/pt-BR.lproj/Localizable.strings b/Simplenote/pt-BR.lproj/Localizable.strings
index 93fbd01f9..ef3ebd1d0 100644
--- a/Simplenote/pt-BR.lproj/Localizable.strings
+++ b/Simplenote/pt-BR.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-08-07 17:54:03+0000 */
+/* Translation-Revision-Date: 2024-09-11 14:54:03+0000 */
 /* Plural-Forms: nplurals=2; plural=(n > 1); */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: pt_BR */
@@ -94,9 +94,6 @@
    Title: No filters applied */
 "All Notes" = "Todas as anotações";
 
-/* A short description to access the account login screen */
-"Already have an account?" = "Já tem uma conta?";
-
 /* Delete account confirmation instructions */
 "An email has been sent to %@. Check your inbox and follow the instructions to confirm account deletion.\n\nYour account won't be deleted until we receive your confirmation." = "Um e-mail foi enviado para %@. Verifique sua caixa de entrada e siga as instruções para confirmar a exclusão da conta.\n\nSua conta não será excluída até recebermos sua confirmação.";
 
@@ -145,14 +142,10 @@
 /* Delete account confirmation alert message */
 "By deleting the account for %@, all notes created with this account will be permanently deleted. This action is not reversible" = "Ao excluir a conta de %@, todas as anotações criadas com ela serão excluídas de forma permanente. Essa ação não é reversível";
 
-/* Terms Button Text */
-"By signing up, you agree to our Terms of Service »" = "Ao se registrar, você concorda com os nossos Termos de Serviço »";
-
 /* Cancel Action
    Cancel action button
    Cancel action for password alert
    Cancel action on share extension.
-   Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
    Dismissing an interface
@@ -208,8 +201,7 @@
 /* Option to make the note list show only 1 line of text. The default is 3. */
 "Condensed Note List" = "Lista condensada de anotações";
 
-/* Confirm button -> Review you account screen
-   Hint displayed in the password confirmation field */
+/* Confirm button -> Review you account screen */
 "Confirm" = "Confirmar";
 
 /* Title on the PinLock screen asking to confirm a passcode */
@@ -234,6 +226,9 @@
 /* Error for bad email or password */
 "Could not create an account with the provided email address and password." = "Não foi possível criar uma conta com o endereço de email e senha fornecidos.";
 
+/* Notifies user tag delete failed */
+"Could not delete tag" = "Não foi possível excluir a tag";
+
 /* Note fetch error title */
 "Could not fetch Notes" = "Não foi possível obter notas";
 
@@ -338,9 +333,6 @@
 /* Card title showing information about the note (metrics, references) */
 "Document" = "Documento";
 
-/* A short description to access the account creation screen */
-"Don't have an account?" = "Não tem uma conta?";
-
 /* Dismisses the Note Information UI
    Dismisses the Note Options UI
    Done editing tags
@@ -388,12 +380,6 @@
    Error Title */
 "Error" = "Erro";
 
-/* No comment provided by engineer. */
-"Error: NSManagedObjectContext's persistentStoreCoordinator must be nil. Simperium will handle CoreData connections for you." = "Erro: o persistentStoreCoordinator de NSManagedObjectContext deve ser nulo. A Simperium cuidará das conexões CoreData para você.";
-
-/* No comment provided by engineer. */
-"Error: you must initialize your context with 'NSMainQueueConcurrencyType' concurrency type." = "Erro: você deve inicializar seu contexto com o tipo de simultaneidade 'NSMainQueueConcurrencyType'.";
-
 /* Get Help Description Label */
 "FAQ or contact us" = "Veja as perguntas frequentes ou fale conosco";
 
@@ -403,9 +389,6 @@
 /* Accessibility hint used when previous versions of a note are being fetched */
 "Fetching Version" = "Buscando versão";
 
-/* Forgot password Button Text */
-"Forgot password? »" = "Esqueceu sua senha? »";
-
 /* Password Reset Action */
 "Forgot your password?" = "Esqueceu sua senha?";
 
@@ -581,9 +564,6 @@
 /* Message shown in note list when no notes are untagged */
 "No untagged notes" = "Nenhuma anotação sem tag";
 
-/* Error when you enter a bad email address */
-"Not a valid email address" = "Endereço de e-mail inválido";
-
 /* Note Widget Title */
 "Note" = "Anotação";
 
@@ -639,23 +619,18 @@
 /* Pin Lock */
 "Passcodes did not match. Try again." = "As senhas não corresponderam. Tente novamente.";
 
-/* Hint displayed in the password field
-   Password TextField Placeholder */
+/* Password TextField Placeholder */
 "Password" = "Senha";
 
 /* Message displayed when password is invalid (Signup) */
 "Password cannot match email" = "A senha não pode corresponder ao e-mail";
 
-/* Message displayed when password is too short. Please preserve the Percent D!
-   Message displayed when password is too short. The %%d is a placeholder for a numeral. Please preserve it! */
+/* Message displayed when password is too short. Please preserve the Percent D! */
 "Password must contain at least %d characters" = "A senha deve ter no mínimo %d caracteres";
 
 /* Message displayed when a password contains a disallowed character */
 "Password must not contain tabs nor newlines" = "A senha não pode conter tabulações nem novas linhas";
 
-/* Password Validation: Confirmation doesn't match */
-"Passwords do not match" = "As senhas não coincidem";
-
 /* Number of changes pending to be sent */
 "Pendings" = "Pendentes";
 
@@ -675,6 +650,9 @@
 /* Extension Missing Token Alert Title */
 "Please log into your Simplenote account first by using the Simplenote app." = "Primeiro, faça login na sua conta do Simplenote usando o aplicativo.";
 
+/* Encourages trying delete again */
+"Please try again" = "Tente novamente";
+
 /* Upgrade Alert Message */
 "Please upgrade to the latest iOS release to restore purchases" = "Faça upgrade para a versão mais recente do iOS para restaurar as compras";
 
@@ -817,21 +795,11 @@
 /* UI region to the left of the note list which shows all of a users tags */
 "Sidebar" = "Barra lateral";
 
-/* Title of button for logging in (must be short) */
-"Sign In" = "Fazer login";
-
-/* SignUp Action
-   Signup Action
-   SignUp Interface Title
-   Title of button to create a new account (must be short) */
+/* Signup Action
+   SignUp Action
+   SignUp Interface Title */
 "Sign Up" = "Registrar-se";
 
-/* A short link to access the account login screen */
-"Sign in" = "Fazer login";
-
-/* A short link to access the account creation screen */
-"Sign up" = "Registrar-se";
-
 /* Alert message displayed when an account has unsynced notes */
 "Signing out will delete any unsynced notes. You can verify your synced notes by signing in to the Web App." = "Sair resultará na exclusão de quaisquer anotações não sincronizadas. Para verificar suas anotações sincronizadas, entre no Aplicativo para Web.";
 
@@ -907,9 +875,6 @@
 /* Current Sustainer Details */
 "Thank you for your continued support" = "Agradecemos pelo seu apoio contínuo";
 
-/* Error when address is in use */
-"That email is already being used" = "Este e-mail já está em uso";
-
 /* Email TextField Placeholder */
 "The authentication code you've requested has expired. Please request a new one" = "O código de autenticação solicitado expirou. Solicite um novo.";
 
@@ -977,9 +942,6 @@
 /* Undo action */
 "Undo" = "Desfazer";
 
-/* WebSocket not initialized */
-"Uninitialized" = "Não inicializado";
-
 /* Default title for an unnamed tag */
 "Unnamed Tag" = "Tag sem nome";
 
diff --git a/Simplenote/ru.lproj/Localizable.strings b/Simplenote/ru.lproj/Localizable.strings
index c659103fc..4732ea9e0 100644
--- a/Simplenote/ru.lproj/Localizable.strings
+++ b/Simplenote/ru.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-08-06 19:54:04+0000 */
+/* Translation-Revision-Date: 2024-09-12 15:54:03+0000 */
 /* Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2); */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: ru */
@@ -94,9 +94,6 @@
    Title: No filters applied */
 "All Notes" = "Все заметки";
 
-/* A short description to access the account login screen */
-"Already have an account?" = "Уже есть учетная запись?";
-
 /* Delete account confirmation instructions */
 "An email has been sent to %@. Check your inbox and follow the instructions to confirm account deletion.\n\nYour account won't be deleted until we receive your confirmation." = "Мы выслали письмо на адрес %@. Проверьте почту и следуйте инструкциям, чтобы подтвердить удаление учётной записи.\n\nВаша учётная запись будет удалена только после получения вашего подтверждения";
 
@@ -145,14 +142,10 @@
 /* Delete account confirmation alert message */
 "By deleting the account for %@, all notes created with this account will be permanently deleted. This action is not reversible" = "При удалении учётной записи для %@ все созданные в ней заметки будут безвозвратно удалены. Это действие нельзя отменить";
 
-/* Terms Button Text */
-"By signing up, you agree to our Terms of Service »" = "Регистрируясь, вы подтверждаете свое согласие с нашими Условиями предоставления услуг »";
-
 /* Cancel Action
    Cancel action button
    Cancel action for password alert
    Cancel action on share extension.
-   Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
    Dismissing an interface
@@ -208,8 +201,7 @@
 /* Option to make the note list show only 1 line of text. The default is 3. */
 "Condensed Note List" = "Сократить список заметок";
 
-/* Confirm button -> Review you account screen
-   Hint displayed in the password confirmation field */
+/* Confirm button -> Review you account screen */
 "Confirm" = "Подтвердить";
 
 /* Title on the PinLock screen asking to confirm a passcode */
@@ -234,6 +226,9 @@
 /* Error for bad email or password */
 "Could not create an account with the provided email address and password." = "Невозможно создать учетную запись с указанными адресом email и паролем.";
 
+/* Notifies user tag delete failed */
+"Could not delete tag" = "Не удалось удалить метку";
+
 /* Note fetch error title */
 "Could not fetch Notes" = "Не удалось получить заметки";
 
@@ -338,9 +333,6 @@
 /* Card title showing information about the note (metrics, references) */
 "Document" = "Документ";
 
-/* A short description to access the account creation screen */
-"Don't have an account?" = "Нет учетной записи?";
-
 /* Dismisses the Note Information UI
    Dismisses the Note Options UI
    Done editing tags
@@ -388,12 +380,6 @@
    Error Title */
 "Error" = "Ошибка";
 
-/* No comment provided by engineer. */
-"Error: NSManagedObjectContext's persistentStoreCoordinator must be nil. Simperium will handle CoreData connections for you." = "Ошибка: persistentStoreCoordinator объекта «NSManagedObjectContext» должен быть равен нулю. Simperium возьмет на себя управление подключениями CoreData.";
-
-/* No comment provided by engineer. */
-"Error: you must initialize your context with 'NSMainQueueConcurrencyType' concurrency type." = "Ошибка: необходимо инициализировать контекст с типом многопоточности «NSMainQueueConcurrencyType».";
-
 /* Get Help Description Label */
 "FAQ or contact us" = "«Часто задаваемые вопросы» или «Свяжитесь с нами»";
 
@@ -403,9 +389,6 @@
 /* Accessibility hint used when previous versions of a note are being fetched */
 "Fetching Version" = "Получение сведений о версии";
 
-/* Forgot password Button Text */
-"Forgot password? »" = "Забыли пароль? »";
-
 /* Password Reset Action */
 "Forgot your password?" = "Забыли пароль?";
 
@@ -581,9 +564,6 @@
 /* Message shown in note list when no notes are untagged */
 "No untagged notes" = "Нет заметок без тегов";
 
-/* Error when you enter a bad email address */
-"Not a valid email address" = "Этот адрес эл. почты недействителен";
-
 /* Note Widget Title */
 "Note" = "Заметка";
 
@@ -639,23 +619,18 @@
 /* Pin Lock */
 "Passcodes did not match. Try again." = "Пароль не подходит. Попробуйте снова. ";
 
-/* Hint displayed in the password field
-   Password TextField Placeholder */
+/* Password TextField Placeholder */
 "Password" = "Пароль";
 
 /* Message displayed when password is invalid (Signup) */
 "Password cannot match email" = "Пароль не должен совпадать с адресом эл. почты";
 
-/* Message displayed when password is too short. Please preserve the Percent D!
-   Message displayed when password is too short. The %%d is a placeholder for a numeral. Please preserve it! */
+/* Message displayed when password is too short. Please preserve the Percent D! */
 "Password must contain at least %d characters" = "Пароль должен содержать не менее %d симв.";
 
 /* Message displayed when a password contains a disallowed character */
 "Password must not contain tabs nor newlines" = "Пароль не должен содержать знаки табуляции и перехода на новую строку";
 
-/* Password Validation: Confirmation doesn't match */
-"Passwords do not match" = "Пароли не совпадают";
-
 /* Number of changes pending to be sent */
 "Pendings" = "На утверждении";
 
@@ -675,6 +650,9 @@
 /* Extension Missing Token Alert Title */
 "Please log into your Simplenote account first by using the Simplenote app." = "Сначала войдите в учётную запись в приложении Simplenote.";
 
+/* Encourages trying delete again */
+"Please try again" = "Повторите попытку";
+
 /* Upgrade Alert Message */
 "Please upgrade to the latest iOS release to restore purchases" = "Установите последнюю версию для iOS, чтобы восстановить покупки";
 
@@ -817,21 +795,11 @@
 /* UI region to the left of the note list which shows all of a users tags */
 "Sidebar" = "Боковая панель";
 
-/* Title of button for logging in (must be short) */
-"Sign In" = "Войти";
-
-/* SignUp Action
-   Signup Action
-   SignUp Interface Title
-   Title of button to create a new account (must be short) */
+/* Signup Action
+   SignUp Action
+   SignUp Interface Title */
 "Sign Up" = "Зарегистрироваться";
 
-/* A short link to access the account login screen */
-"Sign in" = "Войти";
-
-/* A short link to access the account creation screen */
-"Sign up" = "Зарегистрироваться";
-
 /* Alert message displayed when an account has unsynced notes */
 "Signing out will delete any unsynced notes. You can verify your synced notes by signing in to the Web App." = "При выходе из учётной записи все несинхронизированные заметки будут удалены. Чтобы убедиться, что заметки синхронизированы, войдите в веб-приложение.";
 
@@ -907,9 +875,6 @@
 /* Current Sustainer Details */
 "Thank you for your continued support" = "Благодарим за вашу неизменную поддержку";
 
-/* Error when address is in use */
-"That email is already being used" = "Этот адрес эл. почты уже используется";
-
 /* Email TextField Placeholder */
 "The authentication code you've requested has expired. Please request a new one" = "Срок действия запрошенного вами кода аутентификации истёк. Запросите новый код";
 
@@ -977,9 +942,6 @@
 /* Undo action */
 "Undo" = "Назад";
 
-/* WebSocket not initialized */
-"Uninitialized" = "Не инициализировано";
-
 /* Default title for an unnamed tag */
 "Unnamed Tag" = "Метка без имени";
 
diff --git a/Simplenote/sv.lproj/Localizable.strings b/Simplenote/sv.lproj/Localizable.strings
index c4566932d..b75d26d15 100644
--- a/Simplenote/sv.lproj/Localizable.strings
+++ b/Simplenote/sv.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-08-08 11:54:02+0000 */
+/* Translation-Revision-Date: 2024-09-11 10:54:03+0000 */
 /* Plural-Forms: nplurals=2; plural=n != 1; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: sv_SE */
@@ -94,9 +94,6 @@
    Title: No filters applied */
 "All Notes" = "Alla anteckningar";
 
-/* A short description to access the account login screen */
-"Already have an account?" = "Har du redan ett konto?";
-
 /* Delete account confirmation instructions */
 "An email has been sent to %@. Check your inbox and follow the instructions to confirm account deletion.\n\nYour account won't be deleted until we receive your confirmation." = "Ett e-postmeddelande har skickats till %@. Kolla din inkorg och följ instruktionerna för att bekräfta kontoborttagningen.\n\nDitt konto kommer inte att tas bort förrän vi har mottagit din bekräftelse";
 
@@ -145,14 +142,10 @@
 /* Delete account confirmation alert message */
 "By deleting the account for %@, all notes created with this account will be permanently deleted. This action is not reversible" = "Om du tar bort kontot för %@ kommer alla anteckningar som har skapats med kontot också att tas bort permanent. Det går inte att ångra den här åtgärden.";
 
-/* Terms Button Text */
-"By signing up, you agree to our Terms of Service »" = "Genom att skapa ett konto godkänner du användaravtalet »";
-
 /* Cancel Action
    Cancel action button
    Cancel action for password alert
    Cancel action on share extension.
-   Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
    Dismissing an interface
@@ -208,8 +201,7 @@
 /* Option to make the note list show only 1 line of text. The default is 3. */
 "Condensed Note List" = "Komprimerad anteckningslista";
 
-/* Confirm button -> Review you account screen
-   Hint displayed in the password confirmation field */
+/* Confirm button -> Review you account screen */
 "Confirm" = "Bekräfta";
 
 /* Title on the PinLock screen asking to confirm a passcode */
@@ -234,6 +226,9 @@
 /* Error for bad email or password */
 "Could not create an account with the provided email address and password." = "Kunde inte skapa ett konto med den e-postadressen och det lösenordet.";
 
+/* Notifies user tag delete failed */
+"Could not delete tag" = "Det gick inte att ta bort etiketten";
+
 /* Note fetch error title */
 "Could not fetch Notes" = "Det gick inte att hämta anteckningar";
 
@@ -338,9 +333,6 @@
 /* Card title showing information about the note (metrics, references) */
 "Document" = "Dokument";
 
-/* A short description to access the account creation screen */
-"Don't have an account?" = "Har du inget konto?";
-
 /* Dismisses the Note Information UI
    Dismisses the Note Options UI
    Done editing tags
@@ -388,12 +380,6 @@
    Error Title */
 "Error" = "Fel";
 
-/* No comment provided by engineer. */
-"Error: NSManagedObjectContext's persistentStoreCoordinator must be nil. Simperium will handle CoreData connections for you." = "Fel: persistentStoreCoordinator för NSManagedObjectContext måste vara noll. Simperium kommer att hantera CoreData-anslutningar åt dig.";
-
-/* No comment provided by engineer. */
-"Error: you must initialize your context with 'NSMainQueueConcurrencyType' concurrency type." = "Fel: Du måste initiera ditt sammanhang med samtidighetstypen \"NSMainQueueConcurrencyType\".";
-
 /* Get Help Description Label */
 "FAQ or contact us" = "Vanliga frågor eller kontakta oss";
 
@@ -403,9 +389,6 @@
 /* Accessibility hint used when previous versions of a note are being fetched */
 "Fetching Version" = "Hämtar version";
 
-/* Forgot password Button Text */
-"Forgot password? »" = "Glömt lösenord? »";
-
 /* Password Reset Action */
 "Forgot your password?" = "Glömt ditt lösenord?";
 
@@ -581,9 +564,6 @@
 /* Message shown in note list when no notes are untagged */
 "No untagged notes" = "Inga omärkta anteckningar";
 
-/* Error when you enter a bad email address */
-"Not a valid email address" = "Inte en giltig e-postadress";
-
 /* Note Widget Title */
 "Note" = "Notis";
 
@@ -639,23 +619,18 @@
 /* Pin Lock */
 "Passcodes did not match. Try again." = "Lösenkoderna matchar inte varandra. Försök igen.";
 
-/* Hint displayed in the password field
-   Password TextField Placeholder */
+/* Password TextField Placeholder */
 "Password" = "Lösenord";
 
 /* Message displayed when password is invalid (Signup) */
 "Password cannot match email" = "Lösenord kan inte matcha e-post";
 
-/* Message displayed when password is too short. Please preserve the Percent D!
-   Message displayed when password is too short. The %%d is a placeholder for a numeral. Please preserve it! */
+/* Message displayed when password is too short. Please preserve the Percent D! */
 "Password must contain at least %d characters" = "Lösenord måste innehålla minst %d tecken";
 
 /* Message displayed when a password contains a disallowed character */
 "Password must not contain tabs nor newlines" = "Lösenordet får inte innehålla tabbstopp eller nya rader";
 
-/* Password Validation: Confirmation doesn't match */
-"Passwords do not match" = "Lösenorden matchar inte";
-
 /* Number of changes pending to be sent */
 "Pendings" = "Väntande";
 
@@ -675,6 +650,9 @@
 /* Extension Missing Token Alert Title */
 "Please log into your Simplenote account first by using the Simplenote app." = "Logga in på ditt Simplenote-konto först genom att använda Simplenote-appen.";
 
+/* Encourages trying delete again */
+"Please try again" = "Försök igen";
+
 /* Upgrade Alert Message */
 "Please upgrade to the latest iOS release to restore purchases" = "Uppgradera till den senaste iOS-versionen för att återställa köp";
 
@@ -817,21 +795,11 @@
 /* UI region to the left of the note list which shows all of a users tags */
 "Sidebar" = "Sidopanel";
 
-/* Title of button for logging in (must be short) */
-"Sign In" = "Logga in";
-
-/* SignUp Action
-   Signup Action
-   SignUp Interface Title
-   Title of button to create a new account (must be short) */
+/* Signup Action
+   SignUp Action
+   SignUp Interface Title */
 "Sign Up" = "Registrera";
 
-/* A short link to access the account login screen */
-"Sign in" = "Logga in";
-
-/* A short link to access the account creation screen */
-"Sign up" = "Skapa konto";
-
 /* Alert message displayed when an account has unsynced notes */
 "Signing out will delete any unsynced notes. You can verify your synced notes by signing in to the Web App." = "Utloggning kommer att radera alla osynkroniserade anteckningar. Du kan verifiera dina synkroniserade anteckningar genom att logga in på webbappen.";
 
@@ -907,9 +875,6 @@
 /* Current Sustainer Details */
 "Thank you for your continued support" = "Tack för ditt fortsatta stöd";
 
-/* Error when address is in use */
-"That email is already being used" = "Den e-posten används redan";
-
 /* Email TextField Placeholder */
 "The authentication code you've requested has expired. Please request a new one" = "Autentiseringskoden du har begärt har löpt ut. Begär en ny";
 
@@ -977,9 +942,6 @@
 /* Undo action */
 "Undo" = "Ångra";
 
-/* WebSocket not initialized */
-"Uninitialized" = "Oinitierad";
-
 /* Default title for an unnamed tag */
 "Unnamed Tag" = "Etikett utan namn";
 
diff --git a/Simplenote/tr.lproj/Localizable.strings b/Simplenote/tr.lproj/Localizable.strings
index e1aca6f25..dab41a5c3 100644
--- a/Simplenote/tr.lproj/Localizable.strings
+++ b/Simplenote/tr.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-08-07 15:54:03+0000 */
+/* Translation-Revision-Date: 2024-09-12 09:54:03+0000 */
 /* Plural-Forms: nplurals=2; plural=(n > 1); */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: tr */
@@ -94,9 +94,6 @@
    Title: No filters applied */
 "All Notes" = "Tüm Notlar";
 
-/* A short description to access the account login screen */
-"Already have an account?" = "Hesabınız zaten var mı?";
-
 /* Delete account confirmation instructions */
 "An email has been sent to %@. Check your inbox and follow the instructions to confirm account deletion.\n\nYour account won't be deleted until we receive your confirmation." = "%@ adresine bir e-posta gönderildi Gelen kutunuzu kontrol edin ve hesap silme işlemini onaylamak için talimatları izleyin.\n\nOnayınız alınana kadar hesabınız silinmeyecek.";
 
@@ -145,14 +142,10 @@
 /* Delete account confirmation alert message */
 "By deleting the account for %@, all notes created with this account will be permanently deleted. This action is not reversible" = "%@ için hesabınızı sildiğinizde bu hesapla oluşturulan tüm notlar kalıcı olarak silinecektir. Bu eylem geri alınamaz.";
 
-/* Terms Button Text */
-"By signing up, you agree to our Terms of Service »" = "Kaydolmakla Hizmet Koşulları'nı kabul etmiş olursunuz »";
-
 /* Cancel Action
    Cancel action button
    Cancel action for password alert
    Cancel action on share extension.
-   Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
    Dismissing an interface
@@ -208,8 +201,7 @@
 /* Option to make the note list show only 1 line of text. The default is 3. */
 "Condensed Note List" = "Sıkıştırılmış Not Listesi";
 
-/* Confirm button -> Review you account screen
-   Hint displayed in the password confirmation field */
+/* Confirm button -> Review you account screen */
 "Confirm" = "Onayla";
 
 /* Title on the PinLock screen asking to confirm a passcode */
@@ -234,6 +226,9 @@
 /* Error for bad email or password */
 "Could not create an account with the provided email address and password." = "Verilen e-posta adresi ve parolayla hesap oluşturulamadı.";
 
+/* Notifies user tag delete failed */
+"Could not delete tag" = "Etiket silinemedi";
+
 /* Note fetch error title */
 "Could not fetch Notes" = "Notlar getirilemedi";
 
@@ -338,9 +333,6 @@
 /* Card title showing information about the note (metrics, references) */
 "Document" = "Belge";
 
-/* A short description to access the account creation screen */
-"Don't have an account?" = "Hesabınız yok mu?";
-
 /* Dismisses the Note Information UI
    Dismisses the Note Options UI
    Done editing tags
@@ -388,12 +380,6 @@
    Error Title */
 "Error" = "Hata";
 
-/* No comment provided by engineer. */
-"Error: NSManagedObjectContext's persistentStoreCoordinator must be nil. Simperium will handle CoreData connections for you." = "Hata: NSManagedObjectContext'in persistentStoreCoordinator değeri sıfır olmalıdır. Simperium, CoreData bağlantılarını sizin için yönetecek.";
-
-/* No comment provided by engineer. */
-"Error: you must initialize your context with 'NSMainQueueConcurrencyType' concurrency type." = "Hata: Bağlamınızı 'NSMainQueueConcurrencyType' eşzamanlılık türüyle başlatmalısınız.";
-
 /* Get Help Description Label */
 "FAQ or contact us" = "SSS veya bize ulaşın";
 
@@ -403,9 +389,6 @@
 /* Accessibility hint used when previous versions of a note are being fetched */
 "Fetching Version" = "Sürüm Alınıyor";
 
-/* Forgot password Button Text */
-"Forgot password? »" = "Şifrenizi mi unuttunuz? »";
-
 /* Password Reset Action */
 "Forgot your password?" = "Şifrenizi mi unuttunuz?";
 
@@ -581,9 +564,6 @@
 /* Message shown in note list when no notes are untagged */
 "No untagged notes" = "Etiketsiz not yok";
 
-/* Error when you enter a bad email address */
-"Not a valid email address" = "Geçerli bir e-posta adresi değil";
-
 /* Note Widget Title */
 "Note" = "Not";
 
@@ -639,23 +619,18 @@
 /* Pin Lock */
 "Passcodes did not match. Try again." = "Parolalar eşleşmiyor. Tekrar deneyin.";
 
-/* Hint displayed in the password field
-   Password TextField Placeholder */
+/* Password TextField Placeholder */
 "Password" = "Parola";
 
 /* Message displayed when password is invalid (Signup) */
 "Password cannot match email" = "Parola ile e-posta adresi aynı olamaz";
 
-/* Message displayed when password is too short. Please preserve the Percent D!
-   Message displayed when password is too short. The %%d is a placeholder for a numeral. Please preserve it! */
+/* Message displayed when password is too short. Please preserve the Percent D! */
 "Password must contain at least %d characters" = "Parola en az %d karakter içermelidir";
 
 /* Message displayed when a password contains a disallowed character */
 "Password must not contain tabs nor newlines" = "Parola sekme veya satır başı içermemelidir";
 
-/* Password Validation: Confirmation doesn't match */
-"Passwords do not match" = "Parolalar eşleşmiyor";
-
 /* Number of changes pending to be sent */
 "Pendings" = "Bekleyenler";
 
@@ -675,6 +650,9 @@
 /* Extension Missing Token Alert Title */
 "Please log into your Simplenote account first by using the Simplenote app." = "Lütfen önce Simplenote uygulamasını kullanarak Simplenote hesabınıza giriş yapın.";
 
+/* Encourages trying delete again */
+"Please try again" = "Lütfen tekrar deneyin";
+
 /* Upgrade Alert Message */
 "Please upgrade to the latest iOS release to restore purchases" = "Satın alınanları geri yüklemek için lütfen en son iOS sürümüne yükseltin";
 
@@ -817,21 +795,11 @@
 /* UI region to the left of the note list which shows all of a users tags */
 "Sidebar" = "Kenar çubuğu";
 
-/* Title of button for logging in (must be short) */
-"Sign In" = "Oturum Aç";
-
-/* SignUp Action
-   Signup Action
-   SignUp Interface Title
-   Title of button to create a new account (must be short) */
+/* Signup Action
+   SignUp Action
+   SignUp Interface Title */
 "Sign Up" = "Kaydol";
 
-/* A short link to access the account login screen */
-"Sign in" = "Oturum aç";
-
-/* A short link to access the account creation screen */
-"Sign up" = "Kaydol";
-
 /* Alert message displayed when an account has unsynced notes */
 "Signing out will delete any unsynced notes. You can verify your synced notes by signing in to the Web App." = "Oturumu kapattığınızda, senkronize edilmemiş tüm notlar silinir. Senkronize edilmiş notlarınızı Web Uygulamasında oturum açarak doğrulayabilirsiniz.";
 
@@ -907,9 +875,6 @@
 /* Current Sustainer Details */
 "Thank you for your continued support" = "Devam eden desteğiniz için teşekkür ederiz";
 
-/* Error when address is in use */
-"That email is already being used" = "Bu e-posta zaten kullanılıyor";
-
 /* Email TextField Placeholder */
 "The authentication code you've requested has expired. Please request a new one" = "Talep ettiğiniz doğrulama kodunun geçerlilik süresi doldu. Lütfen yeni bir kod talep edin";
 
@@ -977,9 +942,6 @@
 /* Undo action */
 "Undo" = "Geri al";
 
-/* WebSocket not initialized */
-"Uninitialized" = "Başlatılmamış";
-
 /* Default title for an unnamed tag */
 "Unnamed Tag" = "Adsız Etiket";
 
diff --git a/Simplenote/zh-Hans-CN.lproj/Localizable.strings b/Simplenote/zh-Hans-CN.lproj/Localizable.strings
index ec5a87734..02d3d46b8 100644
--- a/Simplenote/zh-Hans-CN.lproj/Localizable.strings
+++ b/Simplenote/zh-Hans-CN.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-08-06 11:54:03+0000 */
+/* Translation-Revision-Date: 2024-09-11 19:54:04+0000 */
 /* Plural-Forms: nplurals=1; plural=0; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: zh_CN */
@@ -94,9 +94,6 @@
    Title: No filters applied */
 "All Notes" = "全部笔记";
 
-/* A short description to access the account login screen */
-"Already have an account?" = "已有帐户？";
-
 /* Delete account confirmation instructions */
 "An email has been sent to %@. Check your inbox and follow the instructions to confirm account deletion.\n\nYour account won't be deleted until we receive your confirmation." = "我们已向 %@ 发送一封电子邮件。请检查您的收件箱，按照电子邮件中的说明来确认账户删除。\n\n在收到您的确认之前，我们不会删除您的账户。";
 
@@ -145,14 +142,10 @@
 /* Delete account confirmation alert message */
 "By deleting the account for %@, all notes created with this account will be permanently deleted. This action is not reversible" = "删除 %@ 的账户后，使用此账户创建的所有笔记将永久删除。 此操作不可撤消";
 
-/* Terms Button Text */
-"By signing up, you agree to our Terms of Service »" = "注册即表示您同意我们的服务条款 »";
-
 /* Cancel Action
    Cancel action button
    Cancel action for password alert
    Cancel action on share extension.
-   Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
    Dismissing an interface
@@ -208,8 +201,7 @@
 /* Option to make the note list show only 1 line of text. The default is 3. */
 "Condensed Note List" = "压缩的笔记列表";
 
-/* Confirm button -> Review you account screen
-   Hint displayed in the password confirmation field */
+/* Confirm button -> Review you account screen */
 "Confirm" = "确认";
 
 /* Title on the PinLock screen asking to confirm a passcode */
@@ -234,6 +226,9 @@
 /* Error for bad email or password */
 "Could not create an account with the provided email address and password." = "无法使用所提供的电子邮件地址和密码创建帐户。";
 
+/* Notifies user tag delete failed */
+"Could not delete tag" = "无法删除标签";
+
 /* Note fetch error title */
 "Could not fetch Notes" = "无法获取注释";
 
@@ -338,9 +333,6 @@
 /* Card title showing information about the note (metrics, references) */
 "Document" = "文档";
 
-/* A short description to access the account creation screen */
-"Don't have an account?" = "还没有帐户？";
-
 /* Dismisses the Note Information UI
    Dismisses the Note Options UI
    Done editing tags
@@ -388,12 +380,6 @@
    Error Title */
 "Error" = "错误";
 
-/* No comment provided by engineer. */
-"Error: NSManagedObjectContext's persistentStoreCoordinator must be nil. Simperium will handle CoreData connections for you." = "错误：NSManagedObjectContext 的 persistentStoreCoordinator 必须为 nil。 Simperium 将为您处理 CoreData 连接。";
-
-/* No comment provided by engineer. */
-"Error: you must initialize your context with 'NSMainQueueConcurrencyType' concurrency type." = "错误：您必须使用“NSMainQueueConcurrencyType”并发类型初始化您的上下文。";
-
 /* Get Help Description Label */
 "FAQ or contact us" = "常见问题解答或与我们联系";
 
@@ -403,9 +389,6 @@
 /* Accessibility hint used when previous versions of a note are being fetched */
 "Fetching Version" = "正在提取版本";
 
-/* Forgot password Button Text */
-"Forgot password? »" = "忘记密码？»";
-
 /* Password Reset Action */
 "Forgot your password?" = "忘记密码？";
 
@@ -581,9 +564,6 @@
 /* Message shown in note list when no notes are untagged */
 "No untagged notes" = "没有未标记的笔记";
 
-/* Error when you enter a bad email address */
-"Not a valid email address" = "电子邮件地址无效";
-
 /* Note Widget Title */
 "Note" = "注意";
 
@@ -639,23 +619,18 @@
 /* Pin Lock */
 "Passcodes did not match. Try again." = "密码不匹配。重试。";
 
-/* Hint displayed in the password field
-   Password TextField Placeholder */
+/* Password TextField Placeholder */
 "Password" = "密码";
 
 /* Message displayed when password is invalid (Signup) */
 "Password cannot match email" = "密码不能与电子邮件相同";
 
-/* Message displayed when password is too short. Please preserve the Percent D!
-   Message displayed when password is too short. The %%d is a placeholder for a numeral. Please preserve it! */
+/* Message displayed when password is too short. Please preserve the Percent D! */
 "Password must contain at least %d characters" = "密码中必须至少包含 %d个字符";
 
 /* Message displayed when a password contains a disallowed character */
 "Password must not contain tabs nor newlines" = "密码不得包含制表符或换行符";
 
-/* Password Validation: Confirmation doesn't match */
-"Passwords do not match" = "密码不匹配";
-
 /* Number of changes pending to be sent */
 "Pendings" = "待处理数";
 
@@ -675,6 +650,9 @@
 /* Extension Missing Token Alert Title */
 "Please log into your Simplenote account first by using the Simplenote app." = "请先使用 Simplenote 应用程序登录您的 Simplenote 账户。";
 
+/* Encourages trying delete again */
+"Please try again" = "请重试";
+
 /* Upgrade Alert Message */
 "Please upgrade to the latest iOS release to restore purchases" = "请升级至最新 iOS 版本以恢复购买";
 
@@ -817,21 +795,11 @@
 /* UI region to the left of the note list which shows all of a users tags */
 "Sidebar" = "侧边栏";
 
-/* Title of button for logging in (must be short) */
-"Sign In" = "登录";
-
-/* SignUp Action
-   Signup Action
-   SignUp Interface Title
-   Title of button to create a new account (must be short) */
+/* Signup Action
+   SignUp Action
+   SignUp Interface Title */
 "Sign Up" = "注册";
 
-/* A short link to access the account login screen */
-"Sign in" = "登录";
-
-/* A short link to access the account creation screen */
-"Sign up" = "注册";
-
 /* Alert message displayed when an account has unsynced notes */
 "Signing out will delete any unsynced notes. You can verify your synced notes by signing in to the Web App." = "注销会删除所有未同步的备注。您可以通过登录 Web 应用程序以确认您已同步的备注。";
 
@@ -907,9 +875,6 @@
 /* Current Sustainer Details */
 "Thank you for your continued support" = "感谢您的继续支持";
 
-/* Error when address is in use */
-"That email is already being used" = "该电子邮件已被使用";
-
 /* Email TextField Placeholder */
 "The authentication code you've requested has expired. Please request a new one" = "您请求的验证码已过期。 请重新请求";
 
@@ -977,9 +942,6 @@
 /* Undo action */
 "Undo" = "撤消";
 
-/* WebSocket not initialized */
-"Uninitialized" = "未初始化";
-
 /* Default title for an unnamed tag */
 "Unnamed Tag" = "未命名标签";
 
diff --git a/Simplenote/zh-Hant-TW.lproj/Localizable.strings b/Simplenote/zh-Hant-TW.lproj/Localizable.strings
index 6ba9fe93c..b7419190a 100644
--- a/Simplenote/zh-Hant-TW.lproj/Localizable.strings
+++ b/Simplenote/zh-Hant-TW.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-08-07 09:54:02+0000 */
+/* Translation-Revision-Date: 2024-09-12 09:54:03+0000 */
 /* Plural-Forms: nplurals=1; plural=0; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: zh_TW */
@@ -94,9 +94,6 @@
    Title: No filters applied */
 "All Notes" = "所有筆記";
 
-/* A short description to access the account login screen */
-"Already have an account?" = "已經有帳號了？";
-
 /* Delete account confirmation instructions */
 "An email has been sent to %@. Check your inbox and follow the instructions to confirm account deletion.\n\nYour account won't be deleted until we receive your confirmation." = "電子郵件已傳送至 %@。請檢查你的收件匣，並按照說明確認刪除帳號。\n\n在收到你的確認之前，我們不會刪除你的帳號";
 
@@ -145,14 +142,10 @@
 /* Delete account confirmation alert message */
 "By deleting the account for %@, all notes created with this account will be permanently deleted. This action is not reversible" = "若刪除 %@ 的帳號，此帳號建立的所有筆記將永久刪除。 此動作無法復原";
 
-/* Terms Button Text */
-"By signing up, you agree to our Terms of Service »" = "註冊即代表你同意我們的「服務條款」»";
-
 /* Cancel Action
    Cancel action button
    Cancel action for password alert
    Cancel action on share extension.
-   Cancel button for authentication
    Cancel button title
    Cancellation button of deletion confirmation message for a tag.
    Dismissing an interface
@@ -208,8 +201,7 @@
 /* Option to make the note list show only 1 line of text. The default is 3. */
 "Condensed Note List" = "精簡版筆記清單";
 
-/* Confirm button -> Review you account screen
-   Hint displayed in the password confirmation field */
+/* Confirm button -> Review you account screen */
 "Confirm" = "確認";
 
 /* Title on the PinLock screen asking to confirm a passcode */
@@ -234,6 +226,9 @@
 /* Error for bad email or password */
 "Could not create an account with the provided email address and password." = "無法使用提供的電子郵件地址和密碼建立帳號。";
 
+/* Notifies user tag delete failed */
+"Could not delete tag" = "無法刪除標籤";
+
 /* Note fetch error title */
 "Could not fetch Notes" = "無法擷取備註";
 
@@ -338,9 +333,6 @@
 /* Card title showing information about the note (metrics, references) */
 "Document" = "內容";
 
-/* A short description to access the account creation screen */
-"Don't have an account?" = "還沒有帳號？";
-
 /* Dismisses the Note Information UI
    Dismisses the Note Options UI
    Done editing tags
@@ -388,12 +380,6 @@
    Error Title */
 "Error" = "錯誤";
 
-/* No comment provided by engineer. */
-"Error: NSManagedObjectContext's persistentStoreCoordinator must be nil. Simperium will handle CoreData connections for you." = "錯誤：NSManagedObjectContext 的 persistentStoreCoordinator 必須為 nil。 Simperium 將為你處理 CoreData 連結。";
-
-/* No comment provided by engineer. */
-"Error: you must initialize your context with 'NSMainQueueConcurrencyType' concurrency type." = "錯誤：你必須使用「NSMainQueueConcurrencyType」並行類型來初始化內容。";
-
 /* Get Help Description Label */
 "FAQ or contact us" = "常見問題集或與我們聯絡";
 
@@ -403,9 +389,6 @@
 /* Accessibility hint used when previous versions of a note are being fetched */
 "Fetching Version" = "正在擷取版本";
 
-/* Forgot password Button Text */
-"Forgot password? »" = "忘記密碼？»";
-
 /* Password Reset Action */
 "Forgot your password?" = "忘記密碼？";
 
@@ -581,9 +564,6 @@
 /* Message shown in note list when no notes are untagged */
 "No untagged notes" = "沒有未標籤筆記";
 
-/* Error when you enter a bad email address */
-"Not a valid email address" = "電子郵件地址格式不正確";
-
 /* Note Widget Title */
 "Note" = "備註";
 
@@ -639,23 +619,18 @@
 /* Pin Lock */
 "Passcodes did not match. Try again." = "密碼不相符。請再試一次。";
 
-/* Hint displayed in the password field
-   Password TextField Placeholder */
+/* Password TextField Placeholder */
 "Password" = "密碼";
 
 /* Message displayed when password is invalid (Signup) */
 "Password cannot match email" = "密碼不能和電子郵件地址相同";
 
-/* Message displayed when password is too short. Please preserve the Percent D!
-   Message displayed when password is too short. The %%d is a placeholder for a numeral. Please preserve it! */
+/* Message displayed when password is too short. Please preserve the Percent D! */
 "Password must contain at least %d characters" = "密碼必須包含至少 %d 個字元";
 
 /* Message displayed when a password contains a disallowed character */
 "Password must not contain tabs nor newlines" = "密碼不得包含定位字元或換行";
 
-/* Password Validation: Confirmation doesn't match */
-"Passwords do not match" = "密碼不符";
-
 /* Number of changes pending to be sent */
 "Pendings" = "待確認";
 
@@ -675,6 +650,9 @@
 /* Extension Missing Token Alert Title */
 "Please log into your Simplenote account first by using the Simplenote app." = "請先使用 Simplenote 應用程式登入 Simplenote 帳號。";
 
+/* Encourages trying delete again */
+"Please try again" = "請再試一次";
+
 /* Upgrade Alert Message */
 "Please upgrade to the latest iOS release to restore purchases" = "請升級至最新 iOS 版本以恢復購買";
 
@@ -817,21 +795,11 @@
 /* UI region to the left of the note list which shows all of a users tags */
 "Sidebar" = "側選單";
 
-/* Title of button for logging in (must be short) */
-"Sign In" = "登入";
-
-/* SignUp Action
-   Signup Action
-   SignUp Interface Title
-   Title of button to create a new account (must be short) */
+/* Signup Action
+   SignUp Action
+   SignUp Interface Title */
 "Sign Up" = "註冊";
 
-/* A short link to access the account login screen */
-"Sign in" = "登入";
-
-/* A short link to access the account creation screen */
-"Sign up" = "註冊";
-
 /* Alert message displayed when an account has unsynced notes */
 "Signing out will delete any unsynced notes. You can verify your synced notes by signing in to the Web App." = "登出將會刪除任何尚未同步的備註。登入網頁應用程式即可驗證已同步的備註。";
 
@@ -907,9 +875,6 @@
 /* Current Sustainer Details */
 "Thank you for your continued support" = "感謝你持續支持";
 
-/* Error when address is in use */
-"That email is already being used" = "此電子信箱已被使用";
-
 /* Email TextField Placeholder */
 "The authentication code you've requested has expired. Please request a new one" = "你要求的驗證碼已過期。 請申請新的驗證碼";
 
@@ -977,9 +942,6 @@
 /* Undo action */
 "Undo" = "復原";
 
-/* WebSocket not initialized */
-"Uninitialized" = "未初始化";
-
 /* Default title for an unnamed tag */
 "Unnamed Tag" = "未命名標籤";
 

From 637fdf11dade6f76e1a8355d30fd00c57264dafc Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Fri, 13 Sep 2024 14:43:52 +1000
Subject: [PATCH 502/547] Update App Store metadata translations

---
 fastlane/metadata/ar-SA/description.txt     | 37 ---------------------
 fastlane/metadata/ar-SA/keywords.txt        |  2 +-
 fastlane/metadata/ar-SA/release_notes.txt   |  1 +
 fastlane/metadata/de-DE/description.txt     | 37 ---------------------
 fastlane/metadata/de-DE/release_notes.txt   |  1 +
 fastlane/metadata/es-ES/description.txt     | 37 ---------------------
 fastlane/metadata/es-ES/release_notes.txt   |  1 +
 fastlane/metadata/fr-FR/description.txt     | 37 ---------------------
 fastlane/metadata/fr-FR/release_notes.txt   |  1 +
 fastlane/metadata/he/description.txt        | 37 ---------------------
 fastlane/metadata/he/release_notes.txt      |  1 +
 fastlane/metadata/id/description.txt        | 37 ---------------------
 fastlane/metadata/id/release_notes.txt      |  1 +
 fastlane/metadata/it/description.txt        | 37 ---------------------
 fastlane/metadata/it/release_notes.txt      |  1 +
 fastlane/metadata/ja/description.txt        | 37 ---------------------
 fastlane/metadata/ja/release_notes.txt      |  1 +
 fastlane/metadata/ko/description.txt        | 37 ---------------------
 fastlane/metadata/ko/release_notes.txt      |  1 +
 fastlane/metadata/nl-NL/description.txt     | 37 ---------------------
 fastlane/metadata/pt-BR/description.txt     | 37 ---------------------
 fastlane/metadata/pt-BR/release_notes.txt   |  1 +
 fastlane/metadata/ru/description.txt        | 37 ---------------------
 fastlane/metadata/ru/release_notes.txt      |  1 +
 fastlane/metadata/sv/description.txt        | 37 ---------------------
 fastlane/metadata/sv/release_notes.txt      |  1 +
 fastlane/metadata/tr/description.txt        | 37 ---------------------
 fastlane/metadata/tr/release_notes.txt      |  1 +
 fastlane/metadata/zh-Hans/description.txt   | 37 ---------------------
 fastlane/metadata/zh-Hans/release_notes.txt |  1 +
 fastlane/metadata/zh-Hant/description.txt   | 37 ---------------------
 fastlane/metadata/zh-Hant/release_notes.txt |  1 +
 32 files changed, 16 insertions(+), 593 deletions(-)
 delete mode 100644 fastlane/metadata/ar-SA/description.txt
 create mode 100644 fastlane/metadata/ar-SA/release_notes.txt
 delete mode 100644 fastlane/metadata/de-DE/description.txt
 create mode 100644 fastlane/metadata/de-DE/release_notes.txt
 delete mode 100644 fastlane/metadata/es-ES/description.txt
 create mode 100644 fastlane/metadata/es-ES/release_notes.txt
 delete mode 100644 fastlane/metadata/fr-FR/description.txt
 create mode 100644 fastlane/metadata/fr-FR/release_notes.txt
 delete mode 100644 fastlane/metadata/he/description.txt
 create mode 100644 fastlane/metadata/he/release_notes.txt
 delete mode 100644 fastlane/metadata/id/description.txt
 create mode 100644 fastlane/metadata/id/release_notes.txt
 delete mode 100644 fastlane/metadata/it/description.txt
 create mode 100644 fastlane/metadata/it/release_notes.txt
 delete mode 100644 fastlane/metadata/ja/description.txt
 create mode 100644 fastlane/metadata/ja/release_notes.txt
 delete mode 100644 fastlane/metadata/ko/description.txt
 create mode 100644 fastlane/metadata/ko/release_notes.txt
 delete mode 100644 fastlane/metadata/nl-NL/description.txt
 delete mode 100644 fastlane/metadata/pt-BR/description.txt
 create mode 100644 fastlane/metadata/pt-BR/release_notes.txt
 delete mode 100644 fastlane/metadata/ru/description.txt
 create mode 100644 fastlane/metadata/ru/release_notes.txt
 delete mode 100644 fastlane/metadata/sv/description.txt
 create mode 100644 fastlane/metadata/sv/release_notes.txt
 delete mode 100644 fastlane/metadata/tr/description.txt
 create mode 100644 fastlane/metadata/tr/release_notes.txt
 delete mode 100644 fastlane/metadata/zh-Hans/description.txt
 create mode 100644 fastlane/metadata/zh-Hans/release_notes.txt
 delete mode 100644 fastlane/metadata/zh-Hant/description.txt
 create mode 100644 fastlane/metadata/zh-Hant/release_notes.txt

diff --git a/fastlane/metadata/ar-SA/description.txt b/fastlane/metadata/ar-SA/description.txt
deleted file mode 100644
index dc6b27caa..000000000
--- a/fastlane/metadata/ar-SA/description.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-إنَّ برنامج Simplenote من ضمن الطرق السهلة لتدوين الملحوظات، وإنشاء قوائم المهام، وتسجيل الأفكار، والمزيد. افتح البرنامج، ثم دوِّن بعض الأفكار، وهذا كل شيء. عندما تصبح مجموعتك كبيرة، حافظ على تنظيمها باستخدام الوسوم والدبابيس، واعثر على ما تحتاج إليه باستخدام البحث الفوري. نظرًا إلى أنَّ برنامج Simplenote سيقوم بالمزامنة عبر أجهزتك مجانًا، فإنَّ ملحوظاتك ستظل معك في جميع الأوقات.
-
-- استمتع بتجربة تدوين ملحوظات بسيطة
-- قم بمزامنة كل شيء عبر جميع أجهزتك
-- تعاون وشارك
-- ابقَ منظمًا باستخدام الوسوم
-- قم بتسجيل الدخول باستخدام بريدك الإلكتروني أو حسابك على ووردبريس.كوم
-
-وقم بالمزامنة بثقة
-- يمكنك المزامنة تلقائيًا بسلاسة عبر أي حاسوب أو هاتف أو جهاز لوحي.
-- انسخ كل شيء احتياطيًا وقم بمزامنته أثناء تدوين الملحوظات، لكيلا تفقد محتواك أبدًا.
-
-التعاون والمشاركة
-- يمكنك التعاون والعمل مع آخرين، أو مشاركة الأفكار مع زميلك، أو كتابة قائمة البقالة مع رفيقك في السكن.
-- اختر ما إذا كنتَ تريد نشر محتواك على الويب ومشاركة رابط مع مَن تريد، أم لا.
-- انشر مباشرةً على موقع ووردبريس عن طريق ربط حسابك على ووردبريس.كوم.
-- شارك بسرعة وبسهولة باستخدام تطبيقات الجهات الخارجية.
-
-التنظيم والبحث
-- حافظ على تنظيم مجموعتك باستخدام الوسوم، واستخدمها للبحث والفرز السريعين.
-- اعثر فورًا على ما تبحث عنه من خلال تمييز الكلمات الرئيسية.
-- استخدم الضبط لإضافة التنسيقات.
-- أنشئ قوائم المهام.
-- اختر ترتيب فرز ملحوظاتك ووسومك.
-- ثبِّت الملحوظات التي تستخدمها أكثر من غيرها.
-- حرِّر الوسوم مباشرةً عن طريق تسميتها وترتيبها مجددًا.
-- احمِ محتواك بقفل رمز المرور.
-
---
-
-سياسة الخصوصية: https://automattic.com/privacy/
-شروط الخدمة: https://simplenote.com/terms/
-إشعار الخصوصية الخاص بالمستخدمين في كاليفورنيا: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
-
---
-
-تفضَّل بزيارة simplenote.com لتنزيل Simplenote لأجهزتك الأخرى.
diff --git a/fastlane/metadata/ar-SA/keywords.txt b/fastlane/metadata/ar-SA/keywords.txt
index 66c12533b..be7cee772 100644
--- a/fastlane/metadata/ar-SA/keywords.txt
+++ b/fastlane/metadata/ar-SA/keywords.txt
@@ -1 +1 @@
-ملحوظات,ملحوظة,مهام مصغرة,صحيفة,مذكرات,مزامنة,قائمة مهام,مفكرة,بسيط,مفكرة,وسم قائمة مهام,كتابة
\ No newline at end of file
+ملحوظات,ملحوظة,مهام مصغرة,صحيفة,مذكرات,مزامنة,قائمة مهام,مفكرة,بسيط,مفكرة,وسم قائمة مهام,كتابة,مذكرة
diff --git a/fastlane/metadata/ar-SA/release_notes.txt b/fastlane/metadata/ar-SA/release_notes.txt
new file mode 100644
index 000000000..1d9d28bf1
--- /dev/null
+++ b/fastlane/metadata/ar-SA/release_notes.txt
@@ -0,0 +1 @@
+التحسينات جارية.
diff --git a/fastlane/metadata/de-DE/description.txt b/fastlane/metadata/de-DE/description.txt
deleted file mode 100644
index d199909b0..000000000
--- a/fastlane/metadata/de-DE/description.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-Mit Simplenote kannst du ganz einfach Notizen,Aufgabenlisten, Ideen und mehr festhalten. Einfach aufrufen, Gedanken notieren – fertig. Mit Schlagwörtern und Pins behältst du den Überblick über deine wachsende Sammlung und mit der Sofortsuche findest du das, was du brauchst. Da Simplenote kostenlos mit deinen Geräten synchronisiert wird, hast du deine Notizen jederzeit zur Hand.
-
-- Eine einfache Möglichkeit, Notizen zu erstellen
-- Alle Inhalte über alle deine Geräte hinweg synchronisieren
-- Zusammenarbeiten und Teilen
-- Mit Schlagwörtern den Überblick behalten 
-- Mit E-Mail-Adresse oder WordPress.com-Konto anmelden
-
-ZUVERLÄSSIGES SYNCHRONISIEREN
-- Inhalte automatisch und problemlos mit jedem Computer, Smartphone oder Tablet synchronisieren
-- Alle Notizen sichern und synchronisieren, damit keine Inhalte verloren gehen
-
-ZUSAMMENARBEITEN UND TEILEN
-- Zusammenarbeiten und abstimmen: Teile Ideen mit einem Kollegen oder schreibe mit dem Mitbewohner eine Einkaufsliste.
-- Auswählen, ob Inhalte im Web veröffentlicht werden sollen, und einen Link mit den gewünschten Personen teilen
-- WordPress.com-Konto verbinden und Notizen direkt auf einer WordPress-Website veröffentlichen
-- Notizen schnell und einfach mit Drittanbieter-Apps teilen
-
-ORGANISEREN UND SUCHEN
-- Behalte mit Schlagwörtern den Überblick und suche und sortiere damit Inhalte.
-- Mit hervorgehobenen Stichwörtern sofort das finden, wonach du suchst
-- Mit Markdown Formatierungen hinzufügen
-- Aufgabenlisten erstellen
-- Die Sortierreihenfolge deiner Notizen und Schlagwörter auswählen
-- Die am häufigsten verwendeten Notizen anheften
-- Schlagwörter direkt bearbeiten, indem du sie umbenennst oder neu anordnest
-- Inhalte mit Zugangscode-Sperre schützen
-
---
-
-Datenschutzerklärung: https://automattic.com/privacy/
-Geschäftsbedingungen: https://simplenote.com/terms/
-Datenschutzhinweis für Benutzer in Kalifornien: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
-
---
-
-Gehe zu simplenote.com und lade Simplenote für deine anderen Geräte herunter.
diff --git a/fastlane/metadata/de-DE/release_notes.txt b/fastlane/metadata/de-DE/release_notes.txt
new file mode 100644
index 000000000..e0a07e7a4
--- /dev/null
+++ b/fastlane/metadata/de-DE/release_notes.txt
@@ -0,0 +1 @@
+Verbesserungen hinter den Kulissen.
diff --git a/fastlane/metadata/es-ES/description.txt b/fastlane/metadata/es-ES/description.txt
deleted file mode 100644
index df6438d0b..000000000
--- a/fastlane/metadata/es-ES/description.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-Simplenote es una forma fácil de tomar notas, crear listas de tareas, capturar ideas y mucho más. Abre la aplicación, escribe algunas líneas y listo. A medida que tu colección crezca, mantén el orden con etiquetas y chinchetas, y encuentra lo que necesites con la búsqueda instantánea. Como Simplenote se sincronizará gratuitamente con tus dispositivos, tus notas estarán contigo en todo momento.
-
-- Una experiencia sencilla para tomar notas
-- Sincroniza todos tus dispositivos
-- Colabora y comparte 
-- Organízate con las etiquetas
-- Inicia sesión con tu correo electrónico o cuenta WordPress.com
-
-SINCRONIZA CON CONFIANZA
-- Sincroniza fácilmente cualquier ordenador, teléfono móvil o tableta.
-- Haz una copia de seguridad y sincronízalo todo mientras tomas notas, para que nunca pierdas tu contenido.
-
-COLABORA Y COMPARTE
-- Colabora y trabaja en equipo: comparte ideas con un compañero de trabajo o escribe la lista de la compra con tu compañero de piso.
-- Decide si quieres publicar tu contenido en la Web y comparte un enlace con quien tú quieras.
-- Publica contenido directamente en un sitio de WordPress conectando tu cuenta de WordPress.com.
-- Comparte contenido rápida y fácilmente con aplicaciones de terceros.
-
-ORGANIZA Y BUSCA
-- Mantén el orden aplicando etiquetas y úsalas para buscar y clasificar información rápidamente.
-- Encuentra de inmediato lo que buscas con el resaltado de palabras clave.
-- Utiliza el marcado para añadir formato.
-- Crea listas de tareas pendientes.
-- Elige el orden de clasificación de tus notas y etiquetas.
-- Fija las notas que más usas.
-- Edita las etiquetas directamente renombrándolas y reordenándolas.
-- Protege tu contenido con una contraseña.
-
---
-
-Política de privacidad: https://automattic.com/privacy/
-Condiciones del servicio: https://simplenote.com/terms/
-Aviso de privacidad para usuarios de California: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
-
---
-
-Visita simplenote.com para descargar Simplenote en otros dispositivos.
diff --git a/fastlane/metadata/es-ES/release_notes.txt b/fastlane/metadata/es-ES/release_notes.txt
new file mode 100644
index 000000000..34ac38a9d
--- /dev/null
+++ b/fastlane/metadata/es-ES/release_notes.txt
@@ -0,0 +1 @@
+Mejoras en los detalles técnicos.
diff --git a/fastlane/metadata/fr-FR/description.txt b/fastlane/metadata/fr-FR/description.txt
deleted file mode 100644
index 86d417d77..000000000
--- a/fastlane/metadata/fr-FR/description.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-Simplenote est un outil facile pour prendre des notes, créer des listes de choses à faire, capturer des idées, etc. Il vous suffit de l’ouvrir, d’entrer vos réflexions, et le tour est joué. Au fur et à mesure que votre ensemble de notes augmente, vous pouvez les organiser à l’aide d’étiquettes et d’épingles, et trouver ce dont vous avez besoin par le biais de recherches instantanées. Simplenote assurant gratuitement la synchronisation sur tous vos appareils, vous disposez de vos notes à tout moment.
-
-- Une expérience de prise de note simple
-- Une synchronisation complète sur tous vos appareils
-- Collaboration et partage
-- Organisation à l’aide d’étiquettes
-- Connexion par adresse e-mail ou compte WordPress.com
-
-SYNCHRONISATION EN TOUTE CONFIANCE
-- Synchronisation automatique transparente sur n’importe quel ordinateur, téléphone ou tablette.
-- Sauvegardez et synchronisez tout lors de votre prise de notes, afin de ne perdre aucun contenu.
-
-COLLABORATION ET PARTAGE
-- Collaborez, que ce soit pour partager vos idées avec un collègue ou rédiger la liste des courses avec votre colocataire.
-- Décidez si vous souhaitez publier votre contenu sur le Web et partagez un lien avec les personnes de votre choix.
-- Publiez votre contenu directement sur un site WordPress en vous connectant à votre compte WordPress.com.
-- Partagez facilement et rapidement avec des applications tierces.
-
-ORGANISATION ET RECHERCHE
-- Organisez-vous à l’aide d’étiquettes et utilisez-les pour trier et rechercher rapidement ce dont vous avez besoin.
-- Trouvez instantanément ce que vous recherchez grâce à la mise en surbrillance de mots clés.
-- Utilisez Markdown pour ajouter une mise en forme.
-- Créez des listes de choses à faire.
-- Choisissez l’ordre de tri de vos notes et étiquettes.
-- Épinglez les notes que vous utilisez le plus.
-- Modifiez directement les étiquettes en les renommant et les réorganisant.
-- Protégez votre contenu à l’aide d’un verrou avec code d’authentification.
-
---
-
-Politique de confidentialité : https://automattic.com/privacy/
-Conditions d’utilisation : https://simplenote.com/terms/
-Avis de confidentialité pour les utilisateurs californiens : https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
-
---
-
-Visitez simplenote.com afin de télécharger Simplenote pour vos autres appareils.
diff --git a/fastlane/metadata/fr-FR/release_notes.txt b/fastlane/metadata/fr-FR/release_notes.txt
new file mode 100644
index 000000000..e1bd9610e
--- /dev/null
+++ b/fastlane/metadata/fr-FR/release_notes.txt
@@ -0,0 +1 @@
+Des améliorations sous le capot.
diff --git a/fastlane/metadata/he/description.txt b/fastlane/metadata/he/description.txt
deleted file mode 100644
index f0df9e38d..000000000
--- a/fastlane/metadata/he/description.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-האפליקציה Simplenote היא דרך קלה לרשום פתקים, ליצור רשימת משימות, לתעד רעיונות ועוד. פותחים את האפליקציה, רושמים כמה מחשבות, וזה הכול. כשיש לך הרבה פריטים באוסף, אפשר לשמור על הסדר באמצעות תגיות ונעצים ולמצוא את מה שנדרש לך בחיפוש מיידי. מאחר ש-Simplenote תסתנכרן בין כל המכשירים שלך, הפתקים שלך תמיד יהיו זמינים לשימושך בכל עת.
-
-- חוויית שימוש פשוטה ברישום פתקים
-- לסנכרן את כל התוכן בין כל המכשירים שלך
-- לעבוד יחד ולשתף פתקים
-- לשמור על סדר בעזרת תגיות
-- להתחבר לאימייל או לחשבון שלך ב-WordPress.com
-
-לסנכרן ללא חשש
-- לסנכרן באופן יעיל ואוטומטי את התוכן בין המחשב, הטלפון והטאבלט.
-- ניתן לגבות ולסנכרן את כל התוכן במהלך הכתיבה של הפתקים ולא לאבד תוכן לעולם.
-
-לעבוד יחד ולשתף פתקים
-- לשתף פעולה ולעבוד יחד – לחלוק רעיונות עם עמיתים או לכתוב רשימת קניות עם השותפים לדירה.
-- ניתן לבחור אם ברצונך לפרסם את התוכן שיצרת ברשת או לשתף קישור עם אנשים מסוימים לבחירתך.
-- ניתן לפרסם את התוכן ישירות לאתר שלך ב-WordPress.com באמצעות התחברות לחשבון שלך ב-WordPress.com.
-- אפשר לשתף את התוכן במהירות ובקלות באפליקציות של צד שלישי.
-
-לארגן ולחפש
-- אפשר להקפיד על ארגון בעזרת תגיות ולהשתמש בהן כדי לחפש פתקים ולמיין אותם מהר.
-- ניתן למצוא כל מה שברצונך לחפש באופן מיידי בעזרת הדגשה של מילות מפתח.
-- ניתן להשתמש ב-Markdown כדי להוסיף עיצוב.
-- ליצור רשימת משימות.
-- לבחור את סדר התצוגה של הפתקים והתגיות שלך.
-- לנעוץ את הפתקים שנמצאים בשימוש נפוץ.
-- לערוך תגיות באמצעות שינוי השם או הסדר.
-- להגן על התוכן שלך באמצעות קוד גישה.
-
---
-
-מדיניות פרטיות: https://automattic.com/privacy/
-תנאי שימוש: https://simplenote.com/terms/
-הודעת פרטיות למשתמשים בקליפורניה: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
-
---
-
-יש לעבור לאתר simplenote.com ולהוריד את Simplenote למכשירים הנוספים שלך.
diff --git a/fastlane/metadata/he/release_notes.txt b/fastlane/metadata/he/release_notes.txt
new file mode 100644
index 000000000..d903505ba
--- /dev/null
+++ b/fastlane/metadata/he/release_notes.txt
@@ -0,0 +1 @@
+שיפורים מאחורי הקלעים.
diff --git a/fastlane/metadata/id/description.txt b/fastlane/metadata/id/description.txt
deleted file mode 100644
index 4d51008f2..000000000
--- a/fastlane/metadata/id/description.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-Simplenote adalah cara yang mudah untuk menulis catatan, membuat daftar hal yang harus dilakukan, mengembangkan ide, dan banyak lagi. Buka, catat beberapa ide, dan selesai. Seiring dengan berkembangnya koleksi Anda, tetap rapi dengan tag dan fitur sematkan, serta temukan hal yang Anda butuhkan dengan pencarian instan. Karena Simplenote akan tersinkron dengan seluruh perangkat secara gratis, catatan akan terus bersama Anda kapan saja.
-
-- Pengalaman mencatat yang sederhana
-- Menyinkronkan semua catatan di berbagai perangkat Anda
-- Berkolaborasi dan berbagi
-- Tetap rapi dengan tag
-- Masuk dengan email atau akun WordPress.com Anda
-
-SINKRONISASI ANDAL
-- Menyinkronkan dengan lancar di semua jenis komputer, ponsel atau tablet secara otomatis.
-- Cadangkan dan sinkronkan segala hal selagi Anda mencatat, sehingga Anda tidak akan kehilangan isi catatan.
-
-KOLABORASI DAN BERBAGI
-- Lakukan kolaborasi dan bekerja bersama -- bagikan ide dengan rekan kerja, atau tulis daftar belanja bersama teman sekamar.
-- Pilih untuk memublikasikan konten Anda ke web, dan bagikan tautan ke siapa pun yang Anda mau.
-- Publikasikan secara langsung ke situs WordPress dengan menyambungkan akun WordPress.com Anda.
-- Bagikan dengan aplikasi pihak ketiga secara mudah dan cepat.
-
-ATUR DAN CARI
-- Tetap rapi dengan tag; gunakan untuk pencarian dan penyortiran cepat.
-- Temukan apa yang Anda cari secara instan dengan penyorotan kata kunci.
-- Gunakan markdown untuk menambahkan pemformatan.
-- Buat daftar hal yang harus dilakukan.
-- Pilih urutan penyortiran catatan dan tag.
-- Sematkan catatan yang paling sering Anda gunakan.
-- Sunting tag secara langsung dengan menamai dan mengurutkan ulang.
-- Lindungi konten Anda dengan kunci kode sandi.
-
---
-
-Kebijakan Privasi: https://automattic.com/privacy/
-Ketentuan Layanan: https://simplenote.com/terms/
-Pemberitahuan Privasi Pengguna California: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
-
---
-
-Kunjungi simplenote.com guna mengunduh Simplenote untuk perangkat Anda yang lain.
diff --git a/fastlane/metadata/id/release_notes.txt b/fastlane/metadata/id/release_notes.txt
new file mode 100644
index 000000000..df09b33e8
--- /dev/null
+++ b/fastlane/metadata/id/release_notes.txt
@@ -0,0 +1 @@
+Kami sedang melakukan penyempurnaan.
diff --git a/fastlane/metadata/it/description.txt b/fastlane/metadata/it/description.txt
deleted file mode 100644
index fdcb2d48f..000000000
--- a/fastlane/metadata/it/description.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-Con Simplenote puoi prendere appunti in modo semplice, creare elenchi di cose da fare, registrare le tue idee e molto altro. Aprilo, annota alcune idee e il gioco è fatto. Mentre la tua raccolta cresce, organizzala con tag e spilli e cerca quello di cui hai bisogno con la funzione di ricerca istantanea. I tuoi appunti saranno sempre con te poiché Simplenote si sincronizzerà gratuitamente su tutti i tuoi dispositivi.
-
-- Vivi un'esperienza semplice per prendere appunti
-- Sincronizza di ogni cosa su tutti i tuoi dispositivi
-- Collabora e condividi
-- Rimani organizzato con i tag
-- Accedi con la tua e-mail o con il tuo account WordPress.com
-
-ESEGUI LA SINCRONIZZAZIONE CON FIDUCIA
-- Esegui una perfetta sincronizzazione automatica tra qualsiasi computer, telefono o tablet.
-- Esegui backup e sincronizza tutto mentre prendi appunti in modo da non perdere i contenuti.
-
-COLLABORA E CONDIVI
-- Collabora e lavora allo stesso tempo: condivi idee con un collega o scrivi l'elenco della spesa con il tuo coinquilino.
-- Scegli se pubblicare i contenuti sul web e condividere un link con chiunque tu desideri.
-- Pubblica direttamente su un sito WordPress.com connettendo il tuo account WordPress.com.
-- Condividi in modo facile e veloce attraverso app di terze parti.
-
-ORGANIZZA E CERCA
-- Rimani organizzato con i tag e usali per effettuare la ricerca e ordinare rapidamente.
-- Trova subito quello che stai cercando con l'evidenziazione delle parole chiave.
-- Usa il markdown per aggiungere la formattazione.
-- Crea gli elenchi delle cose da fare.
-- Scegli l'ordine degli appunti e dei tag.
-- Metti uno spillo agli appunti che usi di più.
-- Modifica i tag in modo diretto rinominandoli e riordinandoli.
-- Proteggi i tuoi contenuti con un codice di blocco.
-
---
-
-Politica sulla privacy: https://automattic.com/privacy/
-Termini di servizio: https://simplenote.com/terms/
-Nota sulla privacy per utenti in California: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
-
---
-
-Visita simplenote.com per scaricare Simplenote per altri dispositivi.
diff --git a/fastlane/metadata/it/release_notes.txt b/fastlane/metadata/it/release_notes.txt
new file mode 100644
index 000000000..bc1b0b0d3
--- /dev/null
+++ b/fastlane/metadata/it/release_notes.txt
@@ -0,0 +1 @@
+Miglioramenti dietro le quinte.
diff --git a/fastlane/metadata/ja/description.txt b/fastlane/metadata/ja/description.txt
deleted file mode 100644
index 60fc83dbd..000000000
--- a/fastlane/metadata/ja/description.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-Simplenote では、メモ書き、ToDo リストの作成、アイデアのメモなどを簡単に行うことができます。 開いたら、あとは思い付いたことを書き込むだけ。 メモが増えても、タグやピンを使ってわかりやすくまとめることができます。クイック検索を使えば必要なものが見つかります。 メモは使用しているデバイスに無料で同期されるため、いつでも確認できます。
-
-- 簡単なメモ作り 
-- すべてのデバイスですべてを同期 
-- コラボレーションと共有
-- タグで見やすく整理 
-- メールまたは WordPress.com アカウントでログイン
-
-秘密を保持しながら同期
-- コンピューター、携帯電話、タブレット間でシームレスに自動同期
-- 使用中にバックアップと同期を実行するため、データを紛失することはありません。
-
-コラボレーションと共有
-- コラボレーションして共に作業する -- 同僚とアイデアを共有したり、ルームメイトと買い物リストを作成したりできます。
-- コンテンツのウェブ公開と、特定の相手とのリンクのシェアから選択できます。
-- WordPress アカウントと連携させることで、WordPress サイトに直接公開できます。
-- サードパーティ製アプリとすばやく簡単に共有できます。
-
-整理と検索
-- タグを使用して見やすく整理し、タグからすばやく検索、並べ替えを行えます。
-- キーワードのハイライト表示で、探している部分がすばやく見つかります。
-- マークダウン機能による書式設定。
-- やることリストの作成。
-- ノートとタグのソート順序を選択。
-- よく使うノートをピンで固定。
-- 名前の編集と順序の並べ替えでタグを直接編集。
-- パスコードロックでコンテンツを保護。
-
---
-
-プライバシーポリシー : https://automattic.com/privacy/
-利用規約 : https://simplenote.com/terms/
-カリフォルニア州のユーザーへの新しいプライバシー通知 : https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
-
---
-
-simplenote.com にアクセスして他のデバイスに Simplenote をダウンロード。
diff --git a/fastlane/metadata/ja/release_notes.txt b/fastlane/metadata/ja/release_notes.txt
new file mode 100644
index 000000000..9fb2e99cd
--- /dev/null
+++ b/fastlane/metadata/ja/release_notes.txt
@@ -0,0 +1 @@
+内部を改良しました。
diff --git a/fastlane/metadata/ko/description.txt b/fastlane/metadata/ko/description.txt
deleted file mode 100644
index 5c1b76e84..000000000
--- a/fastlane/metadata/ko/description.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-Simplenote로 손쉽게 메모를 작성하고 할 일 목록을 만들고 아이디어를 보관할 수 있습니다. 메모를 열고 생각나는 아이디어를 적으면 끝입니다. 컬렉션의 내용이 다양해지면 태그와 핀으로 내용을 정리하고 빠른 검색 기능으로 필요한 내용을 찾을 수 있습니다. Simplenote는 여러 기기에서 무료로 동기화되기 때문에 내가 작성한 메모를 언제든지 확인할 수 있습니다.
-
-- 간편한 메모 작성 환경
-- 모든 기기의 모든 콘텐츠 동기화
-- 협업 및 공유
-- 태그로 깔끔하게 정리
-- 이메일 또는 워드프레스닷컴 계정으로 로그인
-
-원활한 동기화
-- 컴퓨터, 휴대폰 또는 태블릿에서 자동으로 문제없이 동기화됩니다.
-- 메모 작성과 동시에 모든 내용이 백업 및 동기화되므로 손실되는 내용이 없습니다.
-
-협업 및 공유
-- 공동으로 협력하여 작업하세요. 동료와 아이디어를 공유하거나 룸메이트와 함께 장보기 목록을 작성해 보세요.
-- 콘텐츠의 웹 공개 여부를 결정하고 원하는 사람과 링크를 공유하세요.
-- 워드프레스닷컴 계정에 연결하여 워드프레스 사이트에 바로 공개하세요.
-- 타사 앱과 빠르고 쉽게 공유할 수 있습니다.
-
-정리 및 검색
-- 태그로 깔끔하게 정리하여 빠르게 검색하고 정렬해 보세요.
-- 키워드 강조 표시로 원하는 항목을 즉시 찾을 수 있습니다.
-- 마크다운을 사용하여 서식을 추가하세요.
-- 할 일 목록을 만드세요.
-- 메모 및 태그 정렬 순서를 선택하세요.
-- 가장 많이 사용하는 메모를 고정하세요.
-- 이름을 바꾸고 순서를 변경하여 직접 태그를 편집하세요.
-- 패스코드 잠금으로 콘텐츠를 보호하세요.
-
----
-
-개인정보 취급방침: https://automattic.com/privacy/
-서비스 약관: https://simplenote.com/terms/
-캘리포니아 사용자 개인정보 고지사항: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
-
---
-
-simplenote.com을 방문하여 다른 기기에서 사용할 Simplenote를 다운로드하세요.
diff --git a/fastlane/metadata/ko/release_notes.txt b/fastlane/metadata/ko/release_notes.txt
new file mode 100644
index 000000000..392f47bb1
--- /dev/null
+++ b/fastlane/metadata/ko/release_notes.txt
@@ -0,0 +1 @@
+내부 개선 사항.
diff --git a/fastlane/metadata/nl-NL/description.txt b/fastlane/metadata/nl-NL/description.txt
deleted file mode 100644
index 03c6474cb..000000000
--- a/fastlane/metadata/nl-NL/description.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-Simplenote is een eenvoudige manier om aantekeningen te maken, takenlijsten op te stellen, ideeën vast te leggen en meer. Open Simplenote, schrijf je gedachten op en je bent klaar. Naarmate je verzameling groeit, kan je je opmerkingen geordend houden met tags en pins en zoeken naar wat je nodig hebt. Simplenote synchroniseert gratis met al je toestellen, waardoor je je opmerkingen altijd bij je hebt.
-
-- Een fijne ervaring voor notities maken
-- Synchroniseer alles op al je apparaten
-- Samenwerken en delen
-- Overzicht houden met tags
-- Log in met je e-mail of WordPress.com-account
-
-VOL VERTROUWEN SYNCHRONISEREN
-- Automatisch zonder problemen synchroniseren op elke computer, telefoon of tablet.
-- Maak back-ups en synchroniseer terwijl je opmerkingen maakt, zodat je je inhoud nooit kwijtraakt.
-
-SAMENWERKEN EN DELEN
-- Werk samen; deel ideeën met collega's of maak een boodschappenlijstje met je huisgenoot.
-- Kies of je je inhoud wilt publiceren op het internet en deel een link met wie je maar wilt.
-- Koppel je WordPress.com account om direct op een WordPress site te publiceren.
-- Deel snel en eenvoudig met apps van derden.
-
-ORGANISEREN EN ZOEKEN
-- Houd het overzicht met tags en gebruik ze om snel te zoeken en te sorteren.
-- Vind meteen wat je zoekt met trefwoordmarkering.
-- Gebruik Markdown om opmaak in te voegen.
-- Stel takenlijsten op.
-- Kies de sorteervolgorde voor je aantekeningen en tags.
-- Pin de aantekeningen die je het meest gebruikt.
-- Bewerk tags direct door ze een nieuwe naam te geven en de volgorde te wijzigen.
-- Bescherm je content met een pincodevergrendeling.
-
---
-
-Privacybeleid: https://automattic.com/privacy/
-Servicevoorwaarden: https://simplenote.com/terms/
-Privacyverklaring voor gebruikers in Californië: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
-
---
-
-Ga naar simplenote.com om Simplenote voor je andere apparaten te downloaden.
diff --git a/fastlane/metadata/pt-BR/description.txt b/fastlane/metadata/pt-BR/description.txt
deleted file mode 100644
index 2202b3e17..000000000
--- a/fastlane/metadata/pt-BR/description.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-O Simplenote é uma maneira fácil de fazer anotações, criar listas de tarefas, captar ideias e muito mais. Abra-o, escreva o que quiser e pronto. Conforme a sua coleção aumenta, organize-a usando tags e pins, e encontre o que precisa com a pesquisa instantânea. Como o Simplenote será sincronizado em todos os seus dispositivos gratuitamente, suas anotações o acompanharão o tempo todo.
-
-- Faça anotações de forma simples.
-- Sincronize tudo em todos os seus dispositivos.
-- Colabore e compartilhe.
-- Mantenha seu conteúdo organizado com tags.
-- Faça login com seu e-mail ou sua conta do WordPress.com.
-
-SINCRONIZE COM CONFIANÇA
-- Sincronize seu conteúdo automaticamente em qualquer computador, celular ou tablet.
-- Faça backup e sincronize tudo enquanto faz suas anotações, para não perder nenhum conteúdo.
-
-COLABORE E COMPARTILHE
-- Colabore e trabalhe com outras pessoas: compartilhe ideias com um amigo ou faça uma lista de compras com seu colega de quarto.
-- Escolha se quer ou não publicar o seu conteúdo na Web e compartilhe um link com quem você desejar.
-- Publique diretamente em um site do WordPress ao conectar-se a sua conta do WordPress.com.
-- Compartilhe de forma rápida e simples com aplicativos de terceiros.
-
-ORGANIZE E PESQUISE
-- Mantenha seu conteúdo organizado com tags e use-as para classificar e pesquisar de forma rápida.
-- Encontre o que está procurando, de forma instantânea, com o destaque de palavras-chave.
-- Use o markdown para adicionar formatação.
-- Crie listas de tarefas.
-- Selecione a ordem de classificação de suas anotações e tags.
-- Marque as anotações que mais usa.
-- Edite as tags diretamente, renomeando-as e reorganizando-as.
-- Proteja seu conteúdo usando o bloqueio com senha.
-
---
-
-Política de privacidade: https://automattic.com/privacy/
-Termos de serviço: https://simplenote.com/terms/
-Aviso de privacidade para usuários residentes da Califórnia: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
-
---
-
-Acesse simplenote.com para baixar o Simplenote em outros dispositivos.
diff --git a/fastlane/metadata/pt-BR/release_notes.txt b/fastlane/metadata/pt-BR/release_notes.txt
new file mode 100644
index 000000000..cd77caf8d
--- /dev/null
+++ b/fastlane/metadata/pt-BR/release_notes.txt
@@ -0,0 +1 @@
+Melhorias no sistema.
diff --git a/fastlane/metadata/ru/description.txt b/fastlane/metadata/ru/description.txt
deleted file mode 100644
index f12d5f60f..000000000
--- a/fastlane/metadata/ru/description.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-Simplenote — это простой способ делать заметки, создавать списки дел, записывать идеи и так далее. Откройте его, запишите свои мысли, и готово. Чтобы быстро находить заметки, используйте теги и булавки, а также функцию быстрого поиска. Simplenote бесплатно синхронизирует заметки на ваших устройствах — у вас всегда будет доступ к ним.
-
-- Простой удобный способ делать заметки
-- Синхронизируйте на всех своих устройствах
-- Совместное редактирование и обмен
-- Упорядочивание заметок с помощью меток
-- Вход с помощью эл. почты или учетной записи WordPress.com
-
-НАДЕЖНАЯ СИНХРОНИЗАЦИЯ
-- Автоматическая синхронизация на компьютере, телефоне или планшете.
-- Резервное копирование и синхронизация по мере ввода заметки, вы никогда ничего не потеряете.
-
-СОВМЕСТНАЯ РАБОТА И ОБМЕН
-- Работайте совместно, делитесь идеями с коллегами, составляйте список покупок вместе с друзьями.
-- Публикуйте материалы в Интернете и делитесь ссылками с кем-угодно.
-- Публикуйте прямо на сайте WordPress, подключив свою учетную запись WordPress.com.
-- Быстро и легко переносите заметки в другие приложения.
-
-ОРГАНИЗАЦИЯ И ПОИСК
-- Используйте метки для быстрого поиска и сортировки.
-- Мгновенно находите то, что нужно, с помощью выделения ключевых слов.
-- Используйте разметку для форматирования.
-- Создавайте списки дел.
-- Выбирайте порядок сортировки заметок и тегов.
-- Прикалывайте булавками самые популярные заметки.
-- Редактируйте теги: меняйте их имена и порядок расположения.
-- Защищайте заметки с помощью пароля.
-
---
-
-Политика конфиденциальности: https://automattic.com/privacy/
-Условия предоставления услуг: https://simplenote.com/terms/
-Заявление о защите конфиденциальности пользователей из Калифорнии: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
-
---
-
-Перейдите на simplenote.com, чтобы загрузить Simplenote на другие устройства.
diff --git a/fastlane/metadata/ru/release_notes.txt b/fastlane/metadata/ru/release_notes.txt
new file mode 100644
index 000000000..de2fb16ae
--- /dev/null
+++ b/fastlane/metadata/ru/release_notes.txt
@@ -0,0 +1 @@
+Целый мешок усовершенствований.
diff --git a/fastlane/metadata/sv/description.txt b/fastlane/metadata/sv/description.txt
deleted file mode 100644
index 56bdef89b..000000000
--- a/fastlane/metadata/sv/description.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-Simplenote är ett enkelt sätt att göra anteckningar, skapa att-göra-listor, skriva ner idéer med mera. Öppna appen, skriv ner några tankar och du är klar. Allteftersom din samling växer kan du hålla dig organiserad med hjälp av etiketter och stift samt hitta vad du behöver med omedelbara sökningar. Eftersom Simplenote synkroniseras kostnadsfritt på alla dina enheter kan du alltd komma åt dina anteckningar.
-
-- En enkel anteckningsupplevelse
-- Synkronisera allt över dina enheter
-- Samarbeta och dela
-- Var organiserad med etiketter
-- Logga in på din e-post eller ditt WordPress.com-konto
-
-SYNKRONISERA TRYGGT
-- Synkronisera automatiskt och sömlöst mellan alla datorer, telefoner och surfplattor.
-- Säkerhetskopiera och synkronisera allt när du gör anteckningar, så att du aldrig förlorar ditt innehåll
-
-SAMARBETA OCH DELA
-Samarbeta och arbeta tillsammans – dela idéer med en kollega eller skriv en inköpslista med din rumskamrat.
-- Välj om du vill publicera ditt innehåll på webben och dela länkar med vem du vill.
-- Publicera direkt till en WordPress-webbplats genom att ansluta ditt WordPress.com-konto.
-- Dela snabbt och enkelt med tredjepartsappar.
-
-ORGANISERA OCH SÖK
-- Håll dig organiserad med etiketter och använd dem för snabb sökning och sortering.
-- Hitta vad du letar efter omedelbart med nyckelordsmarkering.
-- Använd markdown för att lägga till formatering.
-- Skapa att göra-listor.
-- Välj sorteringsordningen för dina anteckningar och etiketter.
-- Fäst de anteckningar som du använder mest.
-- Redigera etiketter direkt genom att byta namn eller ändra ordning på dem.
-Skydda ditt innehåll med ett lösenordslås.
-
-–
-
-Sekretesspolicy: https://automattic.com/privacy/
-Användarvillkor: https://simplenote.com/terms/
-Sekretessmeddelande för användare i Kalifornien: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
-
-–
-
-Besök simplenote.com för att ladda ner Simplenote till dina andra enheter.
diff --git a/fastlane/metadata/sv/release_notes.txt b/fastlane/metadata/sv/release_notes.txt
new file mode 100644
index 000000000..dafc92d0b
--- /dev/null
+++ b/fastlane/metadata/sv/release_notes.txt
@@ -0,0 +1 @@
+Förbättringar under huven.
diff --git a/fastlane/metadata/tr/description.txt b/fastlane/metadata/tr/description.txt
deleted file mode 100644
index af4cbaf09..000000000
--- a/fastlane/metadata/tr/description.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-Simplenote not tutmanın, yapılacaklar listesi oluşturmanın, fikirlerinizi kaydetmenin ve daha fazlasını yapmanın kolay bir yoludur. Uygulamayı açıp düşüncelerinizi yazmanız yeterlidir. Koleksiyonunuz büyüdükçe etiketler ve iğnelerle düzeninizi koruyun. Anında arama özelliğiyle ihtiyacınız olanları bulun. Simplenote, cihazlarınızda ücretsiz olarak eşitlendiğinden notlarınız her zaman sizinledir.
-
-- Basit bir not alma deneyimi
-- Tüm cihazlarınızdaki her şeyi eşitleyin
-- İşbirliği yapın ve paylaşın
-- Etiketler sayesinde düzenli kalın
-- E-postanızla veya WordPress.com hesabınızla oturum açın
-
-GÜVENLE SENKRONİZE EDİN
-- Herhangi bir bilgisayar, telefon veya tablette otomatik olarak sorunsuz senkronizasyon yapın.
-- İçeriğinizi hiçbir zaman kaybetmemek için not tutarken her şeyi yedekleyin ve eşitleyin.
-
-İŞBİRLİĞİ YAPIN VE PAYLAŞIN
-- İşbirliği yapın ve birlikte çalışın - fikirlerinizi iş arkadaşınızla paylaşın veya oda arkadaşınızla bir alışveriş listesi yazın.
-- İçeriğinizi web'de yayımlayıp yayımlamayacağınızı seçin ve istediğiniz kişilerle bağlantı paylaşın.
-- WordPress.com hesabınızı bağlayarak içeriğinizi doğrudan bir WordPress sitesinde yayımlayın.
-- Üçüncü taraf uygulamalarıyla hızla ve kolayca paylaşım yapın.
-
-DÜZENLEYİN VE ARAYIN
-- Etiketler sayesinde düzenli kalın ve bunları kullanarak hızlı şekilde arama ve sıralama yapın.
-- Anahtar sözcük vurgulama ile aradığınız her şeyi anında bulun.
-- Biçimlendirme eklemek için Markdown'ı kullanın.
-- Yapılacaklar listesi oluşturun.
-- Notlarınızın ve etiketlerinizin nasıl sıralanacağını seçin.
-- En çok kullandığınız notları sabitleyin.
-- Etiketleri düzenleyerek yeniden adlandırın ve yeniden sıralayın.
-- Bir parola kilidi ile içeriğinizi koruyun.
-
---
-
-Gizlilik Politikası: https://automattic.com/privacy/
-Hizmet Şartları: https://simplenote.com/terms/
-Kaliforniya'daki Kullanıcılar için Gizlilik Bildirimi: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
-
---
-
-Diğer cihazlarınız için Simplenote'u indirmek üzere simplenote.com adresini ziyaret edin.
diff --git a/fastlane/metadata/tr/release_notes.txt b/fastlane/metadata/tr/release_notes.txt
new file mode 100644
index 000000000..77cece35c
--- /dev/null
+++ b/fastlane/metadata/tr/release_notes.txt
@@ -0,0 +1 @@
+Arka planda yapılan iyileştirmeler.
diff --git a/fastlane/metadata/zh-Hans/description.txt b/fastlane/metadata/zh-Hans/description.txt
deleted file mode 100644
index 0792a09af..000000000
--- a/fastlane/metadata/zh-Hans/description.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-Simplenote 可帮助您轻松记录笔记、创建任务清单、捕捉想法等。 只需打开并写下一些想法即可。 随着合集增多，您可以使用标签和固定按钮对其进行整理，通过快速搜索找到您需要的内容。 因为 Simplenote 会在您的设备之间免费同步，所以您可以随时随地访问您的笔记。
-
-- 简单易用的笔记体验
-- 在所有设备之间同步一切内容
-- 协作和共享
-- 使用标签保持整洁有序
-- 使用电子邮件地址或 WordPress.com 帐户登录
-
-安心同步
-- 自动无缝地跨任何电脑、手机或平板电脑同步。
-- 在您记录笔记时备份并同步所有内容，因此您永远不会丢失内容。
-
-协作和共享
-- 协作与合作 - 与同事分享想法，或者写一份需要与室友一同采购的杂货清单。
-- 选择是否在网络上发布您的内容，并与您的理想对象共享链接。
-- 连接至您的 WordPress.com 帐户，可直接在 WordPress 站点上发布。
-- 快速轻松地与第三方应用共享。
-
-整理和搜索
-- 使用标签保持整洁有序，还可以通过标签快速搜索和分类。
-- 通过高亮显示关键字，快速找到您所需的内容。
-- 使用 Markdown 添加格式。
-- 创建任务清单。
-- 选择笔记和标签的排序顺序。
-- 固定您最常使用的笔记。
-- 通过重命名和重新排序直接编辑标签。
-- 使用密码锁保护您的内容。
-
---
-
-隐私政策：https://automattic.com/privacy/
-服务条款：https://simplenote.com/terms/
-加州用户隐私声明：https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
-
---
-
-访问 simplenote.com，下载适用于您的其他设备的 Simplenote。
diff --git a/fastlane/metadata/zh-Hans/release_notes.txt b/fastlane/metadata/zh-Hans/release_notes.txt
new file mode 100644
index 000000000..e86fa6dce
--- /dev/null
+++ b/fastlane/metadata/zh-Hans/release_notes.txt
@@ -0,0 +1 @@
+后台进行的改进。
diff --git a/fastlane/metadata/zh-Hant/description.txt b/fastlane/metadata/zh-Hant/description.txt
deleted file mode 100644
index fd89291dd..000000000
--- a/fastlane/metadata/zh-Hant/description.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-Simplenote 讓你輕鬆做筆記、建立待辦事項清單、記下想法等等。 開啟程式、寫下想法，這樣就大功告成囉。 隨著收集的資料越來越多，標籤和釘選功能可讓你保持井井有條，你也可以使用即時搜尋功能尋找所需資料。 Simplenote 提供免費跨裝置同步，讓你隨時隨地將筆記帶在身邊。
-
-- 輕鬆做筆記
-- 在所有裝置同步全部內容
-- 協同合作並彼此分享
-- 使用標籤整理筆記
-- 使用你的電子郵件地址或 WordPress.com 帳號登入
-
-放心同步筆記
-- 順利將筆記自動同步至任何電腦、手機或平板電腦。
-- 做筆記的當下同時備份和同步，讓你永遠不會遺失內容。
-
-協同合作並彼此分享
-- 共同作業，與同事分享想法，或與室友合寫購物清單。
-- 能夠選擇是否將筆記內容發佈到網路，並與任何人分享連結。
-- 連結 WordPress.com 帳號即可將筆記直接發表至 WordPress 網站。
-- 輕鬆快速與第三方應用程式共享筆記。
-
-整理及搜尋
-- 使用標籤即可讓一切保持井井有條，還能快速搜尋和排序。
-- 輸入關鍵字可立即找到所需內容。
-- 使用 Markdown 即可新增格式。
-- 建立待辦事項清單。
-- 為筆記和標籤選擇排序順序。
-- 釘選最常用的筆記。
-- 重新命名和重新排序即可直接編輯標籤。
-- 透過密碼鎖定保護你的內容。
-
---
-
-隱私權政策：https://automattic.com/privacy/
-服務條款：https://simplenote.com/terms/
-加州使用者隱私權聲明：https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
-
---
-
-若要下載 Simplenote 到其他裝置，請前往 simplenote.com。
diff --git a/fastlane/metadata/zh-Hant/release_notes.txt b/fastlane/metadata/zh-Hant/release_notes.txt
new file mode 100644
index 000000000..f1d542b59
--- /dev/null
+++ b/fastlane/metadata/zh-Hant/release_notes.txt
@@ -0,0 +1 @@
+內部的強化項目。

From cf2e53470d8af43824da78fd59e6078584c85294 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Fri, 13 Sep 2024 14:43:53 +1000
Subject: [PATCH 503/547] Trim ar-SA keywords to be less than 100 characters

---
 fastlane/metadata/ar-SA/keywords.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/metadata/ar-SA/keywords.txt b/fastlane/metadata/ar-SA/keywords.txt
index be7cee772..66c12533b 100644
--- a/fastlane/metadata/ar-SA/keywords.txt
+++ b/fastlane/metadata/ar-SA/keywords.txt
@@ -1 +1 @@
-ملحوظات,ملحوظة,مهام مصغرة,صحيفة,مذكرات,مزامنة,قائمة مهام,مفكرة,بسيط,مفكرة,وسم قائمة مهام,كتابة,مذكرة
+ملحوظات,ملحوظة,مهام مصغرة,صحيفة,مذكرات,مزامنة,قائمة مهام,مفكرة,بسيط,مفكرة,وسم قائمة مهام,كتابة
\ No newline at end of file

From bcbda397c1075321b657e0dc7007a40c83026fb9 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Fri, 13 Sep 2024 14:43:53 +1000
Subject: [PATCH 504/547] Bump version number

---
 config/Version.Public.xcconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/Version.Public.xcconfig b/config/Version.Public.xcconfig
index 0249d51a1..94333b261 100644
--- a/config/Version.Public.xcconfig
+++ b/config/Version.Public.xcconfig
@@ -1,2 +1,2 @@
-VERSION_LONG = 4.53.0.0
+VERSION_LONG = 4.53.0.1
 VERSION_SHORT = 4.53

From 38c60a36c15d7453ffd433ff49040cf5117a644b Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Fri, 13 Sep 2024 14:50:23 +1000
Subject: [PATCH 505/547] Restore deleted `fastlane/metadata/*/description.txt`

These were deleted in 637fdf11dade6f76e1a8355d30fd00c57264dafc because
they're marked as fuzzy in GlotPress.
---
 fastlane/metadata/ar-SA/description.txt   | 37 +++++++++++++++++++++++
 fastlane/metadata/de-DE/description.txt   | 37 +++++++++++++++++++++++
 fastlane/metadata/es-ES/description.txt   | 37 +++++++++++++++++++++++
 fastlane/metadata/fr-FR/description.txt   | 37 +++++++++++++++++++++++
 fastlane/metadata/he/description.txt      | 37 +++++++++++++++++++++++
 fastlane/metadata/id/description.txt      | 37 +++++++++++++++++++++++
 fastlane/metadata/it/description.txt      | 37 +++++++++++++++++++++++
 fastlane/metadata/ja/description.txt      | 37 +++++++++++++++++++++++
 fastlane/metadata/ko/description.txt      | 37 +++++++++++++++++++++++
 fastlane/metadata/nl-NL/description.txt   | 37 +++++++++++++++++++++++
 fastlane/metadata/pt-BR/description.txt   | 37 +++++++++++++++++++++++
 fastlane/metadata/ru/description.txt      | 37 +++++++++++++++++++++++
 fastlane/metadata/sv/description.txt      | 37 +++++++++++++++++++++++
 fastlane/metadata/tr/description.txt      | 37 +++++++++++++++++++++++
 fastlane/metadata/zh-Hans/description.txt | 37 +++++++++++++++++++++++
 fastlane/metadata/zh-Hant/description.txt | 37 +++++++++++++++++++++++
 16 files changed, 592 insertions(+)
 create mode 100644 fastlane/metadata/ar-SA/description.txt
 create mode 100644 fastlane/metadata/de-DE/description.txt
 create mode 100644 fastlane/metadata/es-ES/description.txt
 create mode 100644 fastlane/metadata/fr-FR/description.txt
 create mode 100644 fastlane/metadata/he/description.txt
 create mode 100644 fastlane/metadata/id/description.txt
 create mode 100644 fastlane/metadata/it/description.txt
 create mode 100644 fastlane/metadata/ja/description.txt
 create mode 100644 fastlane/metadata/ko/description.txt
 create mode 100644 fastlane/metadata/nl-NL/description.txt
 create mode 100644 fastlane/metadata/pt-BR/description.txt
 create mode 100644 fastlane/metadata/ru/description.txt
 create mode 100644 fastlane/metadata/sv/description.txt
 create mode 100644 fastlane/metadata/tr/description.txt
 create mode 100644 fastlane/metadata/zh-Hans/description.txt
 create mode 100644 fastlane/metadata/zh-Hant/description.txt

diff --git a/fastlane/metadata/ar-SA/description.txt b/fastlane/metadata/ar-SA/description.txt
new file mode 100644
index 000000000..dc6b27caa
--- /dev/null
+++ b/fastlane/metadata/ar-SA/description.txt
@@ -0,0 +1,37 @@
+إنَّ برنامج Simplenote من ضمن الطرق السهلة لتدوين الملحوظات، وإنشاء قوائم المهام، وتسجيل الأفكار، والمزيد. افتح البرنامج، ثم دوِّن بعض الأفكار، وهذا كل شيء. عندما تصبح مجموعتك كبيرة، حافظ على تنظيمها باستخدام الوسوم والدبابيس، واعثر على ما تحتاج إليه باستخدام البحث الفوري. نظرًا إلى أنَّ برنامج Simplenote سيقوم بالمزامنة عبر أجهزتك مجانًا، فإنَّ ملحوظاتك ستظل معك في جميع الأوقات.
+
+- استمتع بتجربة تدوين ملحوظات بسيطة
+- قم بمزامنة كل شيء عبر جميع أجهزتك
+- تعاون وشارك
+- ابقَ منظمًا باستخدام الوسوم
+- قم بتسجيل الدخول باستخدام بريدك الإلكتروني أو حسابك على ووردبريس.كوم
+
+وقم بالمزامنة بثقة
+- يمكنك المزامنة تلقائيًا بسلاسة عبر أي حاسوب أو هاتف أو جهاز لوحي.
+- انسخ كل شيء احتياطيًا وقم بمزامنته أثناء تدوين الملحوظات، لكيلا تفقد محتواك أبدًا.
+
+التعاون والمشاركة
+- يمكنك التعاون والعمل مع آخرين، أو مشاركة الأفكار مع زميلك، أو كتابة قائمة البقالة مع رفيقك في السكن.
+- اختر ما إذا كنتَ تريد نشر محتواك على الويب ومشاركة رابط مع مَن تريد، أم لا.
+- انشر مباشرةً على موقع ووردبريس عن طريق ربط حسابك على ووردبريس.كوم.
+- شارك بسرعة وبسهولة باستخدام تطبيقات الجهات الخارجية.
+
+التنظيم والبحث
+- حافظ على تنظيم مجموعتك باستخدام الوسوم، واستخدمها للبحث والفرز السريعين.
+- اعثر فورًا على ما تبحث عنه من خلال تمييز الكلمات الرئيسية.
+- استخدم الضبط لإضافة التنسيقات.
+- أنشئ قوائم المهام.
+- اختر ترتيب فرز ملحوظاتك ووسومك.
+- ثبِّت الملحوظات التي تستخدمها أكثر من غيرها.
+- حرِّر الوسوم مباشرةً عن طريق تسميتها وترتيبها مجددًا.
+- احمِ محتواك بقفل رمز المرور.
+
+--
+
+سياسة الخصوصية: https://automattic.com/privacy/
+شروط الخدمة: https://simplenote.com/terms/
+إشعار الخصوصية الخاص بالمستخدمين في كاليفورنيا: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+
+--
+
+تفضَّل بزيارة simplenote.com لتنزيل Simplenote لأجهزتك الأخرى.
diff --git a/fastlane/metadata/de-DE/description.txt b/fastlane/metadata/de-DE/description.txt
new file mode 100644
index 000000000..d199909b0
--- /dev/null
+++ b/fastlane/metadata/de-DE/description.txt
@@ -0,0 +1,37 @@
+Mit Simplenote kannst du ganz einfach Notizen,Aufgabenlisten, Ideen und mehr festhalten. Einfach aufrufen, Gedanken notieren – fertig. Mit Schlagwörtern und Pins behältst du den Überblick über deine wachsende Sammlung und mit der Sofortsuche findest du das, was du brauchst. Da Simplenote kostenlos mit deinen Geräten synchronisiert wird, hast du deine Notizen jederzeit zur Hand.
+
+- Eine einfache Möglichkeit, Notizen zu erstellen
+- Alle Inhalte über alle deine Geräte hinweg synchronisieren
+- Zusammenarbeiten und Teilen
+- Mit Schlagwörtern den Überblick behalten 
+- Mit E-Mail-Adresse oder WordPress.com-Konto anmelden
+
+ZUVERLÄSSIGES SYNCHRONISIEREN
+- Inhalte automatisch und problemlos mit jedem Computer, Smartphone oder Tablet synchronisieren
+- Alle Notizen sichern und synchronisieren, damit keine Inhalte verloren gehen
+
+ZUSAMMENARBEITEN UND TEILEN
+- Zusammenarbeiten und abstimmen: Teile Ideen mit einem Kollegen oder schreibe mit dem Mitbewohner eine Einkaufsliste.
+- Auswählen, ob Inhalte im Web veröffentlicht werden sollen, und einen Link mit den gewünschten Personen teilen
+- WordPress.com-Konto verbinden und Notizen direkt auf einer WordPress-Website veröffentlichen
+- Notizen schnell und einfach mit Drittanbieter-Apps teilen
+
+ORGANISEREN UND SUCHEN
+- Behalte mit Schlagwörtern den Überblick und suche und sortiere damit Inhalte.
+- Mit hervorgehobenen Stichwörtern sofort das finden, wonach du suchst
+- Mit Markdown Formatierungen hinzufügen
+- Aufgabenlisten erstellen
+- Die Sortierreihenfolge deiner Notizen und Schlagwörter auswählen
+- Die am häufigsten verwendeten Notizen anheften
+- Schlagwörter direkt bearbeiten, indem du sie umbenennst oder neu anordnest
+- Inhalte mit Zugangscode-Sperre schützen
+
+--
+
+Datenschutzerklärung: https://automattic.com/privacy/
+Geschäftsbedingungen: https://simplenote.com/terms/
+Datenschutzhinweis für Benutzer in Kalifornien: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+
+--
+
+Gehe zu simplenote.com und lade Simplenote für deine anderen Geräte herunter.
diff --git a/fastlane/metadata/es-ES/description.txt b/fastlane/metadata/es-ES/description.txt
new file mode 100644
index 000000000..df6438d0b
--- /dev/null
+++ b/fastlane/metadata/es-ES/description.txt
@@ -0,0 +1,37 @@
+Simplenote es una forma fácil de tomar notas, crear listas de tareas, capturar ideas y mucho más. Abre la aplicación, escribe algunas líneas y listo. A medida que tu colección crezca, mantén el orden con etiquetas y chinchetas, y encuentra lo que necesites con la búsqueda instantánea. Como Simplenote se sincronizará gratuitamente con tus dispositivos, tus notas estarán contigo en todo momento.
+
+- Una experiencia sencilla para tomar notas
+- Sincroniza todos tus dispositivos
+- Colabora y comparte 
+- Organízate con las etiquetas
+- Inicia sesión con tu correo electrónico o cuenta WordPress.com
+
+SINCRONIZA CON CONFIANZA
+- Sincroniza fácilmente cualquier ordenador, teléfono móvil o tableta.
+- Haz una copia de seguridad y sincronízalo todo mientras tomas notas, para que nunca pierdas tu contenido.
+
+COLABORA Y COMPARTE
+- Colabora y trabaja en equipo: comparte ideas con un compañero de trabajo o escribe la lista de la compra con tu compañero de piso.
+- Decide si quieres publicar tu contenido en la Web y comparte un enlace con quien tú quieras.
+- Publica contenido directamente en un sitio de WordPress conectando tu cuenta de WordPress.com.
+- Comparte contenido rápida y fácilmente con aplicaciones de terceros.
+
+ORGANIZA Y BUSCA
+- Mantén el orden aplicando etiquetas y úsalas para buscar y clasificar información rápidamente.
+- Encuentra de inmediato lo que buscas con el resaltado de palabras clave.
+- Utiliza el marcado para añadir formato.
+- Crea listas de tareas pendientes.
+- Elige el orden de clasificación de tus notas y etiquetas.
+- Fija las notas que más usas.
+- Edita las etiquetas directamente renombrándolas y reordenándolas.
+- Protege tu contenido con una contraseña.
+
+--
+
+Política de privacidad: https://automattic.com/privacy/
+Condiciones del servicio: https://simplenote.com/terms/
+Aviso de privacidad para usuarios de California: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+
+--
+
+Visita simplenote.com para descargar Simplenote en otros dispositivos.
diff --git a/fastlane/metadata/fr-FR/description.txt b/fastlane/metadata/fr-FR/description.txt
new file mode 100644
index 000000000..86d417d77
--- /dev/null
+++ b/fastlane/metadata/fr-FR/description.txt
@@ -0,0 +1,37 @@
+Simplenote est un outil facile pour prendre des notes, créer des listes de choses à faire, capturer des idées, etc. Il vous suffit de l’ouvrir, d’entrer vos réflexions, et le tour est joué. Au fur et à mesure que votre ensemble de notes augmente, vous pouvez les organiser à l’aide d’étiquettes et d’épingles, et trouver ce dont vous avez besoin par le biais de recherches instantanées. Simplenote assurant gratuitement la synchronisation sur tous vos appareils, vous disposez de vos notes à tout moment.
+
+- Une expérience de prise de note simple
+- Une synchronisation complète sur tous vos appareils
+- Collaboration et partage
+- Organisation à l’aide d’étiquettes
+- Connexion par adresse e-mail ou compte WordPress.com
+
+SYNCHRONISATION EN TOUTE CONFIANCE
+- Synchronisation automatique transparente sur n’importe quel ordinateur, téléphone ou tablette.
+- Sauvegardez et synchronisez tout lors de votre prise de notes, afin de ne perdre aucun contenu.
+
+COLLABORATION ET PARTAGE
+- Collaborez, que ce soit pour partager vos idées avec un collègue ou rédiger la liste des courses avec votre colocataire.
+- Décidez si vous souhaitez publier votre contenu sur le Web et partagez un lien avec les personnes de votre choix.
+- Publiez votre contenu directement sur un site WordPress en vous connectant à votre compte WordPress.com.
+- Partagez facilement et rapidement avec des applications tierces.
+
+ORGANISATION ET RECHERCHE
+- Organisez-vous à l’aide d’étiquettes et utilisez-les pour trier et rechercher rapidement ce dont vous avez besoin.
+- Trouvez instantanément ce que vous recherchez grâce à la mise en surbrillance de mots clés.
+- Utilisez Markdown pour ajouter une mise en forme.
+- Créez des listes de choses à faire.
+- Choisissez l’ordre de tri de vos notes et étiquettes.
+- Épinglez les notes que vous utilisez le plus.
+- Modifiez directement les étiquettes en les renommant et les réorganisant.
+- Protégez votre contenu à l’aide d’un verrou avec code d’authentification.
+
+--
+
+Politique de confidentialité : https://automattic.com/privacy/
+Conditions d’utilisation : https://simplenote.com/terms/
+Avis de confidentialité pour les utilisateurs californiens : https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+
+--
+
+Visitez simplenote.com afin de télécharger Simplenote pour vos autres appareils.
diff --git a/fastlane/metadata/he/description.txt b/fastlane/metadata/he/description.txt
new file mode 100644
index 000000000..f0df9e38d
--- /dev/null
+++ b/fastlane/metadata/he/description.txt
@@ -0,0 +1,37 @@
+האפליקציה Simplenote היא דרך קלה לרשום פתקים, ליצור רשימת משימות, לתעד רעיונות ועוד. פותחים את האפליקציה, רושמים כמה מחשבות, וזה הכול. כשיש לך הרבה פריטים באוסף, אפשר לשמור על הסדר באמצעות תגיות ונעצים ולמצוא את מה שנדרש לך בחיפוש מיידי. מאחר ש-Simplenote תסתנכרן בין כל המכשירים שלך, הפתקים שלך תמיד יהיו זמינים לשימושך בכל עת.
+
+- חוויית שימוש פשוטה ברישום פתקים
+- לסנכרן את כל התוכן בין כל המכשירים שלך
+- לעבוד יחד ולשתף פתקים
+- לשמור על סדר בעזרת תגיות
+- להתחבר לאימייל או לחשבון שלך ב-WordPress.com
+
+לסנכרן ללא חשש
+- לסנכרן באופן יעיל ואוטומטי את התוכן בין המחשב, הטלפון והטאבלט.
+- ניתן לגבות ולסנכרן את כל התוכן במהלך הכתיבה של הפתקים ולא לאבד תוכן לעולם.
+
+לעבוד יחד ולשתף פתקים
+- לשתף פעולה ולעבוד יחד – לחלוק רעיונות עם עמיתים או לכתוב רשימת קניות עם השותפים לדירה.
+- ניתן לבחור אם ברצונך לפרסם את התוכן שיצרת ברשת או לשתף קישור עם אנשים מסוימים לבחירתך.
+- ניתן לפרסם את התוכן ישירות לאתר שלך ב-WordPress.com באמצעות התחברות לחשבון שלך ב-WordPress.com.
+- אפשר לשתף את התוכן במהירות ובקלות באפליקציות של צד שלישי.
+
+לארגן ולחפש
+- אפשר להקפיד על ארגון בעזרת תגיות ולהשתמש בהן כדי לחפש פתקים ולמיין אותם מהר.
+- ניתן למצוא כל מה שברצונך לחפש באופן מיידי בעזרת הדגשה של מילות מפתח.
+- ניתן להשתמש ב-Markdown כדי להוסיף עיצוב.
+- ליצור רשימת משימות.
+- לבחור את סדר התצוגה של הפתקים והתגיות שלך.
+- לנעוץ את הפתקים שנמצאים בשימוש נפוץ.
+- לערוך תגיות באמצעות שינוי השם או הסדר.
+- להגן על התוכן שלך באמצעות קוד גישה.
+
+--
+
+מדיניות פרטיות: https://automattic.com/privacy/
+תנאי שימוש: https://simplenote.com/terms/
+הודעת פרטיות למשתמשים בקליפורניה: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+
+--
+
+יש לעבור לאתר simplenote.com ולהוריד את Simplenote למכשירים הנוספים שלך.
diff --git a/fastlane/metadata/id/description.txt b/fastlane/metadata/id/description.txt
new file mode 100644
index 000000000..4d51008f2
--- /dev/null
+++ b/fastlane/metadata/id/description.txt
@@ -0,0 +1,37 @@
+Simplenote adalah cara yang mudah untuk menulis catatan, membuat daftar hal yang harus dilakukan, mengembangkan ide, dan banyak lagi. Buka, catat beberapa ide, dan selesai. Seiring dengan berkembangnya koleksi Anda, tetap rapi dengan tag dan fitur sematkan, serta temukan hal yang Anda butuhkan dengan pencarian instan. Karena Simplenote akan tersinkron dengan seluruh perangkat secara gratis, catatan akan terus bersama Anda kapan saja.
+
+- Pengalaman mencatat yang sederhana
+- Menyinkronkan semua catatan di berbagai perangkat Anda
+- Berkolaborasi dan berbagi
+- Tetap rapi dengan tag
+- Masuk dengan email atau akun WordPress.com Anda
+
+SINKRONISASI ANDAL
+- Menyinkronkan dengan lancar di semua jenis komputer, ponsel atau tablet secara otomatis.
+- Cadangkan dan sinkronkan segala hal selagi Anda mencatat, sehingga Anda tidak akan kehilangan isi catatan.
+
+KOLABORASI DAN BERBAGI
+- Lakukan kolaborasi dan bekerja bersama -- bagikan ide dengan rekan kerja, atau tulis daftar belanja bersama teman sekamar.
+- Pilih untuk memublikasikan konten Anda ke web, dan bagikan tautan ke siapa pun yang Anda mau.
+- Publikasikan secara langsung ke situs WordPress dengan menyambungkan akun WordPress.com Anda.
+- Bagikan dengan aplikasi pihak ketiga secara mudah dan cepat.
+
+ATUR DAN CARI
+- Tetap rapi dengan tag; gunakan untuk pencarian dan penyortiran cepat.
+- Temukan apa yang Anda cari secara instan dengan penyorotan kata kunci.
+- Gunakan markdown untuk menambahkan pemformatan.
+- Buat daftar hal yang harus dilakukan.
+- Pilih urutan penyortiran catatan dan tag.
+- Sematkan catatan yang paling sering Anda gunakan.
+- Sunting tag secara langsung dengan menamai dan mengurutkan ulang.
+- Lindungi konten Anda dengan kunci kode sandi.
+
+--
+
+Kebijakan Privasi: https://automattic.com/privacy/
+Ketentuan Layanan: https://simplenote.com/terms/
+Pemberitahuan Privasi Pengguna California: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+
+--
+
+Kunjungi simplenote.com guna mengunduh Simplenote untuk perangkat Anda yang lain.
diff --git a/fastlane/metadata/it/description.txt b/fastlane/metadata/it/description.txt
new file mode 100644
index 000000000..fdcb2d48f
--- /dev/null
+++ b/fastlane/metadata/it/description.txt
@@ -0,0 +1,37 @@
+Con Simplenote puoi prendere appunti in modo semplice, creare elenchi di cose da fare, registrare le tue idee e molto altro. Aprilo, annota alcune idee e il gioco è fatto. Mentre la tua raccolta cresce, organizzala con tag e spilli e cerca quello di cui hai bisogno con la funzione di ricerca istantanea. I tuoi appunti saranno sempre con te poiché Simplenote si sincronizzerà gratuitamente su tutti i tuoi dispositivi.
+
+- Vivi un'esperienza semplice per prendere appunti
+- Sincronizza di ogni cosa su tutti i tuoi dispositivi
+- Collabora e condividi
+- Rimani organizzato con i tag
+- Accedi con la tua e-mail o con il tuo account WordPress.com
+
+ESEGUI LA SINCRONIZZAZIONE CON FIDUCIA
+- Esegui una perfetta sincronizzazione automatica tra qualsiasi computer, telefono o tablet.
+- Esegui backup e sincronizza tutto mentre prendi appunti in modo da non perdere i contenuti.
+
+COLLABORA E CONDIVI
+- Collabora e lavora allo stesso tempo: condivi idee con un collega o scrivi l'elenco della spesa con il tuo coinquilino.
+- Scegli se pubblicare i contenuti sul web e condividere un link con chiunque tu desideri.
+- Pubblica direttamente su un sito WordPress.com connettendo il tuo account WordPress.com.
+- Condividi in modo facile e veloce attraverso app di terze parti.
+
+ORGANIZZA E CERCA
+- Rimani organizzato con i tag e usali per effettuare la ricerca e ordinare rapidamente.
+- Trova subito quello che stai cercando con l'evidenziazione delle parole chiave.
+- Usa il markdown per aggiungere la formattazione.
+- Crea gli elenchi delle cose da fare.
+- Scegli l'ordine degli appunti e dei tag.
+- Metti uno spillo agli appunti che usi di più.
+- Modifica i tag in modo diretto rinominandoli e riordinandoli.
+- Proteggi i tuoi contenuti con un codice di blocco.
+
+--
+
+Politica sulla privacy: https://automattic.com/privacy/
+Termini di servizio: https://simplenote.com/terms/
+Nota sulla privacy per utenti in California: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+
+--
+
+Visita simplenote.com per scaricare Simplenote per altri dispositivi.
diff --git a/fastlane/metadata/ja/description.txt b/fastlane/metadata/ja/description.txt
new file mode 100644
index 000000000..60fc83dbd
--- /dev/null
+++ b/fastlane/metadata/ja/description.txt
@@ -0,0 +1,37 @@
+Simplenote では、メモ書き、ToDo リストの作成、アイデアのメモなどを簡単に行うことができます。 開いたら、あとは思い付いたことを書き込むだけ。 メモが増えても、タグやピンを使ってわかりやすくまとめることができます。クイック検索を使えば必要なものが見つかります。 メモは使用しているデバイスに無料で同期されるため、いつでも確認できます。
+
+- 簡単なメモ作り 
+- すべてのデバイスですべてを同期 
+- コラボレーションと共有
+- タグで見やすく整理 
+- メールまたは WordPress.com アカウントでログイン
+
+秘密を保持しながら同期
+- コンピューター、携帯電話、タブレット間でシームレスに自動同期
+- 使用中にバックアップと同期を実行するため、データを紛失することはありません。
+
+コラボレーションと共有
+- コラボレーションして共に作業する -- 同僚とアイデアを共有したり、ルームメイトと買い物リストを作成したりできます。
+- コンテンツのウェブ公開と、特定の相手とのリンクのシェアから選択できます。
+- WordPress アカウントと連携させることで、WordPress サイトに直接公開できます。
+- サードパーティ製アプリとすばやく簡単に共有できます。
+
+整理と検索
+- タグを使用して見やすく整理し、タグからすばやく検索、並べ替えを行えます。
+- キーワードのハイライト表示で、探している部分がすばやく見つかります。
+- マークダウン機能による書式設定。
+- やることリストの作成。
+- ノートとタグのソート順序を選択。
+- よく使うノートをピンで固定。
+- 名前の編集と順序の並べ替えでタグを直接編集。
+- パスコードロックでコンテンツを保護。
+
+--
+
+プライバシーポリシー : https://automattic.com/privacy/
+利用規約 : https://simplenote.com/terms/
+カリフォルニア州のユーザーへの新しいプライバシー通知 : https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+
+--
+
+simplenote.com にアクセスして他のデバイスに Simplenote をダウンロード。
diff --git a/fastlane/metadata/ko/description.txt b/fastlane/metadata/ko/description.txt
new file mode 100644
index 000000000..5c1b76e84
--- /dev/null
+++ b/fastlane/metadata/ko/description.txt
@@ -0,0 +1,37 @@
+Simplenote로 손쉽게 메모를 작성하고 할 일 목록을 만들고 아이디어를 보관할 수 있습니다. 메모를 열고 생각나는 아이디어를 적으면 끝입니다. 컬렉션의 내용이 다양해지면 태그와 핀으로 내용을 정리하고 빠른 검색 기능으로 필요한 내용을 찾을 수 있습니다. Simplenote는 여러 기기에서 무료로 동기화되기 때문에 내가 작성한 메모를 언제든지 확인할 수 있습니다.
+
+- 간편한 메모 작성 환경
+- 모든 기기의 모든 콘텐츠 동기화
+- 협업 및 공유
+- 태그로 깔끔하게 정리
+- 이메일 또는 워드프레스닷컴 계정으로 로그인
+
+원활한 동기화
+- 컴퓨터, 휴대폰 또는 태블릿에서 자동으로 문제없이 동기화됩니다.
+- 메모 작성과 동시에 모든 내용이 백업 및 동기화되므로 손실되는 내용이 없습니다.
+
+협업 및 공유
+- 공동으로 협력하여 작업하세요. 동료와 아이디어를 공유하거나 룸메이트와 함께 장보기 목록을 작성해 보세요.
+- 콘텐츠의 웹 공개 여부를 결정하고 원하는 사람과 링크를 공유하세요.
+- 워드프레스닷컴 계정에 연결하여 워드프레스 사이트에 바로 공개하세요.
+- 타사 앱과 빠르고 쉽게 공유할 수 있습니다.
+
+정리 및 검색
+- 태그로 깔끔하게 정리하여 빠르게 검색하고 정렬해 보세요.
+- 키워드 강조 표시로 원하는 항목을 즉시 찾을 수 있습니다.
+- 마크다운을 사용하여 서식을 추가하세요.
+- 할 일 목록을 만드세요.
+- 메모 및 태그 정렬 순서를 선택하세요.
+- 가장 많이 사용하는 메모를 고정하세요.
+- 이름을 바꾸고 순서를 변경하여 직접 태그를 편집하세요.
+- 패스코드 잠금으로 콘텐츠를 보호하세요.
+
+---
+
+개인정보 취급방침: https://automattic.com/privacy/
+서비스 약관: https://simplenote.com/terms/
+캘리포니아 사용자 개인정보 고지사항: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+
+--
+
+simplenote.com을 방문하여 다른 기기에서 사용할 Simplenote를 다운로드하세요.
diff --git a/fastlane/metadata/nl-NL/description.txt b/fastlane/metadata/nl-NL/description.txt
new file mode 100644
index 000000000..03c6474cb
--- /dev/null
+++ b/fastlane/metadata/nl-NL/description.txt
@@ -0,0 +1,37 @@
+Simplenote is een eenvoudige manier om aantekeningen te maken, takenlijsten op te stellen, ideeën vast te leggen en meer. Open Simplenote, schrijf je gedachten op en je bent klaar. Naarmate je verzameling groeit, kan je je opmerkingen geordend houden met tags en pins en zoeken naar wat je nodig hebt. Simplenote synchroniseert gratis met al je toestellen, waardoor je je opmerkingen altijd bij je hebt.
+
+- Een fijne ervaring voor notities maken
+- Synchroniseer alles op al je apparaten
+- Samenwerken en delen
+- Overzicht houden met tags
+- Log in met je e-mail of WordPress.com-account
+
+VOL VERTROUWEN SYNCHRONISEREN
+- Automatisch zonder problemen synchroniseren op elke computer, telefoon of tablet.
+- Maak back-ups en synchroniseer terwijl je opmerkingen maakt, zodat je je inhoud nooit kwijtraakt.
+
+SAMENWERKEN EN DELEN
+- Werk samen; deel ideeën met collega's of maak een boodschappenlijstje met je huisgenoot.
+- Kies of je je inhoud wilt publiceren op het internet en deel een link met wie je maar wilt.
+- Koppel je WordPress.com account om direct op een WordPress site te publiceren.
+- Deel snel en eenvoudig met apps van derden.
+
+ORGANISEREN EN ZOEKEN
+- Houd het overzicht met tags en gebruik ze om snel te zoeken en te sorteren.
+- Vind meteen wat je zoekt met trefwoordmarkering.
+- Gebruik Markdown om opmaak in te voegen.
+- Stel takenlijsten op.
+- Kies de sorteervolgorde voor je aantekeningen en tags.
+- Pin de aantekeningen die je het meest gebruikt.
+- Bewerk tags direct door ze een nieuwe naam te geven en de volgorde te wijzigen.
+- Bescherm je content met een pincodevergrendeling.
+
+--
+
+Privacybeleid: https://automattic.com/privacy/
+Servicevoorwaarden: https://simplenote.com/terms/
+Privacyverklaring voor gebruikers in Californië: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+
+--
+
+Ga naar simplenote.com om Simplenote voor je andere apparaten te downloaden.
diff --git a/fastlane/metadata/pt-BR/description.txt b/fastlane/metadata/pt-BR/description.txt
new file mode 100644
index 000000000..2202b3e17
--- /dev/null
+++ b/fastlane/metadata/pt-BR/description.txt
@@ -0,0 +1,37 @@
+O Simplenote é uma maneira fácil de fazer anotações, criar listas de tarefas, captar ideias e muito mais. Abra-o, escreva o que quiser e pronto. Conforme a sua coleção aumenta, organize-a usando tags e pins, e encontre o que precisa com a pesquisa instantânea. Como o Simplenote será sincronizado em todos os seus dispositivos gratuitamente, suas anotações o acompanharão o tempo todo.
+
+- Faça anotações de forma simples.
+- Sincronize tudo em todos os seus dispositivos.
+- Colabore e compartilhe.
+- Mantenha seu conteúdo organizado com tags.
+- Faça login com seu e-mail ou sua conta do WordPress.com.
+
+SINCRONIZE COM CONFIANÇA
+- Sincronize seu conteúdo automaticamente em qualquer computador, celular ou tablet.
+- Faça backup e sincronize tudo enquanto faz suas anotações, para não perder nenhum conteúdo.
+
+COLABORE E COMPARTILHE
+- Colabore e trabalhe com outras pessoas: compartilhe ideias com um amigo ou faça uma lista de compras com seu colega de quarto.
+- Escolha se quer ou não publicar o seu conteúdo na Web e compartilhe um link com quem você desejar.
+- Publique diretamente em um site do WordPress ao conectar-se a sua conta do WordPress.com.
+- Compartilhe de forma rápida e simples com aplicativos de terceiros.
+
+ORGANIZE E PESQUISE
+- Mantenha seu conteúdo organizado com tags e use-as para classificar e pesquisar de forma rápida.
+- Encontre o que está procurando, de forma instantânea, com o destaque de palavras-chave.
+- Use o markdown para adicionar formatação.
+- Crie listas de tarefas.
+- Selecione a ordem de classificação de suas anotações e tags.
+- Marque as anotações que mais usa.
+- Edite as tags diretamente, renomeando-as e reorganizando-as.
+- Proteja seu conteúdo usando o bloqueio com senha.
+
+--
+
+Política de privacidade: https://automattic.com/privacy/
+Termos de serviço: https://simplenote.com/terms/
+Aviso de privacidade para usuários residentes da Califórnia: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+
+--
+
+Acesse simplenote.com para baixar o Simplenote em outros dispositivos.
diff --git a/fastlane/metadata/ru/description.txt b/fastlane/metadata/ru/description.txt
new file mode 100644
index 000000000..f12d5f60f
--- /dev/null
+++ b/fastlane/metadata/ru/description.txt
@@ -0,0 +1,37 @@
+Simplenote — это простой способ делать заметки, создавать списки дел, записывать идеи и так далее. Откройте его, запишите свои мысли, и готово. Чтобы быстро находить заметки, используйте теги и булавки, а также функцию быстрого поиска. Simplenote бесплатно синхронизирует заметки на ваших устройствах — у вас всегда будет доступ к ним.
+
+- Простой удобный способ делать заметки
+- Синхронизируйте на всех своих устройствах
+- Совместное редактирование и обмен
+- Упорядочивание заметок с помощью меток
+- Вход с помощью эл. почты или учетной записи WordPress.com
+
+НАДЕЖНАЯ СИНХРОНИЗАЦИЯ
+- Автоматическая синхронизация на компьютере, телефоне или планшете.
+- Резервное копирование и синхронизация по мере ввода заметки, вы никогда ничего не потеряете.
+
+СОВМЕСТНАЯ РАБОТА И ОБМЕН
+- Работайте совместно, делитесь идеями с коллегами, составляйте список покупок вместе с друзьями.
+- Публикуйте материалы в Интернете и делитесь ссылками с кем-угодно.
+- Публикуйте прямо на сайте WordPress, подключив свою учетную запись WordPress.com.
+- Быстро и легко переносите заметки в другие приложения.
+
+ОРГАНИЗАЦИЯ И ПОИСК
+- Используйте метки для быстрого поиска и сортировки.
+- Мгновенно находите то, что нужно, с помощью выделения ключевых слов.
+- Используйте разметку для форматирования.
+- Создавайте списки дел.
+- Выбирайте порядок сортировки заметок и тегов.
+- Прикалывайте булавками самые популярные заметки.
+- Редактируйте теги: меняйте их имена и порядок расположения.
+- Защищайте заметки с помощью пароля.
+
+--
+
+Политика конфиденциальности: https://automattic.com/privacy/
+Условия предоставления услуг: https://simplenote.com/terms/
+Заявление о защите конфиденциальности пользователей из Калифорнии: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+
+--
+
+Перейдите на simplenote.com, чтобы загрузить Simplenote на другие устройства.
diff --git a/fastlane/metadata/sv/description.txt b/fastlane/metadata/sv/description.txt
new file mode 100644
index 000000000..56bdef89b
--- /dev/null
+++ b/fastlane/metadata/sv/description.txt
@@ -0,0 +1,37 @@
+Simplenote är ett enkelt sätt att göra anteckningar, skapa att-göra-listor, skriva ner idéer med mera. Öppna appen, skriv ner några tankar och du är klar. Allteftersom din samling växer kan du hålla dig organiserad med hjälp av etiketter och stift samt hitta vad du behöver med omedelbara sökningar. Eftersom Simplenote synkroniseras kostnadsfritt på alla dina enheter kan du alltd komma åt dina anteckningar.
+
+- En enkel anteckningsupplevelse
+- Synkronisera allt över dina enheter
+- Samarbeta och dela
+- Var organiserad med etiketter
+- Logga in på din e-post eller ditt WordPress.com-konto
+
+SYNKRONISERA TRYGGT
+- Synkronisera automatiskt och sömlöst mellan alla datorer, telefoner och surfplattor.
+- Säkerhetskopiera och synkronisera allt när du gör anteckningar, så att du aldrig förlorar ditt innehåll
+
+SAMARBETA OCH DELA
+Samarbeta och arbeta tillsammans – dela idéer med en kollega eller skriv en inköpslista med din rumskamrat.
+- Välj om du vill publicera ditt innehåll på webben och dela länkar med vem du vill.
+- Publicera direkt till en WordPress-webbplats genom att ansluta ditt WordPress.com-konto.
+- Dela snabbt och enkelt med tredjepartsappar.
+
+ORGANISERA OCH SÖK
+- Håll dig organiserad med etiketter och använd dem för snabb sökning och sortering.
+- Hitta vad du letar efter omedelbart med nyckelordsmarkering.
+- Använd markdown för att lägga till formatering.
+- Skapa att göra-listor.
+- Välj sorteringsordningen för dina anteckningar och etiketter.
+- Fäst de anteckningar som du använder mest.
+- Redigera etiketter direkt genom att byta namn eller ändra ordning på dem.
+Skydda ditt innehåll med ett lösenordslås.
+
+–
+
+Sekretesspolicy: https://automattic.com/privacy/
+Användarvillkor: https://simplenote.com/terms/
+Sekretessmeddelande för användare i Kalifornien: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+
+–
+
+Besök simplenote.com för att ladda ner Simplenote till dina andra enheter.
diff --git a/fastlane/metadata/tr/description.txt b/fastlane/metadata/tr/description.txt
new file mode 100644
index 000000000..af4cbaf09
--- /dev/null
+++ b/fastlane/metadata/tr/description.txt
@@ -0,0 +1,37 @@
+Simplenote not tutmanın, yapılacaklar listesi oluşturmanın, fikirlerinizi kaydetmenin ve daha fazlasını yapmanın kolay bir yoludur. Uygulamayı açıp düşüncelerinizi yazmanız yeterlidir. Koleksiyonunuz büyüdükçe etiketler ve iğnelerle düzeninizi koruyun. Anında arama özelliğiyle ihtiyacınız olanları bulun. Simplenote, cihazlarınızda ücretsiz olarak eşitlendiğinden notlarınız her zaman sizinledir.
+
+- Basit bir not alma deneyimi
+- Tüm cihazlarınızdaki her şeyi eşitleyin
+- İşbirliği yapın ve paylaşın
+- Etiketler sayesinde düzenli kalın
+- E-postanızla veya WordPress.com hesabınızla oturum açın
+
+GÜVENLE SENKRONİZE EDİN
+- Herhangi bir bilgisayar, telefon veya tablette otomatik olarak sorunsuz senkronizasyon yapın.
+- İçeriğinizi hiçbir zaman kaybetmemek için not tutarken her şeyi yedekleyin ve eşitleyin.
+
+İŞBİRLİĞİ YAPIN VE PAYLAŞIN
+- İşbirliği yapın ve birlikte çalışın - fikirlerinizi iş arkadaşınızla paylaşın veya oda arkadaşınızla bir alışveriş listesi yazın.
+- İçeriğinizi web'de yayımlayıp yayımlamayacağınızı seçin ve istediğiniz kişilerle bağlantı paylaşın.
+- WordPress.com hesabınızı bağlayarak içeriğinizi doğrudan bir WordPress sitesinde yayımlayın.
+- Üçüncü taraf uygulamalarıyla hızla ve kolayca paylaşım yapın.
+
+DÜZENLEYİN VE ARAYIN
+- Etiketler sayesinde düzenli kalın ve bunları kullanarak hızlı şekilde arama ve sıralama yapın.
+- Anahtar sözcük vurgulama ile aradığınız her şeyi anında bulun.
+- Biçimlendirme eklemek için Markdown'ı kullanın.
+- Yapılacaklar listesi oluşturun.
+- Notlarınızın ve etiketlerinizin nasıl sıralanacağını seçin.
+- En çok kullandığınız notları sabitleyin.
+- Etiketleri düzenleyerek yeniden adlandırın ve yeniden sıralayın.
+- Bir parola kilidi ile içeriğinizi koruyun.
+
+--
+
+Gizlilik Politikası: https://automattic.com/privacy/
+Hizmet Şartları: https://simplenote.com/terms/
+Kaliforniya'daki Kullanıcılar için Gizlilik Bildirimi: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+
+--
+
+Diğer cihazlarınız için Simplenote'u indirmek üzere simplenote.com adresini ziyaret edin.
diff --git a/fastlane/metadata/zh-Hans/description.txt b/fastlane/metadata/zh-Hans/description.txt
new file mode 100644
index 000000000..0792a09af
--- /dev/null
+++ b/fastlane/metadata/zh-Hans/description.txt
@@ -0,0 +1,37 @@
+Simplenote 可帮助您轻松记录笔记、创建任务清单、捕捉想法等。 只需打开并写下一些想法即可。 随着合集增多，您可以使用标签和固定按钮对其进行整理，通过快速搜索找到您需要的内容。 因为 Simplenote 会在您的设备之间免费同步，所以您可以随时随地访问您的笔记。
+
+- 简单易用的笔记体验
+- 在所有设备之间同步一切内容
+- 协作和共享
+- 使用标签保持整洁有序
+- 使用电子邮件地址或 WordPress.com 帐户登录
+
+安心同步
+- 自动无缝地跨任何电脑、手机或平板电脑同步。
+- 在您记录笔记时备份并同步所有内容，因此您永远不会丢失内容。
+
+协作和共享
+- 协作与合作 - 与同事分享想法，或者写一份需要与室友一同采购的杂货清单。
+- 选择是否在网络上发布您的内容，并与您的理想对象共享链接。
+- 连接至您的 WordPress.com 帐户，可直接在 WordPress 站点上发布。
+- 快速轻松地与第三方应用共享。
+
+整理和搜索
+- 使用标签保持整洁有序，还可以通过标签快速搜索和分类。
+- 通过高亮显示关键字，快速找到您所需的内容。
+- 使用 Markdown 添加格式。
+- 创建任务清单。
+- 选择笔记和标签的排序顺序。
+- 固定您最常使用的笔记。
+- 通过重命名和重新排序直接编辑标签。
+- 使用密码锁保护您的内容。
+
+--
+
+隐私政策：https://automattic.com/privacy/
+服务条款：https://simplenote.com/terms/
+加州用户隐私声明：https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+
+--
+
+访问 simplenote.com，下载适用于您的其他设备的 Simplenote。
diff --git a/fastlane/metadata/zh-Hant/description.txt b/fastlane/metadata/zh-Hant/description.txt
new file mode 100644
index 000000000..fd89291dd
--- /dev/null
+++ b/fastlane/metadata/zh-Hant/description.txt
@@ -0,0 +1,37 @@
+Simplenote 讓你輕鬆做筆記、建立待辦事項清單、記下想法等等。 開啟程式、寫下想法，這樣就大功告成囉。 隨著收集的資料越來越多，標籤和釘選功能可讓你保持井井有條，你也可以使用即時搜尋功能尋找所需資料。 Simplenote 提供免費跨裝置同步，讓你隨時隨地將筆記帶在身邊。
+
+- 輕鬆做筆記
+- 在所有裝置同步全部內容
+- 協同合作並彼此分享
+- 使用標籤整理筆記
+- 使用你的電子郵件地址或 WordPress.com 帳號登入
+
+放心同步筆記
+- 順利將筆記自動同步至任何電腦、手機或平板電腦。
+- 做筆記的當下同時備份和同步，讓你永遠不會遺失內容。
+
+協同合作並彼此分享
+- 共同作業，與同事分享想法，或與室友合寫購物清單。
+- 能夠選擇是否將筆記內容發佈到網路，並與任何人分享連結。
+- 連結 WordPress.com 帳號即可將筆記直接發表至 WordPress 網站。
+- 輕鬆快速與第三方應用程式共享筆記。
+
+整理及搜尋
+- 使用標籤即可讓一切保持井井有條，還能快速搜尋和排序。
+- 輸入關鍵字可立即找到所需內容。
+- 使用 Markdown 即可新增格式。
+- 建立待辦事項清單。
+- 為筆記和標籤選擇排序順序。
+- 釘選最常用的筆記。
+- 重新命名和重新排序即可直接編輯標籤。
+- 透過密碼鎖定保護你的內容。
+
+--
+
+隱私權政策：https://automattic.com/privacy/
+服務條款：https://simplenote.com/terms/
+加州使用者隱私權聲明：https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa
+
+--
+
+若要下載 Simplenote 到其他裝置，請前往 simplenote.com。

From c46882c95c49f6b7aaa0aae494e2f7e15c438bd3 Mon Sep 17 00:00:00 2001
From: Charlie Scheer <charlie.scheer@automattic.com>
Date: Thu, 12 Sep 2024 19:28:39 -1000
Subject: [PATCH 506/547] Updated AppIcon assets to work with new ios 18 styles

---
 .../AppIcon-Beta.appiconset/Contents.json     | 142 +-----------------
 .../Icon-App-20x20.png                        | Bin 1651 -> 0 bytes
 .../Icon-App-20x20@2x-1.png                   | Bin 1241 -> 0 bytes
 .../Icon-App-20x20@2x.png                     | Bin 1241 -> 0 bytes
 .../Icon-App-20x20@3x.png                     | Bin 1736 -> 0 bytes
 .../Icon-App-29x29-1.png                      | Bin 921 -> 0 bytes
 .../Icon-App-29x29.png                        | Bin 921 -> 0 bytes
 .../Icon-App-29x29@2x-1.png                   | Bin 4097 -> 0 bytes
 .../Icon-App-29x29@2x.png                     | Bin 4097 -> 0 bytes
 .../Icon-App-29x29@3x.png                     | Bin 5464 -> 0 bytes
 .../Icon-App-40x40.png                        | Bin 1241 -> 0 bytes
 .../Icon-App-40x40@2x-2.png                   | Bin 5079 -> 0 bytes
 .../Icon-App-40x40@2x.png                     | Bin 2308 -> 0 bytes
 .../Icon-App-40x40@3x.png                     | Bin 8208 -> 0 bytes
 .../Icon-App-60x60@2x.png                     | Bin 8208 -> 0 bytes
 .../Icon-App-60x60@3x.png                     | Bin 11019 -> 0 bytes
 .../Icon-App-76x76.png                        | Bin 2201 -> 0 bytes
 .../Icon-App-76x76@2x.png                     | Bin 9047 -> 0 bytes
 .../Icon-App-83.5x83.5@2x.png                 | Bin 10188 -> 0 bytes
 .../AppIcon.appiconset/Contents.json          | 132 +---------------
 .../AppIcon.appiconset/Icon-App-20x20.png     | Bin 1535 -> 0 bytes
 .../Icon-App-20x20@2x-1.png                   | Bin 2632 -> 0 bytes
 .../AppIcon.appiconset/Icon-App-20x20@2x.png  | Bin 2632 -> 0 bytes
 .../AppIcon.appiconset/Icon-App-20x20@3x.png  | Bin 3986 -> 0 bytes
 .../AppIcon.appiconset/Icon-App-29x29-1.png   | Bin 915 -> 0 bytes
 .../AppIcon.appiconset/Icon-App-29x29.png     | Bin 915 -> 0 bytes
 .../Icon-App-29x29@2x-1.png                   | Bin 3817 -> 0 bytes
 .../AppIcon.appiconset/Icon-App-29x29@2x.png  | Bin 3817 -> 0 bytes
 .../AppIcon.appiconset/Icon-App-29x29@3x.png  | Bin 5125 -> 0 bytes
 .../AppIcon.appiconset/Icon-App-40x40.png     | Bin 1226 -> 0 bytes
 .../Icon-App-40x40@2x-1.png                   | Bin 4790 -> 0 bytes
 .../AppIcon.appiconset/Icon-App-40x40@2x.png  | Bin 4790 -> 0 bytes
 .../AppIcon.appiconset/Icon-App-40x40@3x.png  | Bin 7748 -> 0 bytes
 .../AppIcon.appiconset/Icon-App-60x60@2x.png  | Bin 7748 -> 0 bytes
 .../AppIcon.appiconset/Icon-App-60x60@3x.png  | Bin 10759 -> 0 bytes
 .../AppIcon.appiconset/Icon-App-76x76.png     | Bin 2174 -> 0 bytes
 .../AppIcon.appiconset/Icon-App-76x76@2x.png  | Bin 8712 -> 0 bytes
 .../Icon-App-83.5x83.5@2x.png                 | Bin 9869 -> 0 bytes
 38 files changed, 4 insertions(+), 270 deletions(-)
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-20x20.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-20x20@2x-1.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-20x20@2x.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-20x20@3x.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-29x29-1.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-29x29.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-29x29@2x-1.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-29x29@2x.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-29x29@3x.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-40x40.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-40x40@2x-2.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-40x40@2x.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-40x40@3x.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-60x60@2x.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-60x60@3x.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-76x76.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-76x76@2x.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-83.5x83.5@2x.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-20x20.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-20x20@2x-1.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-29x29-1.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-29x29.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-29x29@2x-1.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-40x40.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-40x40@2x-1.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-76x76.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
 delete mode 100644 Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png

diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Contents.json b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Contents.json
index 29910c6df..c04602c05 100644
--- a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Contents.json
+++ b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Contents.json
@@ -1,147 +1,9 @@
 {
   "images" : [
-    {
-      "filename" : "Icon-App-20x20@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "Icon-App-20x20@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "Icon-App-29x29-1.png",
-      "idiom" : "iphone",
-      "scale" : "1x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Icon-App-29x29@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Icon-App-29x29@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Icon-App-40x40@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "Icon-App-40x40@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "40x40"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "1x",
-      "size" : "57x57"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "57x57"
-    },
-    {
-      "filename" : "Icon-App-60x60@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "60x60"
-    },
-    {
-      "filename" : "Icon-App-60x60@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "60x60"
-    },
-    {
-      "filename" : "Icon-App-20x20.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "Icon-App-20x20@2x-1.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "Icon-App-29x29.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Icon-App-29x29@2x-1.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Icon-App-40x40.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "Icon-App-40x40@2x-2.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "50x50"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "50x50"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "72x72"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "72x72"
-    },
-    {
-      "filename" : "Icon-App-76x76.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "76x76"
-    },
-    {
-      "filename" : "Icon-App-76x76@2x.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "76x76"
-    },
-    {
-      "filename" : "Icon-App-83.5x83.5@2x.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "83.5x83.5"
-    },
     {
       "filename" : "Icon-App-iTunes.png",
-      "idiom" : "ios-marketing",
-      "scale" : "1x",
+      "idiom" : "universal",
+      "platform" : "ios",
       "size" : "1024x1024"
     }
   ],
diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-20x20.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-20x20.png
deleted file mode 100644
index 8114c98368164d5bd276181a808689bb2d725229..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1651
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VOS+@4BLl<6e(pbstU!K6YJ_K+
zuP=iZkj=rs$|%IZ3}i6^Ap@fn14sps#o)y#4QB^2YCzR6F)*}eGO$3^L;-0K@Bm_v
z9th2}fC;WbWC1gR4N}UdFX{uNI14-?iy0WWg+Z8+Vb&Z81_ma!%#etZ2wxwo<osN{
z#FYG`RK1Ga0+22Sn+hu+GdHy)QK2F?C$HG5!d3~a!V1U+3F|8<fR&VF+bTu)1}He^
z7o{qg>Y3;nDA{o-C@9zzrKDK}xwt{K19`Se86_nJR{Hwo<>h+i#(Mch>H3D2mX`Vk
zM*2oZx<D1W#g%y_i50qe#mW#vVCJ}_7AF^F7L;V>=P7{9O-#x!EwNQn0$BtH5O=0l
zWFl<JD~5Ut=s|sujJ~0sfj%~EC7EeBw1H$G+Q9yTSZ4z=%qk$WA~h$%B{MfQuNdew
zJ3|8_6C1ES7*YtAB594ptrbZMNh`=LR{lkqslZ?Y1%{oWjXs7LRK1NpD5Q`=4iYV3
zQDD5-aoOm@<JgXCP4MQ)3=GWmo-U3d7J{uI(H<dzBC+4^%`B8UemrAo<gpvKl@7)6
z>^*RPQC;)DH;a{&cz${HHg(xmIRw;-d=+GU8LnSd!xoe#DAFbxIV-98n#E+}bHDFh
zv%9XXoRTZ^-ZK6D=5ton>ua}^R^N~K(I44U&}72<;C|1uSr?t#8+Mc&cz!9NXpyky
z`Fx}Fl|Sz{q_c>G<uOZ~k9hHK+S8WXmTmsdD{is&vM(+Arr5e<8KaR*9vjz;oF6kc
zZCK%R{AsY`nf0?;J#?DieK$0*?^$qbabjj?W5u<gGqM3^PcA&1p_AKa?$qn={(QZR
z-Q4KD)b3MrD!#szmvO&6b^VUZ(+^H-XmnxJsJyZB(}$|sLg9r`{AFvuEGpLMR({<r
zI^!gZ*uSQ&syi-4_1|?gXM0pxvGckitH#Mv!^if@YJKmylWO<M|Hw_WnB+RC^U}-U
z%!CC!#g)RTs&aFzBH9n`XgzdF+d<#>rsXW>+kHVgE45Si?QszNkY&*>E&JCa{gVMt
zuXJug@+St*qch*8Rv0=>3u&66S5#ok5GdR$&6H)hrOa%WlO2zWPfUfFYj8CGE&00R
z*Bc9G^EQ4?(cHFk;hgP;p@yv9p^@vD!`4>u&Aga4@zc)5rxWJ=?}=Woeqp{z;r8e3
z$%l4q&~Er!-Spx29j&rF)%8IsuS3MHOr3f>ZB5&x#WzLcVyt&^^+$_63TWnEs%j-B
zmThrM(DC!lxFf<>)O@>4ue#0AcGzjCF@0jZX6M3nPh7ZNb^d-kCKZzv+gkqo^~Eh0
z`+sRMo9|Y;@Gm3aXq)@a_DvHHb$DK!Ff~}?!MW{$TQ&R`r-pDaYdUSX)-T*1p71<N
z-eKGKxFZw1o`2l+-2B1yiOF89-iA}eZrNNv@Nv0e%^#uQt7i<I7`1;joO$|X?rp6`
z!Qhi`Zhn^Eaoe=7&5KzxvnWyHe~N}H_cW=DoxgZ5Mo8)H<7!QsX0b6v%Rh3%@ylv`
zclnB4AM?H`6Wz}=g>h*c>rpGY4bFUX-nq)FD)r2nFQd@9<7<jYsj1$Pp8-F9CU~@a
z9+R2<Dm7BT-LU!BO+RN(ZgI_t7iJZOOsO_F*8cF>UxRh^9*MyY&qZ_1SR=TKr4}%2
z%~k$pbmocLj#evS(U6UYx+5E&#Lv^MKE7nb+|HV%Y&!FP<;{H__EYfLw_T~m$!C1b
uPNwdPe&lMzxi5KDx7uB%U;H|vU)ihYWbJ;i`636X2=;XKb6Mw<&;$TuEoQF(

diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-20x20@2x-1.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-20x20@2x-1.png
deleted file mode 100644
index bec0614d08c428c980f44afd30c7d4b979b710d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1241
zcmV;~1Sb25P)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700004XF*Lt006O%
z3;baP0000uWmrjOO-%qQ0000800D<-00aO40096102%-Q00002paK8{000010000e
zpaTE|000010000e00000SuRAD000C`Nkl<ZSPAV|U2Kz87=HS<Zi9}owZLFyjS6Ga
zpaN#VT##VQj1VOuVIW=*ff$V!fKft%Moh-dydZ?X#Bc!wmtBZ35;Y=W!V-pyC}tpp
zjcj8-Y%S|Lu<O>Yp0}p+`#I-)U)No5u{UY@o%cNFJ<oT}``22QZf%a^DHiKf%q>A}
zieS1oG<AaMo}fKl1IqP<9w+8`GT?An(a}4MuKoyOV@gEo&yzyXHzyN2s|r!Rc!r9>
z@W>c0{~kpBRX>_;4XNhL4lL>BLH7&?PJdAXcdkRaXY=hL95~gE_TGpTr=3hYNcOxp
z-;f+_x~#;7+Wn=dEX&h!kd93g%*@b3oem3@zmOx{Kso8KTk+KnAF5uTrBq9w^}BN5
zrM_%zSnbixcxPvVM_dO~C@dBWc5f;~#fxfxRX|jah6Hn6c6|Nuv&eGlp@G3s#N(-#
zaw55ZyAN~nGgM@F1O2WV)V6g6@XX9W5sOr<3=Bo_OLI`GHZ^u-+wtN0xrSINLCR?x
zUi<HA7e6<RYpnWYJ9_-7MP|}a<?=lE3iL0YoTqOo!FA<s*zJ}Cey-bzS6C!!CG;eQ
zcfY)ii@yzMrwqqds|D{=xTQEL!BsD-9ht71Cq#13(Kb|lehalf_u)}!ln3MLDqd3W
zp#=#E=H=M2z?-eYFJ0uq#x?qAPJ-?|2&3lPPE_u^iH~aT;_?k+|0Lh`NRqse;Osnp
zgzeho#p)%wNlx7FF&5ZV+CDkdiY@H=Tkb#M;*v_yUNkQxNF|IXHs&`6K6nP3-!PYK
z|8D;W?^oZ!sULfJ<`OztnG_NvA|j!{*;VDm;oS>RJU>eW8`no;aU87c!m+d6<2vO-
zoQ_-|!fwXTlCY7KJ)eWqr6p**8Nv_O0%*7~2<l)&@=bjY3THX7wme@23524mv2q|J
z*!yTii4#6kRd|(^E&7Bbu|#`Scc~wLwetP0=1eEbN?nQMpEOE+qez5T><^COes@^3
zj;qgd+VJLze4N-@jD1^+Fg?qr!#xhiP<yd&Tu+ft6-gvQg0!IFk3rEosh&>tZI*zK
zeY%j_Oq{zC7_Z@1|CH|`C3yadpSA2_2bQvAlZ%S7!AtJJ$5D1W!-z)XsJrz4Y4Yqz
z33fb;;6h`7x6ZWgt(E)+wY4jZ`bIzc2IRpgB}gnNH3TI-V#Jg>A-heVvgqY0^%#jE
z!G0DjdyltaY=T!!LBU&l;zAE-&PWUil7Z{2Y*nA^n2<j<wS>TXx5%hD-!?^%NPhpT
zAD<m=lO|%qDTTW2vkiWwD&=R>1j#aWCmZ**z$i5&SsXvtgKO*r(~$}PE?!bR9cx$S
zW6iRen5Id{R2hzZ*M*;&Qg33lFEe3+NkcYv2L-I#_OcpF{Y7_R1f48GsX>?w5!Pa}
z#_7M82Yr#m$LyL^a4Gp<DuyQuJ4G<vlbkxibWiYKrpZr}Q6G%w00000NkvXXu0mjf
Dg1$Q=

diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-20x20@2x.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-20x20@2x.png
deleted file mode 100644
index bec0614d08c428c980f44afd30c7d4b979b710d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1241
zcmV;~1Sb25P)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700004XF*Lt006O%
z3;baP0000uWmrjOO-%qQ0000800D<-00aO40096102%-Q00002paK8{000010000e
zpaTE|000010000e00000SuRAD000C`Nkl<ZSPAV|U2Kz87=HS<Zi9}owZLFyjS6Ga
zpaN#VT##VQj1VOuVIW=*ff$V!fKft%Moh-dydZ?X#Bc!wmtBZ35;Y=W!V-pyC}tpp
zjcj8-Y%S|Lu<O>Yp0}p+`#I-)U)No5u{UY@o%cNFJ<oT}``22QZf%a^DHiKf%q>A}
zieS1oG<AaMo}fKl1IqP<9w+8`GT?An(a}4MuKoyOV@gEo&yzyXHzyN2s|r!Rc!r9>
z@W>c0{~kpBRX>_;4XNhL4lL>BLH7&?PJdAXcdkRaXY=hL95~gE_TGpTr=3hYNcOxp
z-;f+_x~#;7+Wn=dEX&h!kd93g%*@b3oem3@zmOx{Kso8KTk+KnAF5uTrBq9w^}BN5
zrM_%zSnbixcxPvVM_dO~C@dBWc5f;~#fxfxRX|jah6Hn6c6|Nuv&eGlp@G3s#N(-#
zaw55ZyAN~nGgM@F1O2WV)V6g6@XX9W5sOr<3=Bo_OLI`GHZ^u-+wtN0xrSINLCR?x
zUi<HA7e6<RYpnWYJ9_-7MP|}a<?=lE3iL0YoTqOo!FA<s*zJ}Cey-bzS6C!!CG;eQ
zcfY)ii@yzMrwqqds|D{=xTQEL!BsD-9ht71Cq#13(Kb|lehalf_u)}!ln3MLDqd3W
zp#=#E=H=M2z?-eYFJ0uq#x?qAPJ-?|2&3lPPE_u^iH~aT;_?k+|0Lh`NRqse;Osnp
zgzeho#p)%wNlx7FF&5ZV+CDkdiY@H=Tkb#M;*v_yUNkQxNF|IXHs&`6K6nP3-!PYK
z|8D;W?^oZ!sULfJ<`OztnG_NvA|j!{*;VDm;oS>RJU>eW8`no;aU87c!m+d6<2vO-
zoQ_-|!fwXTlCY7KJ)eWqr6p**8Nv_O0%*7~2<l)&@=bjY3THX7wme@23524mv2q|J
z*!yTii4#6kRd|(^E&7Bbu|#`Scc~wLwetP0=1eEbN?nQMpEOE+qez5T><^COes@^3
zj;qgd+VJLze4N-@jD1^+Fg?qr!#xhiP<yd&Tu+ft6-gvQg0!IFk3rEosh&>tZI*zK
zeY%j_Oq{zC7_Z@1|CH|`C3yadpSA2_2bQvAlZ%S7!AtJJ$5D1W!-z)XsJrz4Y4Yqz
z33fb;;6h`7x6ZWgt(E)+wY4jZ`bIzc2IRpgB}gnNH3TI-V#Jg>A-heVvgqY0^%#jE
z!G0DjdyltaY=T!!LBU&l;zAE-&PWUil7Z{2Y*nA^n2<j<wS>TXx5%hD-!?^%NPhpT
zAD<m=lO|%qDTTW2vkiWwD&=R>1j#aWCmZ**z$i5&SsXvtgKO*r(~$}PE?!bR9cx$S
zW6iRen5Id{R2hzZ*M*;&Qg33lFEe3+NkcYv2L-I#_OcpF{Y7_R1f48GsX>?w5!Pa}
z#_7M82Yr#m$LyL^a4Gp<DuyQuJ4G<vlbkxibWiYKrpZr}Q6G%w00000NkvXXu0mjf
Dg1$Q=

diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-20x20@3x.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-20x20@3x.png
deleted file mode 100644
index 745562322fbdbf8b19e43c4483813e77029c66f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1736
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

diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-29x29-1.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-29x29-1.png
deleted file mode 100644
index 36208363290a7ce6d57621b2d8b39671e5d481e0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 921
zcmV;K17`e*P)<h;3K|Lk000e1NJLTq0012T0012b1^@s6R+DEB00004XF*Lt006O%
z3;baP0000uWmrjOO-%qQ0000800D<-00aO40096102%-Q00002paK8{000010000T
zpaTE|000010000T00000{j)S{0009FNkl<ZNDb{)T}V_x6#mv#*L8o>t<<y>Wz)@2
zvam>_9s{#pdy15Lsi(s7K}zZGp&mpc0<|C_%Iak?=%GmZQ41lVP0TX0Hceg4{qf&*
zo4I(`z4y+z8-g!&V3~W)obP-y=ggd0Rl(7Y09IL|R+&$r`%fA+>t=m4QrBq^tyYEg
zl{-Ys4dL|k<Tz9v*@S$nUT~fF2jKWR0sAW#p0tj_zYs10p!%EBtJkV=uO<g677a7<
z7v~htH}v7t_bKMQXk7Ln$y2u{-^3-P0kcxIsIT0N9XSRuK6B)ft~JM?yd+5iN=l5C
z=qx2ZPK~Q4Gm%E>%@ZzZb$L26QnV6WSKp*W=P9%d7mj7{rokjFv>8yi#faQYodnqa
z(SznUqY@iWq1fU)6LXqLT3T!ooRbn_u`Aao0aiDD!<9Sza1PH%>@4L#Q6kIC-s$eG
zODjBmI1QQ@>0Nx>;=-Xy2Tok;!OPBZEG)3wccIM)l@uy0La|eN>GkpI;0o!zyis9=
zNw;JZC*O8?ajLEt2hTdt@_t-22S**L?HYr!6(~s=PI*~++^))oHBEZ3#OQ;gv#7Y<
zi@Q&UL{o4y>LMU@`{sjy(2tGl<49w$;pQ1D_HHvHN|v?&$#89x6AkvkP#C-u%6N)p
zj1$s{DL-gxSh79a0Qz&e=Y-aGtN9nEXP0_ky?p@t3e3pdpoNDJj(L@&iuBSIw>dm4
zK8ej@ia}XPGMX;hU?Gh}6xw_5KN}X*cckVto?H~9)WQDRCHLd%v=3i8E^P$ui;I5r
zVuXoflD2;EptHxv1h9++B;BFAr3b6c;YLTdm*vjBr_}Qtc`ay7A{F_wTGQCig)(<a
zy$4*g!X5NY`nh0n;>XZ5hJMe9sxZ=n#uF|n1$2J)q3m)uy8HQ!K0r=N?E@z-KGPo2
zBTie{{+$UZEwTvz7{qt>=g17|9y;;7L)nd(Y>UQ-NJ9gtNp6x8HJF_7W6TqI%|l}-
vnnUO$>zm#~C)wdjWZ9aoB=B<Be~0uB3V7k=6onLv00000NkvXXu0mjf4Wgb*

diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-29x29.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-29x29.png
deleted file mode 100644
index 36208363290a7ce6d57621b2d8b39671e5d481e0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 921
zcmV;K17`e*P)<h;3K|Lk000e1NJLTq0012T0012b1^@s6R+DEB00004XF*Lt006O%
z3;baP0000uWmrjOO-%qQ0000800D<-00aO40096102%-Q00002paK8{000010000T
zpaTE|000010000T00000{j)S{0009FNkl<ZNDb{)T}V_x6#mv#*L8o>t<<y>Wz)@2
zvam>_9s{#pdy15Lsi(s7K}zZGp&mpc0<|C_%Iak?=%GmZQ41lVP0TX0Hceg4{qf&*
zo4I(`z4y+z8-g!&V3~W)obP-y=ggd0Rl(7Y09IL|R+&$r`%fA+>t=m4QrBq^tyYEg
zl{-Ys4dL|k<Tz9v*@S$nUT~fF2jKWR0sAW#p0tj_zYs10p!%EBtJkV=uO<g677a7<
z7v~htH}v7t_bKMQXk7Ln$y2u{-^3-P0kcxIsIT0N9XSRuK6B)ft~JM?yd+5iN=l5C
z=qx2ZPK~Q4Gm%E>%@ZzZb$L26QnV6WSKp*W=P9%d7mj7{rokjFv>8yi#faQYodnqa
z(SznUqY@iWq1fU)6LXqLT3T!ooRbn_u`Aao0aiDD!<9Sza1PH%>@4L#Q6kIC-s$eG
zODjBmI1QQ@>0Nx>;=-Xy2Tok;!OPBZEG)3wccIM)l@uy0La|eN>GkpI;0o!zyis9=
zNw;JZC*O8?ajLEt2hTdt@_t-22S**L?HYr!6(~s=PI*~++^))oHBEZ3#OQ;gv#7Y<
zi@Q&UL{o4y>LMU@`{sjy(2tGl<49w$;pQ1D_HHvHN|v?&$#89x6AkvkP#C-u%6N)p
zj1$s{DL-gxSh79a0Qz&e=Y-aGtN9nEXP0_ky?p@t3e3pdpoNDJj(L@&iuBSIw>dm4
zK8ej@ia}XPGMX;hU?Gh}6xw_5KN}X*cckVto?H~9)WQDRCHLd%v=3i8E^P$ui;I5r
zVuXoflD2;EptHxv1h9++B;BFAr3b6c;YLTdm*vjBr_}Qtc`ay7A{F_wTGQCig)(<a
zy$4*g!X5NY`nh0n;>XZ5hJMe9sxZ=n#uF|n1$2J)q3m)uy8HQ!K0r=N?E@z-KGPo2
zBTie{{+$UZEwTvz7{qt>=g17|9y;;7L)nd(Y>UQ-NJ9gtNp6x8HJF_7W6TqI%|l}-
vnnUO$>zm#~C)wdjWZ9aoB=B<Be~0uB3V7k=6onLv00000NkvXXu0mjf4Wgb*

diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-29x29@2x-1.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-29x29@2x-1.png
deleted file mode 100644
index 8b471dec93d0c48ba9d316398661a4b5fe9db50a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4097
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

diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-29x29@2x.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-29x29@2x.png
deleted file mode 100644
index 8b471dec93d0c48ba9d316398661a4b5fe9db50a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4097
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

diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-29x29@3x.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-29x29@3x.png
deleted file mode 100644
index e1c26f8dc8af9179abc2de48e2f0b2ae7a96f702..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5464
zcmZ`-cRbu%(_f2d!6kanVo4T@=q;iwqW6*|+AgcJdKb|mN-WVyNKrRLi5i{gUGx?q
z#1dW9mwWGfpXc*F?{j{i^P4#{-|x(vng33Vj+P2JDHACG03cUWRnohX#@Czp#?{~b
z%aqfVAh3I&`2YYYPar$9BD^~LB23hfnwo&SS2{6(5RV#wf2HAFeE>Wrz%}AZ13biI
z{zuot<NX^01OTE?0D`|UW>@lhsb1}C&R-Jv3iuDg_!a)Y^lK>lE0VWYg2YYL6b%57
z-MZd*fQ&2#004LcWnkiIqNyQe<LWG6W$S8<5b$+&yJi7oe5I~bXN0E}hp)4f3tGxo
z7W5}V>Po*hLqQyWLOdO1K_;3y9Ez?U2o6yJ5dlGv94Q9}hm40UQc6z=_BZ|NBnz_l
z^mLPgLVbLE1bprZxO&(@g(M{<p@PCtVPXC&1V7r(#nZ}{-v!P2SCIdWql7@)c%a-o
zQLZi=*Kw_^UA;VIL7?kI|E$02MEIiqmB|JD_qDDr2)*_|g#-kl{~yg0h5RqHYtLV_
zKkxNdI+^QWQaUJKgp-L9${FE;zA8;lNKjZr=FdF;;rdsl|3)?a@6>;D{TubV7Ab8H
z6ymB)*UgX<l7aq*?Qgsc^tx03*15mN@~8D`E^?$Y(0^tuM_Qs^fdK%hZPk<>82IAh
z;C{&l<LQ?NdgEk`!~GK?(jsvqJzx+iih))%9(=DxP+iy~tGm6gCXqqbox!fTAVy1u
z%bl?s*ljy7Y%h$qg~^8T{sA*3@3||YIVwLR(l~TF-?#1ac;VgCts?)bp>vg>HG}bh
z5A&y6jZLTZ3+JD==Zk72dwp_MH1eLv2O3m%CNmLOFT!3B3%S`W!l=S{i{gdEZ@AD<
zMdxiWp#Q_v&btv`u(5Y@g!X-xTJgO9K>wY=ey{ACAjbVg(ji|^Y6e48I{}d-9_!a|
zq<DgKeW*8^=eqyR*=AzmW-jj_Jp~qrNA>0P&xpl5AHRY&iL3gPtR+g&yz8*B_h?v;
z)|#J~@M8ncdn+tbbB1)ivc<}Gt3GQh>~vv)Y&VnZH~6kjc+zNSC~Li>x6qa`o2efj
znhd))j^mY_dp6fKT~=6`O(U1EpGDBury<xZ=3PL4BXT&LdR7BiUt5CjL&s%>!?zJ!
zD{`_$`kw2l%jaV4J1;m7j_2ah$K3<S>065@!!fFF%u(PkT>A)7X7_OZT<P{(QKj5C
z-<{$%_l1!ihNO-Cru3oxiKzBo-cwZ~oPs+Fe}2v^#`QwG)M~F)hEhtB%S@V;c?%sd
zMnObg^MpV95Us98WDz1ke>5vMAW|0_N?cz9=p3aFd|cMslliMt`n&Ib9McMUT-R6$
z!PuvRIkgusKOF+9&Q8+F5sC(ng<lqy^}m&YFUSc><f#sUhETjxyTLun*&nx$C(eIQ
z9<>#kNDRatP5Esod6`t+W^;2JZ|15q;XW`o5#wa+MUisN5p<@8ty(9#(%E}G!xz>u
z5v2KPL~o7TU78Gh!|JJ!*yk}`KAcn##_W_m1*?O*^A`VTZ99sGQNP&AYhz+>zDYn9
zEu~syYmroVy8TkK^`#w;)#;SL*l307+qeX}W?ekv&=}g5=+q-t9>?t*%o9dqWTuJ&
zqNHip*1{INf704OC2<@M9CP=Oo*5z6%o_$sEH9EyDmk1l!hLka`rBZs<DNF%qU)+w
z2?aY;ARM=ebhY%r^XHIvwn;67owCKq#3Y6HPnA^+Kol-O(JdRUgEM~9#HML%S|z)#
zjY#>Iok8~d?X$G&H!R?lQUYN&jNjQU*LXHG`roAx%~fH>m)B0r$605eXRF+VTcxG2
zM6sSu@8lk>Sx@2ecY^)iGkToUVt*nfJWMG1_u09QN2z*z=oZgn7$?tHxHcunQ3|+=
z!o|<Y(V>vg_K}5qMJK6EOwXYFjNvbh5c&g|KX@&x+QEuTp+2zv8+d%K)&t{`$Nl1a
zWhoX<r>P2uZ&A5nP#?5}Dc!n~xk^mr)`5VM0{Gn!>rIH_Xe4q#0H0$b>SFIv*J6yc
z@J_HY&&UrVq5^LnQF3Oup#nya#5~iEEiJUq)6N&-WVoxms(`H0E`R*%_cxx*lLqc-
z`te%p4=XJnG@1*NB`O8;>Da}D!BtfL2ZSYnS^qrz%YiRNWgNX4G$Xujc6K~z&kn^;
z$z~|>?(^}mG5busZp^P2ZzXLs+R9D-$#dU#>=#W*V~B`1t52Q;k;l==<}Is(1msty
zI-##C+{;@tyU(@AY^VRAB;9M^b+#gQWOPtJ_&vrao4s>UN13@Z{F!Ml4v{qItb4x_
ze7Q=PU*_aO8b9Hc{zWM3iQ*085=|@HgYIrE8TUa|TRZObC2l%m7EPUdyZXA1zdD1;
za$fkTnRmn+QM46mkYg=EMpo?mHRc!aQ|+Vs2$}Cfo}HfL#<kvoJ%2bBr5~5rlA<Zq
zwK>wD#>SU(zqNAc<Aj(`XXVXrLdOuLH!eH@DsMZ#v1X)hUsl$9La)SHXq97Ts_sQu
zt#8_5N{k5@i;f+Anxw`vQTv)lIa}@GF8vSaZcSMimu8)3N!`JZC2at=bKO3nCGWmb
z=d4^C<9p(BU~<0vzB8o)tH+U$|F}b-sSJ||>iEFN7-@a7zO=%o05o1IjcJgm5J<~J
ztKBkCizwe^x%kLSb}HGPgi<(*0T|_Y?f6m}IhVA3HDZ@nGYwB)Om3%YPVJyOGC*%V
zce=^?A{6E=Wt^grl*qO>LU+gKR{~mJNDkUh<22>qcsrBN^kX8JQ<Q>LwzHSL9e50f
zF!mXS`>0O~{%%n`PFQ%ES6AI{+wG*F!toQ)>-O+jpETMYHvHp7p|7O{llQpi101>X
zRh@mx&h*cab{P_LLL|9R3;F0q;N{!5lE+OSwJ>ieY+?N2WWv;Lvgv!{#siBlU2$C}
z;_A8{d11Xjv~rA3aKtfO`K2fwM{Mp35;p~-&s;P=xBbKPA{eMgRxKpC&-bDa(carQ
zn_oTe&;{Shz7o8C>ly+I{r)8u8Ve5S8#&p{&B6;djcLlwZq@2<9v>AJa(80VOCO--
zpni{G9m<9*HPUM=7qC#f1}^G|)LJO&OHaCdi)=i1jrd~S+M#yqu<}=)SwV~SRJD1E
zNlhMsxCKs`Kj<;p7v)cnJ&ImKL(Ie;#b3NWaWQbD#2-x6(r(Qi7;Jsw_)!P}l*O=>
zBc{=xa_{ONINEPCn<s2{tw#z}-04W{i4ZnMJ}5C%q!jhC*;0ZEkI23&h{ct<{*Lzp
z@O-B7Jz$3|9udvFP-JHLB4fhp@Foo#qr4tfxV~eOwcVkh6&R34^hf?4yUg>hocqz{
z?8ef?44WEwG)1*#thod7_N!01SS;t2Fd5U^FnAaQ*TY#!HQSw!2~Zecj6ItP;IaOm
zdar!Po+z>&Fe#>Lqeztvmc=Q4c^jV>!^Zc9?C2~W2CrY{WeYw89I_P%_33v-l9qX0
zf>*(KeMkNhg@tXi(Ga({k2+bMW(%yeo`BPU9R$(_#=$ms*&Zdu$K_TthZ>rSd(kzw
z_eDRU6sn8y-iX{(;(MokKGMaXb}&R0xINA(@n~*ZJ=Ahz-5%$+T{sraQjI}J@b96I
z2qfGIT|Nj<jP|i%h64DT!w|aEc9q+5!sH9}Jj~4ZUBp|WUz$7-y%j{uSt5$(&<Yn6
zX-SLQb}Hz2LVLQ?l2c(@ey=;Cb@{nShMaigw*CX-#lt^3WpY|IU0phWo3Eiq$6wzq
z$MNj;ffI$NE1j^`sv*%h!9lY`+L!ckI~;L}zav%R8O62yoqxM*WUn+1X)PQQ<$r6%
zw9J+U7^uHYvforJqcpD>6e+WNK7Y_rK6$B!hqXD}Y;40Je;@>P`R`BT`T}1QbUE=(
zV`hA8Ueou67=+nbT+mFfuFzRVEH*Z7QJWtv76E{KpLh*)B_M&K8t=9HTcJ63+dnjA
zM^zBm?v;CMnXT2biU_Qf=^rG;+4?h7jrr{vT9lkQ^BW1-4WsZVMu>j~tMh(p>!Gdr
z>{jhCO`#~#ZAy1X*F)U2AxQJ~L`V?LUXy!dw+c$2^647{J-3b$=%CP57HIeYUa;)c
z^b|8U%DhpA3@Z0)_jY@=_9*Q`_3}Ho>^CWedxYic8_b*)tK6Z=AVLslB=<Mhms-uN
z;;YtO^A1jvX5q$%ZV=uFFr>_?U?G+k`8{O(6HtJGDt3^1G4s9O4(>oSEzO5o-Idv~
zXMZhU{irsQqE59X*<)Q6+afv<sxk7;CWe6ls~W|GLZaCqJHaz~!x|?m%fq8_lRh;R
z?7?~okGGvW*#uhN+|+J{`x9;?BZ2%d!lFn3*2>mIi8=5q*>{QNq4S=z5)1mBWwA+b
zLxb{cGcw!D8+X51vtpYK!_4;d8iE=c`b7kE1|P#;HKEH*Ky+jhnqW+gyW$6F*BeF#
zRe$_I`#L&`1~;UTWsrhkU?y<y8qTj_0W?MeL~(uH%sKaC46eJ&>OpS!l5kYcN&1w*
zr}TYUBe-~t+T2*oxK30J-m$<DXfW+y?P>^1iG5RGH35(A_b=SxtPS<OHPx^xJz9RL
zLTF-|9M9i@>uefVC}cDYzMFUA$Q*Lp^b&%da-KG_+A^{`c_#b8(Y|Zon{yi2%{=XP
zaW8F+ziNB`!)ILq@T9^5Cn0|)M9GM15UEa>Q<#w?&}?nAcI0e~)7Wy2@|`8$DCSX(
z!z*&uFu=r{g1I>3IPLa~1p}rh5+_iAQ@OzX(I>34G5O~WE6I-T<k*LTjwd(6DA|jB
z%q<HjiS2vs*98yLbJ2D;+cFoR?HF-{<vm<ExIrEe%OQDZXVSBbTw2ooA>XUjH*2_N
z-RcCfxn$g_a$*;@Wqc@UPQgf~8doZw^0ANfV_)<vvUd#hPGQWDQnQV$_v4Nn9!0xl
z)q^dFeZa!JQU8D&EF3VQUYC-*u&XO8GaK-FLGLLD+hTaz?0%+7{lQs0IP0Wu>dv>m
zsn-U#_wCww>!a`RC(NcMgw#dcMBdd?tc8kAkI)qK<vSj=ZXuKRjOF9)L0+LU?nPA4
zZHG>HU1$cM;)}%Q@i*Z27V5I>7sHH3Sea8DhmAExAx*0MW()TPuD;td8#7to(=XU=
zp*5M)eDC`=49_CnXiM)r@-a%^%$*p#*_+*qomT{=IzPC@69K6mMb6ca+dFOj$o7P%
zu(f1Xktl;fcJ|ap=UxJb9{pOqmlu;W{G-jZn~L1@&4w#RkG@8x&KI`uRcqhTtP-ao
zA%W9!9mX%h;(aJ9m%`^Z5zkolR&4?Eo2#|IE6{HI;>8B;>YtOugJMju3uHXIcBLxX
z)lBuwU&A{C*bS^HKegTXI2W{j&`2j-v!NOB`uA+)ew#QXaFRJ==cv@+M;Ap0%~B9b
zi|KIO!w>e^m_4sJBaLS?2qHTZhQ!{Esj_o4D?d4S*vIm7r#_~PG9?vG$_Pg#y=HIA
z3CR@bzx;fZuDj*RV4>&#6dD~jp$th&?3qlv)A_kvl)IN?DEJepfPD4Nr}m_;Vp**`
zDe;3P&9_-d$l#(dir;})8~#&MLXkEHk8<*x@2!{Qq(v|gVhW4%fhs1Oo(R{k$OkuI
zQL#UN4Gk9Qhz!_xUls%{shTVnSsLoxQQ-Hw{|TFX@p{fiI&rndeHe%^duoo~wv-vk
zv#T=2@4LFjlbDiexyy6G@WGpi(<;1}RIL0-Y!vt6cmBBJ@sJckeV4Iq6ly7rA}@q6
zubNEe(-y(}5?v8Q_}B;EDg%F}rmQ6eWT?|S7kk`9-1`{Yyo$5aC}0|Jh$wwEqb;3$
zzu1A(p@adC4)288Dz}wnTO`D`CW0g*a4W{%CZn$D^mJrt+f1q15D#b)K(dNH9bSI_
zuzw!!XTV9ZJXh1Gt%H6<E(>BTh0S*_25|Usw=EqbNOG)t8=?W4lJG}@QNmG@6Q+>Z
z^ng+vxi&P4-s*gF_g=rrp6)&D_oj&B(-*Iu>j5tp*dD;+Hlm*t_jCsh!`4in&wL0z
z<E_v#><k}rYlK_0vwI5_SlMHL8NDJ;R-%E6DsWT}xsWW@X05Esdf#Lg%NE1klLSN-
z3|p2<X`Mi7dsn-~2bP)Y^p~DuU;Idn4ljP#eKCzljo1&{4m{z?c@#i!(6<SRrA5*8
zvJjhe7k|i>7xGbfR)w!>rk`363h4*xDC%Kmt+91-7e@S_&nAPNF7q)_e=t~=G0;<B
z4jRBh-Hxs)OWl{)4v<UVs7E|{JW!OwRTtm5v^=gDli7(=rk!P#yd1VZ+sjat(9^S%
zlILIs-?AdI*Mx>CA8jBQPfsF+&pHx%bw#Ee^I(s>Ej5Sh+YVOObcz*NG$J3CHzZAQ
zR9qZPXw3fR;e2%|H?-XpsI1s{ANEMztI1m!8+873N_USCSR9Hh`+~qXCO4|+;63+x
zMRDO4$${zbt)ab){fe+&rA=qZlqO(gWShoa)be!p%uQF<Gif)P#)S6;^CPzoJkEb6
zO;bOI8@UBRxWGTRwUep%kVYGxDc|e|*7!o^R=6}6G0$hM)MguVqG>*w{e;J9W=oh)
zMK-Er{93la%IxvHsi@3+p)Q4wV?3_zXQO1ODGH5jB)%JK>Ei<Ftu~%X-CqXRS=7ZI
zQUlX_yh<4ZQ6w-)M8*48A$ih+<jwWPtl}@QxvalQrK>D?&uoRTYds&MF1sebnM(qS
z-Gbj!3^#fl?BCHSWt$UDvz2dYWFW@l4oyiJ(Q=2>36vWXyu%x>m9bwSqOGCh#?Mk7
zvskfXPYwLc8W^Q}fF^p3hPuXGJ=9QbGt>yV<wwiY7<Q#G<BLBdR?_u)Ui*Jd2bcJ*
X&mjfw2@+Y??~H27T1r?2%P0Q>gVFn9

diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-40x40.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-40x40.png
deleted file mode 100644
index bec0614d08c428c980f44afd30c7d4b979b710d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1241
zcmV;~1Sb25P)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700004XF*Lt006O%
z3;baP0000uWmrjOO-%qQ0000800D<-00aO40096102%-Q00002paK8{000010000e
zpaTE|000010000e00000SuRAD000C`Nkl<ZSPAV|U2Kz87=HS<Zi9}owZLFyjS6Ga
zpaN#VT##VQj1VOuVIW=*ff$V!fKft%Moh-dydZ?X#Bc!wmtBZ35;Y=W!V-pyC}tpp
zjcj8-Y%S|Lu<O>Yp0}p+`#I-)U)No5u{UY@o%cNFJ<oT}``22QZf%a^DHiKf%q>A}
zieS1oG<AaMo}fKl1IqP<9w+8`GT?An(a}4MuKoyOV@gEo&yzyXHzyN2s|r!Rc!r9>
z@W>c0{~kpBRX>_;4XNhL4lL>BLH7&?PJdAXcdkRaXY=hL95~gE_TGpTr=3hYNcOxp
z-;f+_x~#;7+Wn=dEX&h!kd93g%*@b3oem3@zmOx{Kso8KTk+KnAF5uTrBq9w^}BN5
zrM_%zSnbixcxPvVM_dO~C@dBWc5f;~#fxfxRX|jah6Hn6c6|Nuv&eGlp@G3s#N(-#
zaw55ZyAN~nGgM@F1O2WV)V6g6@XX9W5sOr<3=Bo_OLI`GHZ^u-+wtN0xrSINLCR?x
zUi<HA7e6<RYpnWYJ9_-7MP|}a<?=lE3iL0YoTqOo!FA<s*zJ}Cey-bzS6C!!CG;eQ
zcfY)ii@yzMrwqqds|D{=xTQEL!BsD-9ht71Cq#13(Kb|lehalf_u)}!ln3MLDqd3W
zp#=#E=H=M2z?-eYFJ0uq#x?qAPJ-?|2&3lPPE_u^iH~aT;_?k+|0Lh`NRqse;Osnp
zgzeho#p)%wNlx7FF&5ZV+CDkdiY@H=Tkb#M;*v_yUNkQxNF|IXHs&`6K6nP3-!PYK
z|8D;W?^oZ!sULfJ<`OztnG_NvA|j!{*;VDm;oS>RJU>eW8`no;aU87c!m+d6<2vO-
zoQ_-|!fwXTlCY7KJ)eWqr6p**8Nv_O0%*7~2<l)&@=bjY3THX7wme@23524mv2q|J
z*!yTii4#6kRd|(^E&7Bbu|#`Scc~wLwetP0=1eEbN?nQMpEOE+qez5T><^COes@^3
zj;qgd+VJLze4N-@jD1^+Fg?qr!#xhiP<yd&Tu+ft6-gvQg0!IFk3rEosh&>tZI*zK
zeY%j_Oq{zC7_Z@1|CH|`C3yadpSA2_2bQvAlZ%S7!AtJJ$5D1W!-z)XsJrz4Y4Yqz
z33fb;;6h`7x6ZWgt(E)+wY4jZ`bIzc2IRpgB}gnNH3TI-V#Jg>A-heVvgqY0^%#jE
z!G0DjdyltaY=T!!LBU&l;zAE-&PWUil7Z{2Y*nA^n2<j<wS>TXx5%hD-!?^%NPhpT
zAD<m=lO|%qDTTW2vkiWwD&=R>1j#aWCmZ**z$i5&SsXvtgKO*r(~$}PE?!bR9cx$S
zW6iRen5Id{R2hzZ*M*;&Qg33lFEe3+NkcYv2L-I#_OcpF{Y7_R1f48GsX>?w5!Pa}
z#_7M82Yr#m$LyL^a4Gp<DuyQuJ4G<vlbkxibWiYKrpZr}Q6G%w00000NkvXXu0mjf
Dg1$Q=

diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-40x40@2x-2.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-40x40@2x-2.png
deleted file mode 100644
index 5b9bce6e4be0ddf4e5bf7dbd1fa24274f34305dd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5079
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
C?>NT*

diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-40x40@2x.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-40x40@2x.png
deleted file mode 100644
index c791c5e0aa8f28b92f69a357903ccb4f2657f2c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2308
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

diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-40x40@3x.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-40x40@3x.png
deleted file mode 100644
index 2659a24e94d5f8af540fba5af224abba67155934..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8208
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

diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-60x60@2x.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-60x60@2x.png
deleted file mode 100644
index 2659a24e94d5f8af540fba5af224abba67155934..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8208
zcmcI}WmH_jvhLu)6EwgC2*G`D8Qk3m4>GvJ;1Vpj1%i8U4-!0B0t`M#2AAN$EkKZj
zOU^m(+_Tob_vh=qdRKMV_f=I_{n@>CjHbE*J`N=g006*OQk2zxl)iuG6U@iAu$92{
zqd>QnQj-Dz8j^7DEinEXtqqiH)YJg1kNOh;1_}`X?NLK{d;lnvfWL@G4WNud^>1Ap
zh526?Q~)5#9)SKYjM1a~I}{)1U(P=zY9Z>s5x#|J|E>RpetKGO_9(F36b)ej050+0
zi2}&ZeGUMiV%qB(cp9jwia=eRIW4SQEv-3yo!$Pj0AOE{N7dQd(}LF5*~tYa;wwh?
z4}{30{&$;;j`klAPe(C212s)r8CMT$T7FJGPHsAJ99mjhu!oh6h_<Z!zvz!EF*-X>
zPd5=RE*~EsP9I)QR}Wh*kg%{Y7dH<V4-dy9f&=E~;%VW_;R1X0PbdG+kE}He>S6EZ
zY47Sn``539rK^{x7#-c;K>r^9%+uP}{=Xx+!2Wft#{+WxwQzwrxw-x~ny0<Z|3Uj}
z`6ulk=lW+j@Ly*ln)bfdP6o2}&ekrl$JE3@+&p~Xf5iD8rvJ|LKd6TPH}yYE|3Uqm
zi-?AYz4c?6{uV<V1m^l5d;h|Nx&Bt_KPvanw)|uFu`l8{V6K1nSRAKDr|CTa@B*kL
zE2Zm;a%76_tA}j<!;63^N<VqaVxB37J_W(hdUw0%P(afXbaZX!SbbSt+hS04bYO*L
zd<3pCtMu|UsuafpK4n5@d9EpoIckSWANtO3Lhbxda6y2yqD)Fo!0~w3b?3ooSNruc
z>}nz4cR+2|m678KvHR*sipyITE8(XUjU2dwV{Wu~ZqYt(xqB@_WOC77u70jZk3u1E
zCwS|7@r4M8Dbz3gbYmP>#qIg`r@NBTf?Vu<|0{3<pb+JI=bvpGw(7klTC~e;PBZiJ
z`fOF=T7;KbA`;wdiq4%9Js^iNb?+u{`WB{7{(b*AGVZ}EPjL>DH-f!451lz3O;g$F
zElPD=EiT-sQxiEsBZ5sK#b@XEj_%h2=-E!`#rt2vv2am8_3CP>7a|!X@#aw^y+i`9
z{O;d9qX`uVyI8~~pOkz{L<e%!CE=tZPZ--`rXQ3m4DXq1_54uRj;nAWat0AYRMXw=
z0~&fWzbVFR#LBWFoOc__5?v}bWigU<qwsn++UYq$Ih4ytTq@}6y;j<6yn*RsYJKrV
zB=N&4lKu|t8<xdSU#Jb+xc>MqS9@e?=d>@WW-7|6-m-Bz1vwO+4oko?Zn$y7Vh}@(
zD5ld&rM8Yd?0{6A(V~dZ1IXHr(AhXRr|nkoPg*zk7tVg&>j?`5doy}8ZurSRr1lnQ
z-{`EtC@DoX-xOgyh%ARVpCC6+mU8MXY(+KV`%|XKmeiY{TBp!2-dc5IelwP>x7Azx
zZqu(&6v66gT#4Irqe=z|EcuQ%X+o(Pfm*6H_tU@_JX=dM=1OV%>gj@Qy>s!~3~EQ&
z;W{I5Lj$JcniJ-EQN5EYUbb-AoJU~N9!#yU5cmy%%Un64TeT(6;}2IN&%ZT75$~{y
zU;n6E|2mljgd(Ur&Cgecf2xJfSv1$Ihpc7xYo!bhI;N)%=%Sb@A1vhNz#&yLwYe|f
z5e%}fxIVx1lfvhA=Z4nd6%tYEAU;yYS!Zlf<+lsX#T2nD<K|eLX-oPT+BJQi$tx+V
z!>4M^?>{2cw?s@4uyZ8J@bX8O2q)%+WniFV)H12y#k<dSZ)M^Vnilv_npAE6usi7^
zmENaKu?$^OD-^Ysf6p_$aoWI!Q~#&Va@ot2@%8eQ!zV@RT9*a1P-!XLdMlPh)!?Qt
z5qc`xZb#=0k>x4Nc50SElG;cy$xbQY`;2HkGv+S`J-Kg3T3kN&Po%@`GieFXGlRZj
z({Q)?BwOZ!b+&VR64hh+N2=kp=^HgHN%V7bRw3z>WwMT+XRqVPx6BX32HM`Jqt2e#
z%ZThwO#hfZex=mC8%bzXt{mr%<sj;Qu;EFfq0Z|wwLDuuZ*J|5YuAM%&$KSMmL1tC
zkr$!w-J0`~KJtY-J&0N>BnmAmli{Uvp%j|(a7u(B<_tlV4JeRa@fxWz4b(uMUn0oY
z`;6r`$A7;VTwyV`D3PQFg<zyCy*_(FO!Xz)lP9o>nLv(stE?XHWfIPL-*AdeDEsZl
zYTUCVBnI<M;a7Anc^s=Aw3;2q`@n)f>;B3gLawZGiF#R!BLD>w{Mbq{Q}SY0Uh1c*
z&t9T6c1q2$v-J|UlA7N=>kw74QN4oI-ecB>B=<A&YG2s2<FX;t`UTT%E!lzw&tG(k
z{wW;KAQRY~{t9w;3KQ;uRge=Jb?`C`RThB^JujzG!S~3id1bFWNvghC$%$qAQ|)`y
zddgDC5U@G}e_mS&E#||;HXX^%%rleO81yig2Iwiy0bY2ybl@J|O*FWDzT?a83FUj|
zcM_Kk()SM50s_ab3L?cO=iN8Bb_HlPkrh(IAiU$r(U~#C^+!$~t-Quq2rXMmWVG!Q
ziuJ<o_fpUyv*q)8<N3%8&d#$L;<L2Tl(Ta!a(M>s`yqk5;ze;RgGu|tnDW$P@Zpyo
z*F^Z%8B3&Ic4zi{bvXy}hJAh}(ZXeaS8(Z6+xX<yH2v5}th66ABPQ@hCM5``-c3_u
zTrIJG^rQtkKJM4%wpu}rB;C9k3y9@P&?_d}r)1w8KxFy_ic)PYAEGZ`H%lLiZ%BjF
zk|g3e3s9UwM=L0Unh;YI!M{`JYuZLUm=+;04?5#vmqYB{j#=Go^0f5U=Qb*&m?8^a
zxe}sO!Jl7ZaZNodN<4AYJK_zo*U3`Updx0Iq&X54H;zV6%u07eguN1rKx<O}39zgT
zeANepD_;qG$eYaxL%F)2VHG}I<v1{F#)2ZD^_~!*w_f|Zab3Df2eV`iKsuO(7bFTI
zqVj23my-7{Q~d-aO0PF0%1C<#?-LH2DgU6-Fdk=_-eu#1O8~4B{EQuWHm{m850EQ5
z{x$YIRZ9=9t&u};@ak<4YQ4V|8N*>g{L~vODb%{p^a$Oxl+~Giz8paLw)}^fKK}({
znU|dxC9o0X2<;t=N+WxeM5?izL59VaeqxVf;9}Qmy~T0*bfeEZ-qJQr@>f{o5Cq{;
zOI?}o7Yn%<FBpnQ)+Mt@l4+4w*N7W{GY(h~b{U=VwMB{;H#Ymb+mJxIG~-^J=ruVx
z;G6A>APn4Qn+DLlWEuXLw#L6GkjW&%*vQ(kb}Vmt4UVS)Vi~MfsVbku@zsc{e04wx
zs8VG8rj009Fd2t(Wv0KqCC(QXr5|t}+nD^ta6ONpVVCi8rn0QSB=LM=MMUWI3bvTa
z7r0xc`&o(wqMkK9n9B%9N#Aqru(W2XGfqk1E31s1NGJAk0m%gYeDi}xLvgoy*DQr9
zL1E2)fNK^gO$GC@{ILv~lz7Jy#yXL{u}wp5{R=tNFK(vTPz+G<pLza8NBvyyf|%RK
zCUU)L+QezEnZosYqX?Tt$W@*_k>4|$6ywVM?sMoLl~Rg#O#R;#4)#xHBu*4y)uZUY
zOF>{3$HF_I-#H@X>BG_V17;mU*g2WlDI=fOJ`m{4BEx$`aq3y?emrFralee3E{y4_
z;A-0`yi?n}2sX=3G>tMTgZc8r@4wmC<(VcU9oPs!d|RiISb}d|lJR;qezPz~eX+L_
z$Qsn9!c|Ditz?!ry_bst2c&<pQ$v6{)_eO;FKo-Go-lO%jyT7=SfS;5-Rqt$ADNy#
zd373%-bmk`UX9P00}PkwUWsRe9QExGjdrAKK~ZWOxZHXnU5Du1hPx#e5G}kbkPO3c
z_|T%}^KD@7=bXWJD@>y9Gl%H$T#D59e_UP|^$VXL(WreLjS?A4{UC$6@Lj*aJ(B&J
zb;r(h1e8V082Dp0{8!(}Dtx_B9+odDj^C1|!oM-Y>hlU$o@qnEhH1k$jpzr$E`81n
z$fiD+*5Ld+y2o4|N1H^PZlS8;A$w%r{Fd$VwpoA6gT<^hdBc}X0LZIUjq6|#xlyM-
z7XQ_!pn9O6>iWANA+WcH0GU$)M#@O4RR8FaoV^dE?`_!}%;p)-83f=RND+Ub+_|;Q
zgew%EBYtmOgS)E`7^q4Y^OTWj8kz&EZ@j3_VZ;eI`x;_P87fu%1|WZuIYNdGBe%8D
z1ff=LOr*&^MJ+LyerC#mX4`3eBt{zLcUSQ0WXPJBS;SQpCXZISfJ}l_Rhp<XO0CEf
zyFZ30$Lm2+u#W6<cYW}Fi6>Z3JC2M%CyTEobxb0D=fRji7bSCm(c^w)(EJY^7kXB?
zU7VatB4cwY@#m^8V%%VxDrr37>x`>j&KX~Z6b|Pv-e(!ByM)_K9T6ce-;F>U5r(SV
z%!+aSUtL?j_c67#*eUR<ry+~GyAxi-&k#?*8RV+sl37vINQ+L?x%~=7RD{s$d8F6Y
zOylPEBr^LulvDEBTANi}3Mui{1wp!8<F>YmNeVV1L1XkFJ7%i_$dLP;kJ%9X+%+h~
zeRnVmWGa?*be)M_!|tzSC0uTPUc-?`5;ru=t<%^!tCLMri*{b@_H|j-#Q!zxj+?sp
z8>dDTW5HB!_bJ7ndURdK7OkeEM&;x@U#$ahPXcb+Ce9*($>s@7`!}UX(_g@gR78%&
zc<{nQ04293gEPzQ1Gbf$wh!*{%4GCHDwu;+=Y#@tP^^_td)W0d-ogHv4^GA(@?BZz
z$h@7E)&;n^2j9`G1`ZW<n1U=QzN(!OvLmwNr@T~p=d5(V@~wf;A**yRQIF5!XjVRc
z=L;-Zq_TC3zqjfwyF_KGM`E8K$LL_c`*3(-PY@fY8^3dOS&3RfZrFLTmqF)8e3%`n
z;M1*jMfbIU3OprMtmd#0C;Iv9bhXj=!L55c*aKW8`)qFRKvT~ssp42Yek5LwPCpIT
z&TmLpBW<0ek{ut5wI}j;mfv{)-9V)_P_HErb#-;bF$6honGiaFJV)OxV^etPsv8C}
z(6!eXN+$z(zINwXUDOKK|3R7~2cVqyqmNO47psN*NkokC32a%J;^bYiy!8YeRQMw4
zvr!Z@>OiRHWTPrVw!ccSzE6Nw{hOTiP@B$D^Jp*3*rB(KF3(F#;b+TmI_GI)nWZi%
z1z&g-1IIw#p3oSN^E>zslf`%|Bh+7+WLDo(Qa)p2P@TBi1&^m$idLToT}dvCL3fQ@
zEqYKUz^LJnskH6rxNE+>d{D6-PulEP=Qc81k{VJ^U6n+<^`y5-1z+xERP}z!C#6Wc
zOj5q-f!RuZ4eEl}@@@$XT%Mwa?y(5qpqe$`O{}M@rLA^gwNQb6)d^kI@daFVv(-48
zdw1#1eXTfZ^4sB+Pbb{w<H6=m8lS#^UqxO}E}a5EAT8PGCBQxRYmAjSen!7tf)}cv
zwgpap+XXPt!w9H<)SM%W`uiBo;<&QTfwPcd*duiRVqm%MLndsWYc&{E@ZOE^iub*2
zij!_jMp}bk>DZ`lgygVF`A|RzQvMlRnxtD^w)Rg<L-qFoJ-ql5M#-W049<*uoS}(4
zTsIELfOkHX%JS!9LV10P3v$HJ)5&g#YWq>p=PQKr%rk4M3SNJeeeN^9dVfHR-+^4;
zDw@+;?or%k>eqcF_=n^+dgGuKNF(w6l51wHmk+5W)pg^dYC&r*8xdXJu8Q`VfAjPY
zEu!@(;eqTClSa8}!p)Nd<?-4he}Zc2<6AaA&Do|`7q5KefEWf{E9CS$3*8&rap&$^
zgfngj81Wx?h&SFEM~qZj@G-J|?_$4P!{OJkW&>xbg^=_3H*ZWpe~oTNjbjW-{*+G9
zYiVDW5*NYZR&gl4WLm3wc`b1ecm4P^Sen8x9sx~pzZNXtOrufn9n+ecA2IjKTDmQr
zo2q%uXMP$ORc%2@mmnoNn%WgjRU7o@7^lWCp#NT=hUB#m!#0*317Y6e8v%HikKQ8C
zs#s50bkKgSclg1w#yL>Qh|DxI&TsjL)7LU(@Tqj#nWDXxFQ{CXlB@ZqBJPFsu{wn+
z>I#e3M3LI-O!ICh7ohlclSc`o+&Zy-;t>TzS3yHDz^~bk$SE$*_rUPkgSY4jN=sbH
z);B?)BGYAAyqqJ+qr=9#`&QkSl6G7cU{13vZ0ZZ}b9)yKqFXCL;&>w#>qvNbtB2xK
zAaDGcZ3HhrhL*t$c0E76ok?P>mCN&>-G`g^P~TUg1T-QN@DTO{-c$nXi>ie0vpi)h
zXl@1GguB(R0JtNvEm!nS!r4g6WP;mw{X$3K3~99$X}On_1>`zaJ@q{V#;bLGj-pic
z>6?6%hD^6-@N#(zAWDWzRRk*}5kEO9Y<7m#lp{ycMPoY@Q3AEP5u-8RMGz-wnD#E{
z6z0d>-hJQEBWBa<>s4e-P$-|@?W#^8g%svlKy;_Ff{(s<Zdt*p1_P>!ZXNH;;U$e;
zH2C<aBI%v^@e@kDfmO!?7t`&w)^wcA@q^E+4u6-M_+}Wh0xhXqX7_fqOBc17W2iYN
zDRK7auiTf<Tm((4>vYBq_#{RT@1gKcEQctO%Ei;ZDf#6~ZGI0SJ!Q`!@}n;F_q-l2
z%NpjobXH<?_?^o*EI&&OXXhL0u!2<k?hnU&FN}nINFZ*oshrWAhC4|yfi9gSvmWGI
zQ`ND8{-cOEo}wQI#{wxrxv3PD8|YW5JT6N2Q^O6ve!s^*G})dcBWQ6KdMfJlI<Lk>
z=2f#f>+f~3!Kw_^pOof(6(9~R3X$AKphTbC3Vp;=<Y_3Sjk@PAwUojPdbmwWE|>C4
zR!(K!k8E7)WJC&-_4Wb$f9gMwak*u5_~}5CH7+^KJ}IUg#bkeLpSEIpGARdxp2gfH
z7JGVQ4thA2hAM&^gRtPNEI^>v))7*1_ign2)uN==^Phr-6*v{u@==M+lwS6iCK?8O
zKb*lLQrG15{uK3wN`{q|6#_0<VjO6KK{iDBT`<<;-^!fInNz<|;f@@8B;ngpSE+sd
z<Z65y+U?3HUZ%eHH=AV>XkH#ogp7!3*5Pmkd*HM<w@f|~0d{}|Gl`<QC6!E1&Igr{
z@~cKXTSz-O8T<ogtY=_oq0-xI7R%EK>${v&>+kMF^zAcL`dS23qd-Ilaji5ISA^4<
zRdCsD@~`G-st5ZBGliuaU-0j!d=$L%<&SFdNqXn1lpeaBYA5t~i|DY-&}pmv&a1HK
z{`pH6_Y#!i2hxKkD3uS}sf!P?B&lJ&e|+tlAIsDuNS3oF#KNR#1Z6ndVzEz19%i(@
zL3F*g=WK;9bXzY#ybb+`^EsX2st!-fiH<$FYypfji$gJB`S+B2uiiY=r^T^<Oe_)A
zRDw3+f9i$s?QSkhdEX&od$S0=d1Ew1(fk%M+tnN?Tuit*F(r2P;l$<aoh7cqDX&+|
zK3&uLL1qT_ASLUiUf%*Hgi-6OUdoKpgD11!IQpO&sTvh-8~yCg?&jzd7(;JluWsk%
zIlCt;qm6>@{kfg6;K0#Q6pYYm!a0_FxC-DeLunCdF)ki^swKv8&(ZnBt?09B`rP>K
zz?}~q0MRQkVmu#a3=S^OGX5^;XC^9<VP509sx#ZFd-ZiK_sQ|XpjvlSx8zD)BOd3r
z&;bP@munLMa`Ss?eH!!L-j>(KMu7q={(YekBz?awejr9w_$I{ox~nUSrINm~uv@IP
zM;>zolrR;0g0p2fK;e5e2%7&|TAy<GXML|{M?_!QiMrt1`E$|x7*-WEDvrLjpKB1r
z(rPV6o4h|C+{|xI7pr^-6r%TmI{dAe`%1b|6SFbgS+4}qCuvzfzL~^60e8+QH)qQe
z(k{q<$JcE+Te|$|{z;cE9W{?t65PLWbWx22lXHHCdza78U^~>6D?o~~Q^jy0N`N0a
zCw`@xq7~#lipfc5{zflv{JoJuaT?98j5u>Y>KL)M0x07h=q|}XCS4@4x4G2kuFj!`
z%YI<n#OBp%o?Kjj#}e;^7m0aVjr+V6gPZtu@JGmpECSCN&Cbz$_q*OdmWUk0dgNv`
zml{X~W~JyK*7PNfC;uwLP)ETFxFk`C6#)L+9Xma$066_bjsJtz`0?)OP?Mb$XABm{
z?D6kLIpId?TKTmAYuXE98+V8G*~j>1p8I7*#@3hU!8S}L$_dk2VR6_hSW7o6#@@MK
zia+v0S%`0|gljzznLy{PO+dAGisg7{^0Sy8aUF|k)o{I7J=ZA`7yf6%6k!{~SD=H8
z&^3(8FTvLQoR0fLCmpX5X1Cjm%3B)oj6Kh>soF9v9`=bt7zUUq+PYJSf8XW1_76HU
zsbYk?v$u$8E;?*1o;6eydTZZB)|B}b<rjPAN<G=6a+A3{WFwtF^=6x}9+_fE+dEeL
zDu2#Sev59tqH>A+(y%Z9YV#U*zW_?UAS`2fzwfBx2z=j#1GCf|iOy;$i;AvShki!G
zvXg9PeG&D^(F`B*r<5qeO;iT^F>4w236qoI90Xw2x2Qa18@4yxeXd^PSM=>UQ6KYw
zWrc_nB{6!hUzJ!SLE4n12RX_trTO^Bp5R~>%S^$tM7p#S-lx811!=X^EXb0s<P6ZP
zKO7C|>j#TiSE^TPsN`F7vY++QpjXe5g6{Qe3i<__Qv7M?##Rwd1NVhQ7HQ<CmIee!
zi=!E&X$~MS4%%LP4clvIyU*7K78$E+I~kXYa2Zr2LrXDL)a<|2eMl*j(`j=EUa2N+
z+fG&<laQDIk7<KE&BCg0Z%E8nB&#~Ij6uwB=Gc#VJ>qt`2iZTCD9A;)G>7xM*=WsP
zuY|H=J{?=0MSIIX$jb0zNuxlTdUNdFp-khCT@wNYLa3Lo!=Lb8W$#O%r4Q8`{}Yr~
zeP5M{uCeqd+M*bs{^makjtfAEFeA~UtN0nrUq#)8TcKxo<qlXckD4kIPYBP2dmY{y
z(1(8sQN<e4$glnC`rtkJ3E}GvzC_7p`+Z@fa@r7Ub7(~;$wO{KSl*Fh6v}EAC4Ohb
zzqEXY+bbpr{mSRnVW*Afa$`*T=e{RuOe2(_k=0%S{#i=CPO-7~<CcC1lE>S8CXS1C
zNN_m-HQ0ZPZzxoNadc6C_r1jLVYTK=S`9L-eP^{h(prn<u@gWwRyC8#xaknmPmpM<
z^JFb}u!;P>v>S6X!+Ec#`GO?B=;$51u+Qz=h57Z__Q@M8gM?>8%HHqR-9fuU)zrcf
z$m>J?GpJJhx55|hXV#lotj3G7!xy!mqK^Zri1vO~S3@zW5}x#0rf>|8ptc|88r+{J
z$k((%39sBtlXVL}%V{USLivQphSd1^Qw2Uo;HQ%XqI8PEt$K(?smWPV1rKO0Y=5e|
zhIDfO-U;$OA1JoD_7=Xy_%v;NkMXJZ$SPhVTULCNlu*|alLknKBaK3B7=l0dt86bk
zWuTlpc+XP4u<pi%0`g#4u<#PH8@+&P1TD&&u`)Z@3Z6+`uDW5qNOk>v^z2m0QxUpf
z!!>Q6TXVNCLaBv)Y|3(DMfwxs<au-Nd+z{yRkqrg#I{RV{JC)<m-Qs0mu%8sX)%{J
ztvKkTZp-lp`kx<HnrNs-M7hKB>LL<j%o!BYlSGidN{#e#?Mkq=DJ6oHu%6%!f`={6
z8l`716g6VxSp|)FiPX56zlj|r)QA|sBaLX3YD8j3ri`Fd6J7kj&Jl!`ruJBzP|3nX
zYM}&%dtBvMAy?}d8ISKKcLS<oGa5-xhRn+zCf;+pu>ANU7hmwkTT6s&Vz^iKxS&+d
zs;knr1`>zI>|)^L>APH0Ms6dER1egl7)kPXhcbw_m!S^-%;MV0ZB^C?2W|iCR&fg=
zPz)K6wvdh=|0avumpas%hq$fYxbR6PPxzRh5shnGTIj1CyP&`$#y=6V&T_|=+0p^^
z!KV(Y#36KX83dM1+TBF=@`na#;NsO^ppkuF4J4YR6Khm3Oi&K?ON!a>|6xrwqxNxQ
zX2wQUv9~|WcMIkf43V!{=zNura6@jQlGx3WC=iZ2e9*7zsC%K%{`|fREy35zmN@?d
zu}oG{T)Xp!ot;H*A(CEFL>Q{Mo~{)d2eK9`gt`4hsP+VHIR%ApGJc-d)Tiuf!~CBA
zJ;n236SLHcr!)v>bCX;8Im)AL2mw~+P~E_+VnT03plm+160Nx~JyrGUO8Hn&_zgz|
zpoM~?S|2dPsr@Tq$>aIyr2(~A^@nT}e9B&z0_F$eV6^T-X770S+^cxH)8YG%A0$WR
zNVb!c$sIh)(unA5oA7B+INUn08511P-tE-*SIA8P%$10l?LH2ri!aS#DqV<G*=V9J
zcSZ=zi!ffY>IDv>w+l|*cSZS{NMJ8(mK9>PaS365Yzp;m*$l$P{&0e_IgIl%A5&N7
s3jm7*IHAw@SX?lE1<}|4Z_5XoiJ0f2{Y3ZSfB%mw$*IfMNt=iL7c4VG$p8QV

diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-60x60@3x.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-60x60@3x.png
deleted file mode 100644
index 7a2877dc28bf4ab2c60022cd1f3fa35e57c667aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11019
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
G(EkE{nTM(X

diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-76x76.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-76x76.png
deleted file mode 100644
index 876d7786ac8f253d415f7a5186003f8210dcf354..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2201
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
T(ed|x{{x$ocx=@Pa{PY*HGT7+

diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-76x76@2x.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-76x76@2x.png
deleted file mode 100644
index 1501bd95a0b10b9026d8bf5e7a98a30ed706d4dd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9047
zcmcI~Wl&tvvhED-5S(CxI}Gkl(7`3R4Gius!GjI~28ZC5;1V>r1$Pe+2$J9lL4xLz
zbIv>WRNZ&qzqfX+-Mv?TUw5zWs$I2L?KmwBC0wlMSO5S3S4CMt=SgP$ofv3Ock+G^
z-IGAElU0`m02-38@2yaup8ahNRbcAs0QM&x1Aq!71Ry_Yz^4lUd=B`Fc+vo>K+1pX
zIzZNcVUPfT7zY5#zc9v6^6yZ7ntwU}lt_h0|3+jLBLBDk7ph-#1bY&g?#f19001`8
z-w6cdyd?(!kkB0T480B2A!1NB7j7#XH)~sNe;4<^EP#Z+*pupF>um+{cX4+067!d&
z{|7?sN&madLl61~#M?=d-cVf&B=6>F3liiO;0Du6VSzv(2~QiCn2v(tzvxd-lJxf8
z-tJ;NJbr$D+<yGrZk~2LyrQC_JYYT^K0dA|1eaHUtGAUum#Y`UKb`y^KMJ;9P)`SU
zZwEJ5&|kk+)^0xDlJxX{1O0paGf!K8hyRY`>h-T}J#CQZuZ4$~8_e^6qj@{P{ukO`
z%Rg!V*w;V9N&Iytrsd#o>ujjt;9~3Q^^}?vFPKk2;vaGThv~mF{ST_q|4#i6(|=I^
z<|3x)>0tX*roY9I;+5d}A8Y@@OYr=y)PGd&pKbZa>Qi5&uq1f?-D4@NYTc$(000D4
zQIOU12cDQ=`s*(?n`e(o$YX@dV0aOv%Tm}R8&q)_e7>!0?v9`~pEYh~4>7)6B~2i1
zXf`mfa;aHjDUhl(a3Il3=EJ1N;)|h6Mj4TqMn3y<-7el0g@RZQn(AT^y;D1NKNSr!
zJo@5P*LAh#gbp#S-+_ya7KN!0V+gQWu$aUk#UtVMQh~Bmf#{ayh~?3BU{)khmu(9$
zp?5BpEe`MkTe724g=MRnvv{Ff;-Nvx!jQqbqenKUfQi1a_r&f17<)k81a+7wIXL~v
z6@;lSwH+CZj$E$O3(R`I>%-><*thJ}!x91Tr*~@XKLx}2e+P?DpX?&D2|>%fjhMxi
zk3>QVWpDm!%n@Qg)GA|&je|k(7$v;@aNkA2Guc*zS`d)eb3L>Rs79_uCc+ZgmeB+C
z>YFaJe@-w_aQulKinAvTlD|nBpNmbH^k->|@aVD#!->O5PWvGf*Z&H|tVDdv-N`})
zuUBl#+eSG|K=#5}0(C*)ZAz75^jK^8@W}U~XNa|)f<c8CW&a)!CLWS|&Xls*tAtyg
zD*LqlImJ=Q4bYv&!uUQ>qUSNnIbh%VE3z%byAXV)xVs@^c@@43m>9BA&DH`iqd+%@
zJDD+KandSWm6Js?S;l@`u*SW?IUuEa{@kRjxKaCDV{t4Ty4ZO6OZDdARLr5A5sr^=
z08ourx=1l_k*kWruZD@YqVT|qE%rFJEKbII?hXkOUS5dclge;}7^pb$8_E_%cN<GY
z@dlGBhoj92a6W>rvGAS76;*ZebxZnaD(zydUh~-Ra9Kob(FYnCWab<HI@MP+mU_8g
z3;AoLS2=(2$=Qzf7xB5;ytU>7zJQ<txK4mxbi}Od?fKuj!r$VymF?UJHvZhPz8McH
zJMVi$8-?Ize0V4Gekd8c`to_<r9;>=(*`Txxs^t$#C@4zz}DRW6PCOcN2rV=K9+E>
z_gx9yJx*`OHxr``MiXha4Cz|#G=1?yoAoVAm3WLaM-8e#*~2D)Q>y8woZV4MqFt8O
zL@k|oc_S@x2Pj&B!~WKf%02`1n$VpVxq$QL`SZ;p#q124YDN~O9MnbLk~sEhDNJw#
z2O7djJ|y-2Sk2@7J9P;$FKfHNfO?7lM>xsUkK*x~N(V&irZn4^koN>TyA;`}RGj)*
zqjUSdSD??_4AKv4EL=AaU_U9nS^8F+*W(XgCiSX+qP7`=eZ(UYWT4a{CS7|~2Z&#v
z8$73Xm5oB{wI^K%zyr3Q>P-$)0VRwg`k{&;-C+6EreIWVzxog8#<zvaM&0&rJ0E@!
ztm-V#2V`yQSbU%yxh3vp1=t&XLCkY<xT&SU>9kcHzi*G`ZFk>Rhbzwf`t`CFlFraW
z&7eCkw>PlP9QO&ntPxSI34~XPFd1HDr&6#lPf@%BD=^<eJ!ysbqZP)nr72mGrV}!K
zvH*jHslT1NKF>E!1K?sBC>ah{yTaqt7U~&UtOHcCl$kxu28l8y0tp!S88IOuI_B--
z`chHmOViE2PtWG6pGdk7Vus+I)Ov`QLveo^E%b<Uf+M*h2DBmJ7TekC|IS%#v$RuO
zu2(h`E!zSae#*Ov;IYaQb>(nMd7b%UwD)m4-sq9DOAmF!{5zon+{0%ZdtTRO9I@R<
zQiZRODIGb%102pKB+GZQv~fP4yEO&BFnm#EDkP=YkT~#WgOG_^9Q8=*a*lEJQK8%!
zd1M9iy~Qo`Ts$o0%-do0<tqCCVI&hT(kWNlcgzP2Cc*wNY>G&RhZOvc%G9NCW{Wgd
z6B=4>+C3pP^1&`?yqgeIa72PRZZ1}??c>n1^TB?rtV^o{MV}4VpIg<rm>Pi`rA%ll
zI&xXJleF0$24y@yUPQtX&L<29jl3VVi)VNr)Vc3)dzHx{X^gEM`sMf-8K2IcGd1wi
zHDb$$(Z5Aco5y;5*9H=#<oEv;2k8V{bKPcxN;Iy9DA>-&B(u!=qqg0K4SRs(51W+R
z2`}+@ua;w!RBaUMXXN$R$a*8tf9uFAah+>~Wy)b-AL@^OXBD;(Rv?AWhDgF29#Qyu
z3R@87GjzUh?GerRu#x&cZ7ig*D&XnRCPL7cmQ?(Z%sDl`ew|-h-j!-z^Nn81yV=5$
zyPEEOuQ2U1>!i=_rP>Dlu_Bo9PW-Q8vtv1V7Lu_-P+(<DhSN@84GPRNK1eA-j}f%C
z%G|;gzg5nW?gBRn5#jv9m#CATUlw`KCwcI-vuF1Qh{v{Z_@yIeh}ed|rIXN}&ImTI
zKMw3lL%@eSt5s;LKQ8QzUcJn57M&|KMJybzHdRXou2ld^=+c`$;yBm0`8|TmIJDP~
zis0gYD07KHIFdl}qCtmXS(OB0;$^moo17ms9yO^k&D+1%MBjUU5#(*8Y4Y&pwD4sr
z0K##~?FQbIsGqO*_aP8eZ#D$ieolqyN{h&vMbwz<JqmsoD>@0_`55VC;ky`c*8D4}
zH07|+e$ecT#!CfVflI5BU^MU*=T$xW{?ORE12Qot>;49j9U>dtV$fTx>F`bEtN9?E
zO8EIy3)Zo%vy0dHFGkJKU<3Sg2V{o5MO3y%5~qy7Uv)f(NBm({cadu(4+Cy^1}96B
zNfsYI6r+q&k+UmpS?|0rkSN=#&jJP9?1-%fy)#V@m=Y53S$yOPe0M*#uGbzCEZt1a
zgR&OQgV+O<NXZO^@cT;q`DrrBCr|^eke<AM7TEwc+i6E(ux~dp`HHl+w^)&G-oLpi
z?!yax2M@ywnpS`BiNUS9oyD1QWxz5H94>m3uwum4=lMXUs~^-n=;_u83x<ga^?VI^
zlb=tBA%1U5nvsxiY{Ev_3e`nLw9vI@Zcs`&u?e|YH{M$sq#d)l^(lP1%`n0OBSm#A
zvlza8I1olK@k&i-sfx>GC6LO`*NY_9TrCtysO#;t;T|LC=sZ8go3e4f&jf+Gg(KjM
zwjU#AyKjE!l(r=Un#|*$JgM@y_I0pwkssMbTYsTwK{CaXw#&q}%#(T}IHtw3kRh^1
z(1otJTu>vjUjE}+Be_8>4)VMJ^s7QiRmfLo7I$oH7d6ADrXx*y0oj+{dUC@;BW<wl
zml_Wu8iF4#ym71sW$YmaFvv+lCc@<}oN>}Q2xzSjyjI7OtL!XjU}rCroY)kfha6Sf
zjPlrP*De`9)E75q0O9bmK0Siar<W2UvBl>ZkM1yo0ZL$gD~9~GAy7pu$URn~qr)`h
z=drAn096Fsw`4Qz1GmuLSCs5Hu%7MZ+Z2;!x$*cz^n+&9q6C^e3a&_9+zRO~#swoU
zL62zs#0*p-hFyF81W)|a<Hu9eWl%1^fC5cWtLdq6qh|cO)NS-B%f+R~Q=9J<*X(T3
zSA&W%V>Mo1ZOKZ>l?ba4wg6ohxwc{_7~}gEpBLX8h<+NT-rv4ekRN1Va8qscbneZ|
zBc-1{d7s*TeVTsqQPna=-bVhu>CGnlID53O;Tttp3tr4zvzhQ};<*d}d@iCm;3`&&
zLY&WFRz|G?5A&;U3J97b#H+%Lhn=E|<FZNo(-@)t2_lFQojiUj$=MUKT~D03R7Iy7
zY5I8&zP56tubI_0>;K5K?TNz>uJ7tmjttL>8Q5{<6!_vE0AEW|hB<7R#_FTcGpPhS
zzgzb*LmWrVCO65rIjW*iFyKZP=Qr`m@3Pcoj=(=&k5D?DM{TFS%Wa@ZgZZX89+y-L
zr$1Dc52}WERDF#Tc37dHRYxbMR6@fFKH@1TME>YwkoTs}2^`{J5D%w~vgeP@D?2~_
zeMMttOL7oB+-X-Htt`-c)odH!x$#giUg_tVPKI`56*igWPHx#0p)TpD6N7KYN6LUv
z9Ntn~<J`2$#(IgMm4LzMK5#A!pmIDr3cI%4NYU_sm{HSTcG<uf^Qnmg6!VSEm`k==
zr-KE5>y?}P)6MF$ss)pW&#2fMqCafpU>UVHC>W1Bg7)fpQJ=Z@TawyQdW#dU{HT6B
zeO>7<iVa=X7Lmh#b>;B>ZM9I^tENldd7$FJrZ4$#*IaU@WwY$!*d=~ua+K#-euvOi
z+s0qssf-|kSTdaZZ(yBkXT^x}lSCPLa{Zg}istkCL!H$}hdAQA+KddC;U}wyL^y^6
zrD8TkpW@Ay%Z~!xSyxj_Gm*iV;%=5-RW^IIVics*rPeoo47sjf9Ai^mrI(t~mG=qa
z>*M)7f3gk;$bR+8I&h^A|IJBpyA?rq-Xkr>Isolzidrx-GgLz|)Z~O&KBN)B<t`rY
zHaUp`%22{1BKKg<4Y`tR8r(EQ9Nww3CndEi&rL_D=8bMPyIsF`0}<(%=6ac|FA56z
zn;5dNz<%n%gIZ9A7#0PF9s2_7<jqXd@{!QT)3ga{685s0v%s)b?w2pZDdCpR*nCl`
z860S6$jWWe`r&)D%OmH4>5h}$vwJC?mmd_`1vt#VTFa&957>>E;&yVAInN~ywB3lT
z+tz*$u{blRfl$*6LUX`JCf?9Wtore_OXt{y6Tawt4+iTp#vVCy@pTXb-J#@V;9|SQ
z_dFLQb3J9`jM20=8{e{3`uGTFI_hX#(=s2m*(s&CQ}~-N5d@UQu-=ZzwEo+spC8ie
z&`vNed`#lg@zlIfKSK@VuJ)M>x>2GhvcWcU2xrFW4mc857BLRn`4?<{Tcl_en#=wz
zW*A{5KYIfNsfMsg6NBHUx8Ip_R6u6!VQWZkw9Tu)IDReDtf&#>)vR#DsX1T!QJFSz
zMxTtKa6@Hg(m5z=6o8#P&|Jd@bI-!kSLuHS%4ZhTL$Y}wx*M&Mrlz|aGbWi2rm&5k
zq<0tLEu2yuo{Tb?xp<U4{~kobcRGc9J~EHKyEUu&0$G(;m0t>~Kj*W%zw^w&N+;~Z
zg`G1pjs#3%Id%gi<m6gSHeZnMOcxkY#7#<ZNq7c8vEs!9TSP!w)m4lH(#<Ia$|k<k
za`Mm1+x(1HrFiuz#OSfYSu{~sdIgOu<+2IZLphI^60Q<E8~(<!{B*44sryVdU~e2t
zXmV#PPkI5`Y8qx-qlZegbHBNa5C)NYU1k~9@iz8LOpF$anR(X5)1W3j#V_qjo2I!e
zlfTtlOJY|2&Ujzao)v^?BsG#Gb!5u7o(hpzRx;abNkn92r3-k$AQ~B5<9xOp8Hjg8
zvtFbO$rg+?B<`ffxP=~NmICV;u7(H}?9c|KH~H@zbFGZ`hWdzhh&v$VDenQggxEVa
zdZq141h{<Bd~25r%B#p-Jm@X#p;$=8DH`?9Y)mt9_{H=LsNZF7ORw>`^%T^(&YDx*
zhBR$5P^g7V`NBxH#+HM_fF|o9FyA@QM|()8&7Z((2n5ps`>rO<q={oD@!sbZdtt$w
z0ZxBK)nwCFk(ZM~RnOLBTFWSneD9XP+zp1Hy-8H^JM;-mgV&HbI0aJ7a3+}@g;meB
zkhLICp80T_N4{JU`H~hd*Cz{Of|`gu>9NVQ``3uM&v2=0Lih6LvvnM6Ww4iR*3+JF
zY?XjsHL5wh+AAbe^<U1oH8N|!P-k`rgBWu6_n%A=zIA0ed}ZFjQP|fR_lnuUXHu*9
zAG2N6u01<@H)@ecG<zxCG&|QaUD<o}tn3Lg^)Bp|S#-aQkh>7J2ky&^zJk47mljlA
zI&sod6F&qYFZ33KDS82~G2y+*q5z`KhHI*{ydc#se7=_@2enXCpumy3Ra*`cRB<`V
zN`?trv@#QFKLMd6r&Bwl<T%R2OC1~m-4Kk6R#Wcuoo^hQuj_v$v=Ia!xuZ$g$|OTN
zrA?%6)=`p+<R(pr(A|iWI*j{h*6p}^+ZK-S>S^?5=9MnMkvSvB<LDz_LerTz&Q#M0
z!Jf!d@isjBvmt?_gZ)x7R`Vn7wP*y+y6#w~rRexO<olj=YJ6y6Mbw-#Hm&lyKt+0w
z@LKIUEI(zPUp$p`L_=CRKQXd%-HnHpdPWhMAz5<Jmf%>7NmG7X;^!J@hAtM&8JZPJ
zhY6XC=wrJ|O?!i*&+8(p!&w#oG`6E4mx1C%FRy&)=W#YB0LFYvyl!1|W=ns>)HeM=
z>dd{>4cqRi&T=1K5awBynBYm@SznFb3WYhR7~ZKy^L4vB_<nu_xRFDv9Fs+#!<@n>
zrnI!otAg>txbB2{nn<j(Z3FkWRdc(0pPFp$&LKB@f*v}<+eA7pUfNA_)Asdc=7T;O
z%vI6aOX+G53U}c@-)0q!9=|bE20w>N*2uFl_!A8=v*@ZHs|KJ!vDBXH@lTv`Z4{BP
z0ITusa;sSq`%)XqNB^8{8sc|V$UR=FWOueVDXL?k5OVR;DWlP^v)uI06u{b?THTNr
zaRTiohOB-{|1oKYJkRC%)eTmj(z<1(E`1>S_NO*L%MdH9NFAo>4nfU&Zaj0RNm|6q
zZZu;%rTN7x<Ux1_r~aq-Mp*6J;Xgo6yMRb4QFAWwYl9K=0)x>?$xGF!#MhJ>d|yw6
zWz*?a1a_v_da=o38H^w7;8-a~`J<W85~z4$m2c74i{snhY~F$X%{dz?6PNZcoY=;8
z3dc=@UNmAc4W2!s^UJS32(RG0A3l4w@|vHO3F(>RSKG}An|9kkxM|LF)&SJRbD+l3
z$P1{V<#tYtOEv{vo;Q@DoxB@4-f^#zV$?;<_GO>C!%)x>0qaSUTOL9&EW;xs9VGJz
zD-Dao_N_lHXB3J~bnJ!4j(HP)4L?xK(J92tZtSK~TqWJOGs0ov{&<}^dPGY+dVYz)
ziQ@pq{+Q(NPR3&2ws92a6E~z$d3i@^yMeIcvpWO`@|SC@rrUf#W>A%_fww!=!C!nT
zZ0?`1smzX8vL;Eu=5In0S>biS{+OM34%<W_rBHTH>3d85qd-j?PV;-WxS{def%f^x
zG5KopJR`b?>RTfY)M{+p2BU+%#*6e+tldD^db&{4BcuZBsBEtJ<7ddhP~%gN*u(O$
z6+}IYqb*$W1XcueF$I`UJ#TN4l*a9PDA+8N>Lu0|MRs-@K5fE4G24vJbEZvovP&-9
zT6=!2^E6@xH6qh%P3kaaUEuH-$1}L$b%9-pw(?`6(u{7gV?8e|s(`x_lId#$2?Udy
zw17fOMysk&1l<2KOXA*~yf0O;g4Er$-1}%rHRMM*7oF?v@;vn31Vari@P);9I{Z*!
z63c26qK+T_0{agef;vVo<{OGK0}S1I0^h=+A29?v`oO{dQ}fWhLpXRZl@z^eG#7zG
zIaVeOt9POsYI$W)ZSO(HRvv1%P#Ah#lN$H^0(N9kopk^x`34K_k+~sY38b19F3obS
zwkR6JPM<|Y$*9p1vrYfG7THT}p$S68;HyCnFeWY|S7&Gd|Lke#Zaax0&WvBQy6QL{
z5M6AfReJO&`r=H4%3&?myY?Kn`1tqw3grqNYT)P#NpC_Mfz3G<mmxodt)zsA2=YY+
z<Ief1f7_MBop#On0n3ej@Cj#wIfV9AbTT@av}wmA1%gigSwE>3ksY;%N4299Biea-
zU?4E_(zZTPRahRCbQ3|>(?tS`Bu<LlzL605Zs4O2l7bYroFUmyrLuO3U~|_wr|Hw`
zk46p33=xs-PyH(WCY_B3Hc07WBI$xHe!D~@CRRYYe6sWsy}DSF+lR}=U8%Vfx?_oE
zEE~1$(A&SP3{0;}N?};uSSpnX$QD@#P&27JafiC}wZHYyGU`M<e>3LQ1H<e!EF|1q
zVQY3ZiDS1&aK0Y97@iKyBnbG^d(CI_9Ns{J!E%Vp<JoahI$(H<ly;T+x;Z}B*s)_?
z2l*^dJ&RzAm74!0)%y6J-8f*FRUoxt;HLeOL?<d6Zq;^dYG-euEgs4eX;R3{*y{yd
z4aLpa2oMp+&;V@OcRi!2A~`Cf{!Agb^=8jtoac`|)4YciKsd)RofDb-g(oA7`|j74
zSF^lkO^svu+4y#fAmqa%PY1JsP%p{Iy!+P)ZCsx$iDPN&iJ55%3e%GPyWE6AoLt%j
zIl;M;A-=GN?PJlBZM6G->4Y-UpyrjP%Zt?-jjpSb4CdBgiWHhEOMYZ^iF783b$Z~y
z?k3bnRkbpu?}hB4IaP50^ZZ<B+KA0ezJ$Bg6rq?28n`7ox{H|g&h4x=bJ9g;LYL4)
zj-`&c_@Q-}zGd~gT+wo4?ibOFNceO3>npQ>L>+x(d7;#V(vDxX8-^eycK~u8b4~p#
zigd6!7b<xWUeJv4Md_b_oe!Rr2WmR-lL}(&VZ2nQ@?nO4Jp77tNIn7Bn{`EJ9cS7K
z*%Dq@Qc9*68}T(Tz(zj>5<NiQ1(oEOq!u%~b7t!`WKwO=i@gx`T^vW3G_5`{p1;4V
z^<aRy>qt(Z7RIpfy`7GBkB^r(;ixoyljlm&-F;QMy9Gz`0lok1Q}qri+Pf0DlFI#p
zyyTO)C{q~;F1OhPdQEHmnCqUFlC`SJDN7SbpWV{whjMJVGrQW%hsw2;I~lf7&qgoy
zy{q&gPgGwx|5p6plMyHb+fs?u>?4ZOU026iEc;Hv@Le&4tb0q7l->vf8bAevU*<zJ
zj|Sq1i0rBtdh*S(Ie@15{eo37iu%twf1_ABI}2urz>4iQ9+&B@?scw2B**8{kDAXc
zrDVY%I)&HRKUB%p2%0l$2b4?qK2mCo&O24v2xWY?kG#-7$L#fn9*pse&}otWIcQtB
zP7zdX$x{{46@YrrIs@GOk${(+7xjucS1D~O*U}*cESa{J_6kZ%I=T<`KNB>8!--`B
z4d2}Mro@bHd}|#$%!Qk>@TAx@xD0|KIA7K*{y=9Nl4s8%mG;v+!KrY|S%hJ}Okdj!
z#(FxUivE-TI^Xv*EtbuvQ^K+z*DbnspWkg<$;u+-Gs$GCSvcOk&!vske68K7U|j&v
zj13BLX`bjsXmQEdr7cWCy8J&r#rI7Hc;|og*GirUWmhuF3pjLkTl#d7tlwuuO9gnB
zd`*loks$LtG7(f)$AS1{Ksv%0wQs}9YRnUy7mNoc49k64VnrmTHP4POoyrBjw<fpL
z|8gOi*lFDD`fM6QT6=*}9-QmC#C%PYrhp@xp3X{c^75=o_l_zkIng2MH)`(+_ItQF
zu;KB(#W>)0h@rCYEpC8J(0uH^_HZqlem`pm^0+wiR_-3|HN~MZ@^*!0y#qmzo+gjv
zF&O}A!aBvaR5wU>l3<WAk`Owst<Ly6kZ8o)M1yo;G<?3kK4{b>1_773WN}Xk4?za&
zQ)s=X0_8?Fh3x-1{h(tQkf*{w{2TUXSu$p8RZS1nz6s~)I$o>;l*dil^EJ6czAU?I
z^_j%dYO)R6_$4<yE^xhv*50(qp$%-b&o29-M1Cmmx~1;*R%?He54t<#@!E4c+h<FD
zX1|HiT|QoaYxem!o|Q$vg&#S~REKkk!ONk>^LtXu1*SIEsgj@FKNZY#HOgPDbCo2M
zVSg=seQ<L5I+nxonEP;YfZ_9DD*(EO(a5gcC@NBF`4~TcK1hp)S#eDTJBGmpC8!h{
zlk~^rtHy27-dMNH3Flv2yf}9XbBJ*FRT=uz*E+U)H5BxWx*QMa>Cg|RI=XoEcw6hk
zvvhW&ACPR$Z4nq+Q%`neiyh`c&h{z#wdjv-e~K6-GmkU#)i+r<RGz=j&J03pgliv`
z*^I7SnIxzp77t&O-F$B~T1B!fr8%(?u!6*4BMgr-+Kx8|&hK8n$!`u&;GZjaH+kZi
z)}o}TH@>L(ZFFxS_-xyf>6J4w_~{#pyEt<5_*qfok23o9gCfbp5t75{K%_!DCj-L9
zl1AdT`YiRjjnA33<6zdSW7cS0btTP<Zl@L`^3mySL^(sC)kO4SsPq+?#=S}lXONW1
z>*!q+8T{OClpHiNVe9p-i^6Kr4NixZ1eprmmZCaFUFe4#bp`fmi7POU{65-SZ%S$k
z5Qpm_&+>$7io#%|Egv(IW#!!RMD1+PIKvEf{L${G9x=u`YL{fAxV}nVt%%Dqo2Q~G
zKC@pJ)TsL1LNw_)TWD$I{R%OWw?v!E(SPaUk_zPS9Tp>)Kp~yCyBo9VOI6wvkx&?x
zcPni#s|!!?{!Rjb%4dxjBPHfj6o4M(L;dX}ynWtI<mE6j@LMzL(JqGHeX!Y)C)cCf
z&XT`Ippg{J^?ptM9eTDqdi}?gm27+P19=<WtmQgc-;0h5_OJ$70!BwlazEbr6c0*o
z+P*J-%&*6rSB}MaIW(xxD&7$9BfGxG^>$q*cD%`>_{fCI`YJAnQ23Q8=eW6eO|kkk
z1YcI<7ysCD4a?Tz&DulPG7!Qa<zJ{pKl3|;7#Q%YKGm3@=w`pciqA>zgH2*=2HpE-
zh%AC~JkyzJ-^;G&CYN64j(Q8dWXtKJ%nH0zNn4#b6l1SqB?;oqxYmTOFO9>RzX8-K
zB_tE2bZ=%7JjVb+<Zh_n@XeCcd!gttD#L{#d>~#Nbeq?#f3Cn$y~i<$#Az~#036K`
z)|gW3w>OcZK8-grHPx~sp7ah#(eg+Mr{e@~@!CvrzVid1L2QfmnRF}UFR?=%t+j9p
zsVh;>9X-$i#e|_z7bVl3a@f&E!*?%xbc_1oKBkbuc%x|+5i0Rsoiy>Ip@o6^DfUtP
zZU8Bk4Lqq&GTWPn+2HFonY5&YVFV(KX;~cwH*~oQxpNA)F}T8W`iqFu-f=Qu7kckE
zw@Un77a;!e0IkhGae#Tp*-RuaC<$rzHSKYe-^vu?i=C+Le6%>AiEZat#|7QecRNk}
z=m0QL4sTLxrVd+utt(Vhfeg;&o8n&d1;EHORzKw9^*WD<eAN34%rX<PoevcI|4)7l
Z?Rq4r8BWmd|NEPX$_ovJS~<&z{{sEpdkg>o

diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-83.5x83.5@2x.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-83.5x83.5@2x.png
deleted file mode 100644
index 759dbbecedb16f42b91c52fd19d2c23e0d53d5cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10188
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

diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Contents.json b/Simplenote/Icons.xcassets/AppIcon.appiconset/Contents.json
index b970ad913..c04602c05 100644
--- a/Simplenote/Icons.xcassets/AppIcon.appiconset/Contents.json
+++ b/Simplenote/Icons.xcassets/AppIcon.appiconset/Contents.json
@@ -1,137 +1,9 @@
 {
   "images" : [
-    {
-      "filename" : "Icon-App-20x20@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "Icon-App-20x20@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "Icon-App-29x29.png",
-      "idiom" : "iphone",
-      "scale" : "1x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Icon-App-29x29@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Icon-App-29x29@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Icon-App-40x40@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "Icon-App-40x40@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "Icon-App-60x60@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "60x60"
-    },
-    {
-      "filename" : "Icon-App-60x60@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "60x60"
-    },
-    {
-      "filename" : "Icon-App-20x20.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "Icon-App-20x20@2x-1.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "Icon-App-29x29-1.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Icon-App-29x29@2x-1.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Icon-App-40x40.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "Icon-App-40x40@2x-1.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "50x50"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "50x50"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "72x72"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "72x72"
-    },
-    {
-      "filename" : "Icon-App-76x76.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "76x76"
-    },
-    {
-      "filename" : "Icon-App-76x76@2x.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "76x76"
-    },
-    {
-      "filename" : "Icon-App-83.5x83.5@2x.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "83.5x83.5"
-    },
     {
       "filename" : "Icon-App-iTunes.png",
-      "idiom" : "ios-marketing",
-      "scale" : "1x",
+      "idiom" : "universal",
+      "platform" : "ios",
       "size" : "1024x1024"
     }
   ],
diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-20x20.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-20x20.png
deleted file mode 100644
index a7aa0332902844de258890db60bb23de594bfe6d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1535
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VOS+@4BLl<6e(pbstU!K6YJ_K+
zuP=iZkj=rs$|%IZ3}i6^Ap@fn14sps#o)y#4QB^2YCzR6F)*}eGO$3^L;-0K@Bm_v
z9th2}fC;WbWC1gR4N}UdFX{uNI14-?iy0WWg+Z8+Vb&Z81_ma!%#etZ2wxwo<osN{
z#FYG`RK1Ga0+22Sn+hu+GdHy)QK2F?C$HG5!d3~a!V1U+3F|8<fR&VF+bTu)1}He^
z7o{qg>Y3;nDA{o-C@9zzrKDK}xwt{K19`Se86_nJR{Hwo<>h+i#(Mch>H3D2mX`Vk
zM*2oZx<D1W#g%y_i50qe#mW#vVCJ}_7AF^F7L;V>=P7{9O-#x!EwNQn0$BtH5O=0l
zWFl<JD~5Ut=s|sujJ~0sfj%~EC7EeBw1H$G+Q9yTSZ4z=%qk$WA~h$%B{MfQuNdew
zJ3|8_6C1ES7*YtAB594ptrbZMNh`=LR{lkqslZ?Y1%{oWjXs7LRK1NpD5Q`=4iYV3
zQDD5-aoOm@<JgXCP4MQ)3=GWNo-U3d7J_T1#Cn7{iX8v{{oVI>cTHlif6z9)ylqmK
z!=fgosuN93CwPor9PF@jIK|Q_cUrFMl2Vl?N3~#+TvJoiffFAVDx`8B71;bI;<jjP
zY3crVx##Z8%`HFM^y0w1xz@$c%Ktq-Ge<k~%m?|iKg`8iy}LCTHyx2%eM7#HW%1r1
zHisuu49_~RVJJ!$n$U3ck=DI0zR4vvEamH1qgQVVh+6XDtXA>45bdSc0yLEJAO6`;
z&C+{z@&P_!fgr}&Eq%LUOs-8olxFG_DjD)Gv`Ho4fRneO%Ob5!*Jl_?_dIa8%y2C#
z)nK6yFZYqAuRLxAKNmDv>&ivwvV|q@HBoU{#y-={(y02+7wu!};y-81vCR{XtM5K^
zrt9#d1jAJi1Gch$kJBrNe>dZXcQW6S;3ZLiICLJ@%;vYNx8U4Uxl%@bl}^RckiBy|
z4xI=&r@#6}Z0ez%>UBQ9oc>%m;_Jci)#Bd5NQa3Rex7M}on{po*(n^Gd-X@fcA@Y7
zJ1>|oUu3^Rse39Tqv-s$=R4$=`cCti8Mn`0m${P7M!xsKx8}qE+mjk!b7vP9EKFoR
zcFT4}dKWuWj_*XnhnF`$?0Ykj?TO<dsjL{cJFjLQpD7);r`o>vL5<6g#XB4vt5>sc
z6%{)m-+pjH%%f(LgoU#$kD9dH%wK=Iqb{DOI?BCZ%hB#W_jrT1@sDQ9lnF<jTgU$E
zk;a+rO9e|49!ce{Ji}DP+i}cP$1r1F=%IaF#!Wt@!PDiBudhFLX3e~$$c@6KXSuXa
z&y~^G)yDj?<>i!XJKw&rdFk{%K_svJ%zDm)J!e*5OLlx;AR^C}X3?<j=GHbPkter>
z9b!YhPW?LaGFf#;(Tz^=zljz;LYroKS?|`~BdH{nW41SgEz<35S$Nd0FO%M+PV#x1
zW+r{1tW?-ctp8C`xkJ7=+tDdq$CSCs!k!m+WbIxWG<mJMnk)b1-#30R?Qt&tz^ZiO
zv|;jpJ#&%v&gtr(xmCWcXSmd~W67cmha%%Iht-@5x;|NRxgVFnO5e<2z9`?BH~vSr
eCVh<mSI?yNOiMO0GiV;DIP`S&b6Mw<&;$Tt-ZE7H

diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-20x20@2x-1.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-20x20@2x-1.png
deleted file mode 100644
index b91fb2496ddbadabb80a42e851ff63f85a0191e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2632
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
RN`Ke@Pgg&e#_b`={{`pSHkkkb

diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
deleted file mode 100644
index b91fb2496ddbadabb80a42e851ff63f85a0191e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2632
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
RN`Ke@Pgg&e#_b`={{`pSHkkkb

diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
deleted file mode 100644
index 5ca72b1ee4ac227d77441ccece7f783fa977a4a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3986
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
ZS5;;gB);6Ic0c|@)zdQ4EYq+j{s%d$0Ac_D

diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-29x29-1.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-29x29-1.png
deleted file mode 100644
index a50524dabfadc86355622fdc017e24c8bf73371f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 915
zcmV;E18n?>P)<h;3K|Lk000e1NJLTq0012T0012b1^@s6R+DEB00004XF*Lt006O%
z3;baP0000uWmrjOO-%qQ0000800D<-00aO40096102%-Q00002paK8{000010000T
zpaTE|000010000T00000{j)S{00099Nkl<ZNDb{)Ur3Wt6#uR1rgNL7)1|G{?2p(2
z11YrvqaK1}Ph}AilnN0dzVy&PwD6%4dh)4I=%I%mGohCtNui_+4V^X=EzOxt+h6B&
zv%dS;r{AA@-Sokix-jlN=bqpB-Fwct=bP#`H?YZL%O>;jbpJ`CM&0cXV`4glaAf@@
z5f|0F%wWtpkH)88(d+Q@J8^0ith<t6J7&V^(ln@JNSJCp)$0#NaG`z>ldh2LD9hq*
zOCs)8<znB?MC!hvT=QJ=(7o;TFbRpn;fWxs?|;FEL7(8CIx|Usx);&XJ|zK7%`8Y{
znlLvX!S&`5jC1*B4JK(r%NRx{gA!apu1+Ge1d@h3PexhWpptgmedr$WqJJbH0T%B!
zqWnmjM8^^cwzJPe-KLVZb-H-tso4d*>-S244V5{#aVZ;?46Q^@6JB=B(A1z-Z&^(*
z{Bsc=kdv8!XAK3=#;X(#NJO5$o<`Sa50;jc?=>k=jgIC*sAN#ZP06Dd2nh>$m)Dvc
z@C23*A!a^YV8El=JiK^dMcKg=@fN=haJl{E3oG<WQi@UEupgHjhu|2O7M9>GGfji0
znmk-QWfoK`vo{a}X|kT)q`v)_=Nf|@S06gi@yQK&G)V~SDlDk7Wv&pCg&|4lPoYWS
zNJ%b8XlUc(kPqZ%N{;7S-<9%hNYJbXtlE}^H$85Qd=J9N5vCdx6v`(<PF!L&()c7g
zmuC^J?M_tOw!_6W5@C?ud;VkwFCOA@E-xaov3f)S#m%;(CXuxElJwzQkEM;E`0t_5
z98af$sidU`j40fzrvhlo9xmMC+mga6u_mJ^-#{~`-;`M1<GvOoC$SFsXSKdEn+c`f
zlvrn(H2fRX>(orJu(89O0Q1&(LF8vrXsp2`C4j;`dbHlmM}9WD(W|&hsXJ$3`KRis
zZBTAW{-nNoKZ~|57ypkz_|9%m*P`~U1t*G>-AL|3EXPDD21J$s=S&DXts1Gu*mExS
pv2Ic^c%$nzbGlKd(Qy9`=^r9O{@Gz+LjnK*002ovPDHLkV1gV=nQj08

diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-29x29.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-29x29.png
deleted file mode 100644
index a50524dabfadc86355622fdc017e24c8bf73371f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 915
zcmV;E18n?>P)<h;3K|Lk000e1NJLTq0012T0012b1^@s6R+DEB00004XF*Lt006O%
z3;baP0000uWmrjOO-%qQ0000800D<-00aO40096102%-Q00002paK8{000010000T
zpaTE|000010000T00000{j)S{00099Nkl<ZNDb{)Ur3Wt6#uR1rgNL7)1|G{?2p(2
z11YrvqaK1}Ph}AilnN0dzVy&PwD6%4dh)4I=%I%mGohCtNui_+4V^X=EzOxt+h6B&
zv%dS;r{AA@-Sokix-jlN=bqpB-Fwct=bP#`H?YZL%O>;jbpJ`CM&0cXV`4glaAf@@
z5f|0F%wWtpkH)88(d+Q@J8^0ith<t6J7&V^(ln@JNSJCp)$0#NaG`z>ldh2LD9hq*
zOCs)8<znB?MC!hvT=QJ=(7o;TFbRpn;fWxs?|;FEL7(8CIx|Usx);&XJ|zK7%`8Y{
znlLvX!S&`5jC1*B4JK(r%NRx{gA!apu1+Ge1d@h3PexhWpptgmedr$WqJJbH0T%B!
zqWnmjM8^^cwzJPe-KLVZb-H-tso4d*>-S244V5{#aVZ;?46Q^@6JB=B(A1z-Z&^(*
z{Bsc=kdv8!XAK3=#;X(#NJO5$o<`Sa50;jc?=>k=jgIC*sAN#ZP06Dd2nh>$m)Dvc
z@C23*A!a^YV8El=JiK^dMcKg=@fN=haJl{E3oG<WQi@UEupgHjhu|2O7M9>GGfji0
znmk-QWfoK`vo{a}X|kT)q`v)_=Nf|@S06gi@yQK&G)V~SDlDk7Wv&pCg&|4lPoYWS
zNJ%b8XlUc(kPqZ%N{;7S-<9%hNYJbXtlE}^H$85Qd=J9N5vCdx6v`(<PF!L&()c7g
zmuC^J?M_tOw!_6W5@C?ud;VkwFCOA@E-xaov3f)S#m%;(CXuxElJwzQkEM;E`0t_5
z98af$sidU`j40fzrvhlo9xmMC+mga6u_mJ^-#{~`-;`M1<GvOoC$SFsXSKdEn+c`f
zlvrn(H2fRX>(orJu(89O0Q1&(LF8vrXsp2`C4j;`dbHlmM}9WD(W|&hsXJ$3`KRis
zZBTAW{-nNoKZ~|57ypkz_|9%m*P`~U1t*G>-AL|3EXPDD21J$s=S&DXts1Gu*mExS
pv2Ic^c%$nzbGlKd(Qy9`=^r9O{@Gz+LjnK*002ovPDHLkV1gV=nQj08

diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-29x29@2x-1.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-29x29@2x-1.png
deleted file mode 100644
index 00db0210a75c72b44d2a0210cbe73e151dddaf67..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3817
zcmZ`+c|4SB8y;hqv4o5zWNg{SE{tK2jD0ub*v-UbESbR|dy-ut%Sl<YOSVEpw(Lt~
zOO}*GWJ{Lh8`XEt`TfrKJ@4;%@9TN)>$>mzxu5r+H`dhn5{QAD0RRAika{}iWUG2I
z>1fFBg=T#*vY~QA7$E?FN6DwYJ5!U_BrFPf*~kbWPR4WqYKqeUN;0A#KL84DzzKtl
z0QwX>e_?Y9vELjZ01$%%Q2plElI_XRBhM4fFAK~C{>4zurTiP8Q2Eiu7s-a+M-NQ^
z08X);ObS5uT`&Luq`_IDh$tgNRab9MX=jYL3s#!s>2sn2z(}fO=!qpd3y?hVUIbN=
zy5LWSDjA<_Lj?tXQivYvf+!<X0c~$ztbn4lg0zevoIyZ90OpIitZJ^K`&&+4sSCOj
zi9V`OXh1-Kbb!3Hx33#iRz*bxDkBG#lanGdqzHjtL}!we7Xk7s$baMLU<t0iI3FU;
z+e_diuCt4`A5mRU@FdY+<5!(n67KIzUWDJrA|DWX;(^La%Rv8^jEKAZe`F_~U$UR)
z`jrlL5=_+;N5bM!Iyg_P7lB+FTvkR-0roS`zg&M;`VT4k|4aYj`iJzS7F82p9G2Xs
zlV-qWVbFi={pQ1<C!P97=YCzw&t3Apz!_lBzwQ{$P+?J<O8zvyB6Sd!?$m4OQ$Cij
zxqj?sfqIvaz^xIw>z6cH8KT<H#|g5h$mQ1;RaTC}iM%=a*lu7YO6uY&dxaly`cr~M
z-SmQN0-XiR8*y7x_Bs~r6tE2ab*FoOPQYIts|6&_;FX#KD6hJIxZgY596Wq9e4KN9
z$p5i(Tq+V8G5L%N%+VRIc{~RT87<&cKhS6b4ne2AtmO%a+9~%4P`BTF#iI~2zchd+
z{Rns-Jw{8j6Hci}DU|v0zF+>M-el7YK$C1Xv;(Ja&5ZAt<ppDEyQh`Bvx~^%Rz@*D
z$StqQwHu|hOp5beYkqr+?M!uw7Xg7Zk3rfsYndUXJVnA>Pl9}z^y6x8Wi6OnilEK~
zX^Ehs)t&fW3j`kZ-&uUJJ!;V=CR#NV(6+`B6c^pO!W^)OaidZM0b8Xa_bt@-dh>w;
z(o*c+%^XaX{o*C0MH;G-tSYGYA-h4wgwr~R?>dzMfir|?z3h`=xlPOf88=!t=xiVZ
zSx!}LI=wy%F;%VC1TpnTUcf{gNF34V%Y+CstwqH3ok<9*2FlZ@rHJS%?L&MnmEx5$
zvrCM}DYAeU-ne$OzC5SE$Gk9gcxv<L4{7bDo>&6Kn}^`Un^wE-G({0hm_F)}tBr19
zlmeTX%45;Cj$j<{cCJfwXg*T|E~njV56Ehl{xRI%J#_dW$a4JP(bl@GIPNPazE3Kb
z<`eVv(OK3NirWCXyJNGgorfH2npI~JW5y|+l(+==A+l{JNL!R5z}2~w)@0qitE@OF
z|23!Sj_{<VuyAhNZ5R4>uNjA^pz|E;Klmha?42!@Z=^sKF!%?8uezV4*X!g6l|<V-
zSje*XM1A`%N=E}>z&}-C8+7I>L6||fKF?ajyt!Z6kxPu)Z*c}PZN~NBqTb(ea4^B7
zgzDxnx>Y%cG-DRa$EpwZMetMTf*Ufh1X$jj-nDur%h&R`4ONue<2D8EH!0go${F|6
zMYk?D$&~8Jd0L<-L{1$*s3eSa%7tpOEZ**ozby87k22^hlcXq0G=$r=gZ?O|aHKl7
zUx`rV6&5MPZ(kTXU+*%M04q&=yL`Ky>$cG$tF3+ui*{GJve7^~&5FsN9<Ky>2<Q$x
zeTlV|e;t=bSRVajyH5xsE0)*A31G!D?cgp<evZvSI<TSz!hd|NCmA8hGe&>aNbi!m
z?y50SnA7f^tvP8{OgZ#%BL_dPm*I~7L$^EOW2C<EiPZ?i=mWKvHv*XILya8?Ph~=%
zN8X_RG5ZGEv!X_LbePL;W$q$Jjdy4=Qlxu@gtFb_Sa`x>gM5DZ<$6#$RlR5LtjV;D
z&xg{AT}w6HnLlo1nZFUc>pkb@%o}_KsOz|7MNE8~vz*<7n%%XP;+wNe4v>fnpGcA@
z{LI)}E%6o}rmU)M=p<(&7ym(}V}3AOpzNLmV)Vrxp{MN8yjc}w<38jz!1yJ^zfLct
zADLkzT(rJ7f%^(`csf!*wR)RmFBc}%08`?FYRE8Z+{;c%E;L?;v$uKlM47ur7|5+T
zNs35Z#DwF6gw*^NJA7A>=W%X@Ejtcqi4?aO$J6oR%V$~bl!p=z9o^gf<hQPN?b%%{
znhZ^w^Bd%WD^SkarA0(f&_4QXNt<MOu+bfHref|TjUF?sd@`{@Vcsxiq?P&0*kb4=
zd~0peajD~7BgW2`PpGi!fs|TqkpxqoT}c@apbCGd^AD^C*n%Nva$~vkx)irxG{pS#
z8jU>%=zT%0#C6x6kjedVF3Gu9g$-WY(tden{t7$N{qg7*(4bZ;+pb#<v`QLqdP(fG
z^)_ldL~CUwL^r<9q1kx%v+o6TZRhwCURsAr#`%fi5XOdR8vEeKT6RRyw?bN~@@TWk
zic}EutX0C6MnX@`7~|(_&kRry_H-i4*$3TQQBTm*zL;B%sonP*%m#W*k65;Ev6L9c
zc&;J#iu`Za1i57QDpi_^1-zx>ymzeyRDQq8^yr~BfR)Zh#hNZNzI`Zm80o={JV@kE
zO%%Oj(l&lc_uZO__LXx}*FLG#OSgV>aWV*=95?0@&FIuD_;Oez5n(FqAm#&CnyZbo
zLmf6Te}nC^8o#PLFTiWUqL2{w==n#<i@JjHfZ9<MEPx7*Qa+RTuF0gxzuQA8ZD9-6
z*3cV?0+xBQHy@<=qi;U!^T&6LO0!Ez^fbJ!kL#mCXwtZY>^xxQLtr;jR=j+p5U2O?
z<-02{R)if|Mu+s@<SH(IaZ~JiR!jA2F#J}oVT1qLyD1M0zlzby`-w2C#AZHtg8G;7
zQ!R!5ao}(ebIrHcQ<L~?z799nxSHytjDo9mvXWP)Kt`^S7L2SLIQ%K8n?+``jP&fK
zgc+N$l-BFR7@jiBkdU&!HMPv@5B-@R@p4ah`smZbW)jAgAc57MLY{sJ-75;qjE3A9
z@izRt5iR`Gg*)IS-+SScx9?$NY?#K<gsS6*Q`0yh$PvgKX<4Q$yW@qi{B8zvr)+FK
zeIWB(SPZw;1+*|yo3YumhL%w5mbX)8mvA<{C_5}DhA8Y)>%+Rov*`1o2}0Te@q4A&
zjR+0u)>ao|s@cNq<>|Si?)G)W-c1=Pu(M)F<}Xg(%+0qNauGfho6eMqBMc`DJW-eG
z#Tee9+%69GSrg+_;$xnVSzVRcj9{n;+!Z5Lb>iv*2FrH5z07uVqP2yO^z%8wVHT?6
zr@MDtl7YPerz75PU)NL#moUnL%Np!reb*t9<FT6R%ZpL2%K|y+Ci;OZEc3M=a`Ej7
z%$FVBb#^>dDDS9UJ1()ZRj4M3qk}?~)YyW{wRI2o(Nr(pQ*SoN&ITVmF4V+UzMAZ1
zt0|%;<{G%9bQcR!4HOuTcZifW*FR^J?u^{TWoECo8EL3TR5o8p(~nf-sd7yh-LHMH
zRAN0kAzXEKNLRa60_kOHo|}Cd5`%Sl{ng=fDM-+!q~lDrMn2;31FS^1!E>f2eMqlk
z(Bq2F6D`{|@WOXhwd7VwN(<=#XPZEPhxb7DMqbn_cTd-Wa`jdb>b_A7G+ipoLafqM
z$82mYUj4z!el*;v*h*CPu7+M6QV%~JXj>n1gEROc262y8SR3PH1&;Ry=d;`Pa`L*5
zI=GHWh`x93@>H4pdX*(wQu%q;`$Dtb&ZAuGNYAvK5q6xC!_3?bd60cekFMx~MxkwC
zAnK~)y(^r-%%2ZA4K%+p)Lv@YURoIQ>~AawXGr-af_59}vYtyPVOLQhV53UioY#$r
zPf0@vhUBwL-OP7xf&{;NMK|zz(2LQo#7<S>TfD)$VJxQVVt<N=WD!_7xGe?3{b1Q&
zaWb&dy-_KMj4eKQd2Z14u<0>lntna2@*r1|==xC499B&cm84D7U1Lsc)SYSZlWoRM
zrJV25u+EG<KWiAk+_$32uLhqD=-1qr6Se%P>D%(HxnN_Ya%%FN(<z~>7Y*iSGFH_)
zA|`aq2EF_KSGl(cA8sO$-r1&)8+UYQZJP?I(zp{7{T{0pIR=`@@}aZi&mOOvA4^H3
zuxafdr(nfXg$>;uVol~^S<Va&nAvAK2Ywee=!#$B(3@P%rtO|xWrOeLg{2-xgnHYb
zHFfWaT#(+dOb)hWKy%JvRCI3{TBohG1-og1MJEP5^i5N~n4Qc2#I5EX_Us#vnCL5~
zz%Wy$w6NwpZs^*I=E4P05d+SyY6$p8t(cN?<A=;b&3Da)LwRM!(LVFvTxGH54r$q=
zwXWiD6JKLZ93@+tLkM4fOZ_vxu+XoJO6#c>*OD)wha#Yf-PJ$tizlOp^dv}@LnKjl
zgCje*IK!A`y1r6<6Vpe=G&U~!cNLtZnt=BxiP`;X`r!WQ&81jCQvVs|xFN0gj67!?
z*SjlgeK+boVqB_;u%-?!x|F)jr+^|seV8ld^Ea1qK-+5wm1)NE=?vkX)aWSn6{?Nx
zZ>KwJ%tMp-KXQ~bbO8o1#PR-vtbJ~8=Yiqjk0D=HuJP6J?8y68(o`aFUnSWnFIuR_
z?5hg!DVq4?%@ohb*ooaJzS46sx3p?98vY~y5|qeXbY(81yWp7m)&Tnjh4D+|e?tHO
MdC^#>O3NwoKd$7B761SM

diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
deleted file mode 100644
index 00db0210a75c72b44d2a0210cbe73e151dddaf67..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3817
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
MdC^#>O3NwoKd$7B761SM

diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
deleted file mode 100644
index 1a1f5521bfa75bd5436de550810fa81376f830a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5125
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

diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-40x40.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-40x40.png
deleted file mode 100644
index f7737b6efa780c2f9f698704c2e9f2f4768412e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1226
zcmV;*1U37KP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700004XF*Lt006O%
z3;baP0000uWmrjOO-%qQ0000800D<-00aO40096102%-Q00002paK8{000010000e
zpaTE|000010000e00000SuRAD000C%Nkl<ZSPAV{T})I*6#kZ7ShmWtxC`>55W%EX
zQhypNCTKDKv^4=0A1G<n2h&7aW7@>_K@x4$#HdmF(4=X!O&@A2rY3EJjmAi{p(vzA
zt7)OM+AKmrVL=21mi@swYZmX`J2UsfrHK!mgfMf?nKR!#XU@-BMj7Ebrnu)ATLjt^
zK(i5=@}OA{+RPeIo^S8=<G=0^1Oj1XrzavS)efu47)=U5@4aDsTHTKNTMw0Zk(dyN
zm9Mx^vfP7$`AIP{qZ^CaI_P^Cz~+6;@bv|xcP^Qigxy<mkdtng>Zye$0{|TQ=B_R{
zy7XG}0Lu3^;e2DS8iRCi7~t?oSYyZ^7)8S${TjZA5eSB{=eQTu7rR6%8onWbP2NGA
zxzw#W+;)E$Jm4Bd1%o>4u~Y4+yBYgl6)G`HU4VT9LG1eM4u<?%54w}%VX;_Z3>w)G
z$h{}LxYskHtF8<1%bHGfKNvwP%TzU`B-yZfiA&8kv>zA@;`1LmbakZwsivK|{4}(;
zZa?N4tK6D{4A1y7GivC3Lod9Y+7FM)>Aw_UO}!7n;L~ZW!{^6uEECn_oMy$hpUlIW
zS5wp?-F-MbiXZEIQavfaUv9)cWC}Nr2;`yna#6j1KFZgoVTLoFr^e;g{T_RVT1i-_
zd;5cU{llATeSG{*Hr`sDs^Kdc%rOyfe_z{$%QyOzBJTQJ)dHlt_#Y+o;Qd~HhE<(v
z!=>x;OXFB#Q)@fAGY=<O`19vX;{uB^MR$>02#{JBk3!5nyTAAs-(4_PY+uTG0bf<V
zh%IlX^UOtfvNkCMNI*nHiBnbGh8@TLLCf7Ck=hvFX0_mhvMf}TW{&Zc3k$hiK*DLp
z!-}vTHU8O;%}vcHT;RmIWo{HLPL514qI2(-WT3svkF)hXF)D7S5C(*j^ce{;MnoIx
z3cs?pMSl*vH8Nh6txCnqdHi?x(c81p*fbC+{!yDWH;PCYVh_uzIhhX8IWB+5AHun-
zJ=k`z1qZ%v#iOB+MsK>qit;sSWBj?Z9H5RQA|XIJP_!snbWX}Aul~deaK(|oxx>VU
z74ESfzI>tl4k^I(D?Dsu7e8PrN+$fPbr8Jb?wW36(Mg2OW<lAiXWr!5lLE}1X-9FP
zn|IDI@8>K00W~knfs#TG(o*EfC<RC;s5H1FZ$u9%O+vwtwq()AQ|ZwoU4Ybr4sOpy
z+yp~SNx?h2tvCZD(<5DgWMC<4Ta{b0C-fc*@}1y)n?2sx+cpG{KyG}^gTp&=rG=RE
zltj~ZX^}_C8u!{TK(f4Yu?wdU<U_ACL{V(tkbz~)gJwuLZs{4l-tq`%uk@hy+5<dR
z6=doR?{CV&8wKMZV%7If7+};;i2au8WYcyV>#;OnWV#bDn`I~s2$Mmk0Zs-8nT>J1
oL7AcdOEv}2tY@b@Xx4*I0M!Ofx_SqvF#rGn07*qoM6N<$f;a>#QUCw|

diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-40x40@2x-1.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-40x40@2x-1.png
deleted file mode 100644
index 68d79dd7e0eb5dd885066d322d59919f23aef0a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4790
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
AwEzGB

diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
deleted file mode 100644
index 68d79dd7e0eb5dd885066d322d59919f23aef0a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4790
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
AwEzGB

diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
deleted file mode 100644
index b5ff8684f0fb208eb46a2aa9402073e0ef4a7e47..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7748
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

diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
deleted file mode 100644
index b5ff8684f0fb208eb46a2aa9402073e0ef4a7e47..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7748
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

diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
deleted file mode 100644
index aef70c2fa696d8be86ba65bf8498f72feececf8e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10759
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

diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-76x76.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-76x76.png
deleted file mode 100644
index 6297cd1eaf6b2e6c16953d7ae66ef853e2a2d2b0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2174
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
AY5)KL

diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
deleted file mode 100644
index d3133502a34cc18a3aa69296d2d0d89b648503de..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8712
zcmcI~WmFu&w(j5of)m_=OMt;)a0%`n++lDHg9Hr_++lEccXtaK+=7$f1b4gSob%2-
zYu$I>zgNAg_wK6i+k014SFf(>4pml^LPH@!0RRAKGSU*NuM+w<zd?LG6ZBHNe--eS
zq6(q_Kut92qcOtkHN;$7#zH{>!1$`a0U*F&1K?gYnAZaULj?GXc+~*1FvS1XRblA=
zg@FYCLcjp{e_?c9<=-Uzn*VbCDPgl=|BZlV!~M7Z7phTlXz?nL9i>0H005{se=`gq
zHJtzefJFqWYrASI$b(EB>{yJ=98AnvAa;&_SpWeD=vB2dcQvMf*xA~<fFOdD|3H9V
z^}ofelobDfxY`I(YAYyHh&wo&Q*g0xvH&TCP$(!U1f0z*K&ldw|DwNM2~t|Qx;lbb
zS>4^;S=>2T9Gop#+4%VQSb^-U?Ci|12xb=#dskx!v%L$|KaKn!I}+wDrp{nTSFnRU
z#b3L|CJt_{f|Qhh9sN7~Gfr~|_`f~byZozJuMK4VTf@r60%ZNa(Okh6{|oJJ%|B`X
zXxBg83H&t%QU*iJZM7x9cINgjub~OC0ogeP{^93;RQ-3P|3Urqzf=FC>OZJ|V*x2S
zgUw&N>2GHUu?evLkFtN^1z7*~)PMBcKZoTXrLW^6gd)KD?=coaDOanD2LQ-%Wh6w^
zAuz}K$PkUWhUZ}crLQU$y#(~P1h_FOWdqCeLJ#%16*>)?c1%(2^HG|jx{vib53|df
z6<-*YbnTAwDFb0Om~zDu*hJoZ1%8eBI=1=rBILeZ5rF(F-NnKA$MlL<%T2mq`O`_m
zyn)xTTPq3e`)ofrGAD|OJm)|YICKJZcmS&31_KhTpU22r_9?&!22tR*2mq+GM2t%Y
z_|WZFMDhl(!{8Oz3+IPGaGC%I(=A}`pbP<21K={9DFD!-BQz8Y0G?5|+N-IHgbvY7
zm~Pm&kP&}?QD!X<y#PSl4@QX(6ELQBjTnRkKn4E4ok^e8Un;6LqhFKm_}&}N7KD3n
zWo6($6Zzamcezjb?zC2qnw**@Z|ME1k?JTI5LM7y38flHnhLTC|JaQH;793%4|7!J
z;%qd!S<^{Kn#;9SA|1Km*;2OSC`fYAx9}9GWyg+5%lP`3PW|hQm4}Xy5KOLx$*3!W
zvti;7>lYMRo3{fGusm(Dtr{GedpJGsVmw>C_sq@>(o!p>IlqDU%(}Ifq-3St(uF2>
zpVV#v+q7T@-%9sD-|rKEfN*dR76gEEM)6h!z_Hl=-mHc1zTOE;x7aozO9M9^dH+ji
zHIA_7K83P7!PEJ+qpA)`+!k^WX5qJJDr!G%f9efRZgNTUK4aWD%owB$Cc0~-{w33C
zpqn0xB*qWPruGD?8-CRam(odq5s3wAW$V3#z}e$xy*n$um=%N~H#rf3g(WwIkSY1{
zuYm_|KvCzSe(_65-N_O%AXW1x<8nR`758ccgbp0X-}ScXd^F@i;<d5Ry$?J5RFfuT
zMtFK{BQ{PK9mHo3Jm|*v8`R2ga+12Si{YU-G+td_4Ji%37NidLL0njSKJNip__@&V
zfBcD3d!Zr+GoTaMr76}=Shcbi!dM{HHs=#%wYUk&9_Ro|Yy{AinROC(uZ?7aWLpa+
zHF5U1No{wwatL=b(*qnb7f{vcK8s_kSlM#+@=ufnH?P*1Cg9fr>Nb{DKEF}3XB1;6
zoMjS3*Qn2c2M9|~Glya`Cx!=4AK=;2gL}1#@{Rwb3-Pu9e{l9R&O~2BRHWo#<)=jh
za_*IJSf1B(9$hS{g3X5>P%2M*a3}LYGjHk@636M6RwEGbe{F`bUP<{F)W%xW0*(*3
zAJ?p2NM-<S4-3RjGaL_WE+V-q;XX2zrv73EQD&*es#$V!#IKJ67!3Ux{29f4d;9%w
z(;s#K7D)RQH`k_*O*}^Pr_}0`J7Jv7y`pr;X|b~d9}w4;r@yszrA9mG@dCgl$Wof^
zn+sAGmMA-m?@f(xWFi%qAx0_;iU))anqgD$ERn$~>v~{oETD}9w!L0GM)I>GY2!&b
z8~@u>YSJK+w?-4)<%O5`$6-Wo$3vw$1Wr|?bu7PYQ0{{Q8NENsz}*{a!OIxfnS${}
zaA=nq3IP^3_%F5ItT8wth^@J~tEd$FjC9A{V-Wf85q-CZJX-_5%?CH|-{g^+sh|OQ
zQi=#!mph8^qB~V0LtEkuNJZeQ$6-^_JDo@>N&<15=5HFeFkTjo1-ery?9YdR!vo31
z2+*ZB^SExIM-;Zpnvrp}wA)?>1gFjf6q>-|K7gHtG4@2;7o<#|oc>3Gaf)zRzu|9*
zKX#S%Ia1BOHH*Hlu4Jubo5I9%w8uTxB0LCK{u0CJGG9#XeOFWvMa_Zc7^=kLPI~~b
zSbg(=F}v;VyAlOqF3_WB`>m>{BNuIfZz|HJY}+4(`Q0MQm3m383dH@1vyvqb#Yi=r
zy`LEDpx3qmcT`~oBp#plu|Bb4baWi*q`frGmvBMSIUuiCkJHj{HJ7LQKGAOXGj`6r
z-v5I&fOg8ENzCVYkyhYJg3I$49cg6K&{Kv+$hdkF5=H|>qH0ax_UNg|Q>kUv;Eh7}
zZI-R14DS7K?i-^hw6j^%pH3IKPu=+v(V9|<f<uwh^c^{|m3Vf{S6g^9kvFy`^zJiQ
z!k;)f`4|Bf$CbVvZ5a4#bvRjsvcm(~3{A7pE4SgyQQ5qk%sK<PmkE)Bw5`$L8Sta8
z&Ee^!ny&b2SQNS>$?Kf;x}Gzh=rxHbXs)8^>rR^Ep+{U3R880DvJYJph2!h2qlh?C
z(ZcQH4kvpdCR+_RuSzCHa^_q##X^84BwkgnUqINnH5({6_$K=64^Jho-jDdk5f4#*
zs0+E2`<)<cJ7EFs<sS|gDb#K}bL}@c>;7!j8`i`;4~SG2rb4ZbDR_$h-B!KPBAdR(
z0W)V7=a)QU6>tuxK<n8}Qtucl8YIsCPRIPfvE+L(gXAuvy!?_sp1|cL_e^E;X9Vx2
zE*mU3s6~>+;-3z;=7UXDd3x#o9%arF$A#p|uW=ob#WTS<(#1ANOYaV1{6F#9Xk%Y<
z2rSd!>+<XT{!>vqR0=j2`;`-SBCO`mv%X~67+-$*xv8-+5s%F;7C)HGw-Wv*WSKUR
zaSC*dP;D#e-r3QHtT7jv!}K!*$YvNZZ@gHQ9vjlYpEhnAU5$u*HQvE<c7^%$4b<Yg
zaPm1jsqKC0_t*nV2|%HLlEkN`O@O_z#QtSG_V`#`Hcq$do9YSyk2*_ojP|${qZkod
zkd3txE)Y+?jFnXG&^BLiv@@a|^4X0UuWH4vbvLQ*9^&y1>l!pjcUopChovORiQ;I?
zoLtU+5Dr*u-Bw;?J$|59MqLSW>DsMbgSe<s)s}=I>`h2)71%D-JYiRFl(3WVE@HAV
z?C^J&3s!p`3q5)}y(>J25_}0Hr$WqNx93Gau`lQD`b2zSichwS-<V!!c|ACuHQGB`
zppb!W#(wLfx>fD$0+&?2C2FEdoe!-7#AjDeAG-Uph|3xX1U?J>xtx7Fi}&3M5ux+k
zAhM<}e{DrI-on4<ywk-T#zIxlVM8WUzEX!jo*JhMT?H=UPrM(}bN$dM5W5lD1wf57
z!m_J+NYdEGMR*Fr3r#iNqz)8L=5RbKM6})P(T>&SP>y{Ump>AGaeEW;KBTh=O#tw7
zX|`aCp{+13<l`0O3z}8}%lRbkd@#NtjK$ncR+6$=5pUU`X^L>1NpSPf^$)IhJ9!ob
zx@Oc2qVq*sL<a3H@Pq6a1Jn8n-{ss^T8FHYb*~;&q81C<i3C0SO{Ye^Ci{O#hTW-n
z6r-;LX!oi7j#l);`IFSQX6+|JGnINHpd6_S%$^O{Nc)wTBCE>rNnLnmbXW3y@lE(!
zg){8DKZ(b7YF23N=gki<AM}}INg1E#4nwN_KLtvJe5pt9hKKg)gdT`Lq{fcH*hcn~
zgx+ci6%VDlMd7;0DJ-`#e|N5pb6ilMI=dXF+vJk1efL1REgXtHJ9Jh(?tHZ>ZCdMf
zmll=ks)kcPue|<xv(0++<7=vC;}@vvqU)XFnI2ingmtLfAJMW(w8Ib%Bp&d;)P1SB
z^T%p77DG(3wd&T~iTIwwB>tW)6`NGWO-JE$ENo;lU|4wn2(`Q1#zYs4=2KUQhaeCz
zH!p&GjGHm0oPd-xw~=upt~v%6OW9}0sA5Mt%Zh`#8`(b+ga8$!Mv&v?HbS5>b}Kh5
z8;3V+o=>&4dN^^u`!&31Da>tO!OqiKfgCkQWcaC}a1RhYP(L{-py?9z`~?n4kbwt1
zTBvKZm`R3&Rl2lKnq$6*h?dQAAyAmU|Ii(OgI|rk#zcuD$<AJaA<ranL~iJz!t4TY
zQR${~#C~i#vdFW(O%U^_8b8E0JG5?Df}1ygYy7)S<69A@YS{3$|2I9t_<fGHli!Tx
zo;K0ouZdwp>$&qM)c{S>P+TpXp&ip_G%DrC@L0$}>l&}AV;CHFt1|VHgtL>CaduCH
zBo|}m%`Wwqt5s_p%iZgMeQmuffxFN;PqRI=JX%`)E<F8~A$nKRlZb`PoUIJRU(`lZ
z0V?06m4J-nhbi<8B|_Shp|KzV)sc3SLvFJEQg^1ap(c#YCv5u>j=K|xBD_o^2)(#B
zB`=6Gr@`pc@YCwngOrI#*4rrmBgLmJQV-T1v6&V#EwsiX6L`23R=R^TRUD);B%HJ7
z$feAzd%4h-RSf>#QU#4-m{@f+v+`QWERHgsKTv+y(LW6R=ln>U*LBX-S!)*sdL*_+
zESdurGNqx4*`qr`O$JuMd@>PCy3JjqbvcyeM8EmE(=+{q2tJpRHh{BfdJ5S-+>S_%
z)D#x?O25m%JrC#nS<#9=S)QsnxL1PHwmn}KVlvl}cX~s9HH46-dUkLvxqTk<>pR8b
zEYge4gHt6zg(%Vuk}io~iJ*ZRe{j2<LS1P=F;oSM&{YEy^LRh`njV$V`l2EW-_+MU
zkPm8u)N03U{h~oca5Z|Z5T|apLEP%D(DP}=bMyHGFL$qVQyXH>qRH0l%GXo)1`CE6
zJ74ErL)-))Aa_e=#-Ock%iK!<0ZPE4I;pE7BN(hakV22Vdx+zisGmo3WAj@<`}CBy
zk6x-&LXq1ldlr!@N6csjxe!ZU#b^7sc=h(Pn1DCfy}U{&;&=UAJ?z}UjC2CdR&VGk
z^%};O=Hl`+qWT<fI1axgou<j5y9Wxe3==o{l2J`;rxnwyKvcbaMt<;w)w=`*L+F#O
z=l()zF;|jK^*%_dl++@(jZ@E~M?|(>?D0I;-U6Z3q^eGhA}e(v(DrA!=dU4M)p;wE
z{>u&**j|Ip=e8n1T|^mm_cf4OQfb6deB%2%<zZ7D4v&DHWy54smG65zN6vY$$+t(+
zTr!MOLDvVFVP&jDUzzm=Rzb|Da{IUH(vgU((H3Rsf+S)^rJVa{9(pyeMz^VTkrP0)
zvU5I56YetXG=P*I@mBm5{jgm_My|BYs8nmqO_p_gd?Z9G_%zMzrXQqH?}SMsNJ<~f
z`H5mb#(<9m$sC4yMkoTlj6G~3-N9E+_Mov(+D(r*-^Wm=w`Kp5W~A~TbLi`0eqt9f
z-M0Nn8+{lo{9?=bN2sdI$?lt=vkk;PttNMb(F<D0%q)Cn;|-&Yb}{9}C+G$dk2`8d
z;6L4~(?#RS&pZ;z<n?NAQM1D-`LdKE5c$*q`=QGQbN+1elL3+tQC(1Jek<)SgwLs4
z3R0g+ivaP|Sfs_2-OU&~iMLuUab_GTv3IpE41JGCJlRPPa#L^F&psZ<hl~5F(YX#G
zxi0#68nGv-n(s^-ns;ZT>Qi$dl7x>;GESR%d!PbGlReQpt<O=68p%v=)%4fy#SkiQ
zr$WG88cy}H92KCeA_>;8$}hh{f^N@_NZNb9OxXI5eV!P1&pi-FYG}f|P!C8^kYX<^
z_(=S2EuOkC&Tnil{#$a`;gqj^tP4xbx-NJpNZm2dQg$#`CPtQS38RuUIE3ZIpXLym
zz4fym9s5WX@-AC9$vjkaZtp>a-67%H%Sux~aWiF<qf;v)>(N<oM0{9e_H7r`t9`X0
zUgYM>(<s~-JQYup_oUy4fH4i3!Cr47^eT<~z9il|I&WN3*pz9X(TI#;0bJo*DVoAD
z{qQc9RdB8~S4^%Id}_n!Y-f1qBt}=)8cYgxiWkN9XZ>$T2E;6#($(;Az?v~(?5|(J
zC1WL*_q&c5r*%zsLmI*cmggy@G@Bw9ST7aq@4dB5CUze-W6Mfd_7gPrK6~jCSXfV)
z$Y?++F@7<0A4QB#Y}5v!%1GJYPL@?Oa;p3ujFFAue0V4XUDQXU`D%W3Cy32~!I>;S
zNZ{Zkl0L54luphP#&q{)z^HQUYwxh+iL}l~{lMP`16^3X!Zp$?WXg*S=$7B51bV_Y
z`cZ?q{ifhKpp4d=hg<~w?r@cc)#yxwG&XgU-w7Gx?(5-fJHK^@Q>P$2q8SoL$SErJ
z9fT=sW?$Eb6tkO7XR<Fts+s_(T$FU9;&j@?{H3GR<F4N%bmikcO1+o6B?Ov-mD)SZ
zId;5n1nY`Q<i~e(sOE&=)8Ke7;;UF;+Yc0tm6skJ&?IREpFpv0y+7^W!(=3HD<YoE
zLwjOxGFwYI>iwxd=K53T<7yRZzc?*9Nn1c&rZQ>u98VO31(P?EWC)>LY)E+_=6RMk
z^;C_i%YS$!Oa35;WPzyOu?T-UArqhwXc8`by0I9`?ovX2h-yMR;?DA1M&SDt+F8Fg
z1N9Dd9~Y4c@>yr;rKaVWGG3<dS;9gr6ZFilF{#JJY>Bge^Pn5EDoB<bCDR8st$n+A
zpP3NFiQp0>9rw{Fk?|tXjJ2dR>)D!WN3e^0CP7Pq!p8KfRguvKUm=L+gjpimzQm#z
zvgD%#V?n5@G4qXeTsM50aT&wMb|-VgN_PWQJakqRRNWd}b9MEA%qz+7?Igi&p)@v_
zU(-SWq95(wDPx3D$n9Ttpws?R*0hA&R+URuXRlqh$`dbARgo%c-4L+Tvqu&R*@{vb
zEU_6Xo*Pj*g;lZx^4GCXW3!byu!lh(gi<joWHI-YO4Z^-`5K=C8C@ksu?wBujY#vX
zx}L50Bn_L$l3yGvkg=BQ)`xd&?P$=TT4slPsc8}XtoxC3dK!f@msU23shq?uIYOQy
zwJ^!c;Gyqz++G^h%nPNlv2YAgDTM;D*AlvfCZpeG+m^w22=Hm=nT(X~I$aX-Ct2SX
z8t1lG+GK%utql+}6}Hcb3(sk7eP!IbZlCWH$eOK8h#G;%>Z-*3U++z5dHNbdFr+!g
zIpP+|f`dow#AjB(J*T3Cw0kkP2aaZG<<QS}v$!o&@%{lb3`@=oqLq(!e4f58%w#Wp
z+&GrzB+Vo$tScmOys*Jh6Z&5aSZ&u=ZEc6<q1N}9sY~KW&L6xff52FLbo3?qZqzEj
z#6^l_wz-`n1g@dvDrHMkEcwicv1)K`L^#oTCiuZO@a_jB^31ehP6VYYJMo8Rm;%Af
zJN&G;U=vw3W>ulkewPAX@-=?4FJAoEV^QODs|#!EI$%w&@P#LfKaK-&0i#ldMoe~o
z^UzJn3ZKOHe)~0^={!(2daMxWocaB@uH$YWF~qrOs#u{(L!}w_VZ^f4ST}`gKxp_G
z=f`?(sPjZI=dayDf@|$;&taz5$e}%%OhbLMO6Ixcxu#3TcE+8BF^F2|dZe}~1D3o#
zyDcbVEmwU|&KuDkc|DmL<iI$2_~9DWS{v-|-AJpf@xqDbZ@rp+x_l7wKnJSTcuEuT
zFb=g7&wuUYFm#Q>SD@u%XTpt_Y-lNL$Lh1E??p;u(oZ%kmE+DlAM<h3;a=N8(ei0G
zjrDLQZ5keoa2(vwUTAshU<K6WLL6V@)A`v6+n~?%XX3sEKfi=QJZjx><GEuzCWF}-
z-TKFgt7G?>%pcnr_{wF|*;$e$bG9V}m)kWq`jIYo^#?k}d}@PaEZ%Ry6?wx#xzjSN
z##u9y0@23m5<kSQh7J?V>A{;#hX4Z@a3-G4B;$?0E5s~?>UM{EftsSCt{!PhjyuLm
zFP0cul=l+SC>-qGe1U<2C9JF!2p8rc1A^Lm4f9&-zWCoSk4EiX!MINN+l@#(d7&V6
zin{3{!N^)`b`B~m%c${guX+bACt=2cgT-L7RUDwPd}fK_&E3aNn6WUkf}-}=rF6r*
zo_)2kG{bfQYe6FUyK%*n9wbVj|5_G)a_ZsAdF-d`C_>3~yo=$H6zempY_QFrt8<GL
zR}jyi@wL2dAwFwU!P{vbzmj9@ag$pQOIIW)SSR-(uWme0NU~j8hJDGb2sqcnL(atS
zEY!^$QxX_>Kiw$%a<eOhY$d6q5|AMnDL~iqsfeLE@$b6ME;t_5#i{33J;8CX!8|Q5
zQONaMmRmJrqQOf>z3@w8`B?puY}U1FcWIlwJTX^6@`Z>Nj84ABZ|B0>_TLfm5oU$t
zv2)Zr<U;MYZ-G)_1<E`IXLn?aV@N8Y`!z<<$ZwV{h{Tod9Sl}{&E!g+C|o8JQZm2q
zV$<a0&o41xDMgAubQ|mOwk7+=Wes)=R8|4h3SQ?6;X2w2AIm%bJ$+5YZfy#*)=a;~
z^bqUyb#-v-ia{dH21@>j6n8bgRvbK(eUJXjt}3F+L|R5r%`5?BS3z>g%<R#2I6-bo
zK3t*8kCUKC{xs0<c+2QP)ul8^6Sl^qW6Ir{*VlE@<NHP*OVQ;#CaMtdq0C1juHn<-
z(Fws}TpZ;6g0L^iMupQcvA`77qvcP8+8+aj2a-4J`VPN!NT=+d1+BKQJzozJT{to_
zO|4p~SN3L?1kWHF{SN6k>Ggg~oNoU1L0X#iih&ZKHjt_UVtJ`ReaMNjo~D+Z!N^Fj
zXIM+~sc9IyEgpANc{m1!fKxynA8|)-xZ`}P__7YSA2E9tzQM?I$mZ&E9OcNhn%-%?
zZe|`OOvuBkG1^UNjNMvI>(tcQ7t};77*OlKlWXGI!e8Hm``Bqs*~UN<?QTnn2rSA`
zCF)N9aWlXd;m&GKuVm@oY5fc>Mp~A=LP>tt!dZg*^;;7W+Y4$7l&>U&0i;?wr9P4T
z4R(y^5d;r<A%?5=cT$l0c~BjBEO3&p&En6PPUo3QDoL}E8jc99I?h==wRwCdQSmFO
zOEt#c&I{Sy7<RbnWf!99izIpL!%<stC1a7MK|YtShiV^Ji&qI1hJM0{ALEm)QsQeU
zI993oT*uvew|m)la5Z<kWHSft`AV~FfXvMMb2=H_C9<~yX;L$;OmfyhD`-5yWn@@C
zcIXxui>Ev#f|YD!5}=W|HSAu+*j?lyVOut#JpF0UpEi_!eNJj%FnUZ*1QdP2H!B2O
zY-4VwT<(chCwm7_ODiuO%Ypbp)-Y|&lk7+_rwq(3VN;GyDG~MXt`#V|Nf4$DkS&I0
zncYK}e?;CC!$3i%qTGHSzZO<B{hIcEFC5KgyCTMvV1V$$7?;x#_6r^CJr`GDO9y+I
z!x;Ta)bPwqC4ZUFpv`OiOr^L{v;?HkhNsYb6AE(9RIo)HIOn1pZ6zV3kb&F1pDD^0
zw**SYibv5ujMQ7LXe|VAq`avz5=nvy*58oel3ku^e%<@Oe+|G*jHi67Z%K>2Udl&?
z@R@Y#r-Q()?E@&Y|M~n<@1oyeXml-V>JZQ*$=uy5`uSk^PTS>1xxBE*7wL=ONbAa!
z2<?OP*{$?pzzm(cOZNMWrD29r7}_;m8QL`4LqRIGh|vdg&gU!Yh$yk?1J9@%6xq#(
zuElpxo<;mv=u=jSZDX^=NYHy5(ZWYOr61%$x|Zgfi8sXZ2b9P9uWM5Q?{qUShF)U;
z2ZMoQBTm-4XD`d=BQPweiI6VsqfxvBWT%RT_vJZbFN-)tbm?qovGeCui%O=t2U!+-
z+ieG8yZ5dL{c+rJ2=Q+zFG5nWfKRkUGLlX-zi$mKZw4N^2%<tG#I?{p5I)?W(+m8B
za<`BEV&5?NcG)Y}M&!89eMO~NEG`4&r&kSK2F{Djv5{`p`LYfSbZyFzDkc*O_!iGu
zkV^5y^+6<@kF9#=aHbu9w8u&pW_>*Vb5x1UujqLa1E?c?qs67`uD;#myW;;dli!be
z=Y5*ImsHxwvi*6QdLG{UaKhW01}AW{`<mn4tP;fQ$zCo0;BXRvGt*m;^4t-ubOJfL
z%V>6Y;!=xq?*ZQ-(^886U{P&ONM4pvl`GX@vy;2SEc3`39lWU`47i;A3WZM|%<F@b
z&%g|lLqfac|M+kgl04${V3N7^zFCru#zV+-(;R<)BdD9!Q8v0!Dls?=D0N~6hev89
zxwM8S;G>{)0c0}esTHj;b5DUm?r<gYTT%>yQ&_iK(+o0qIO>a+V>)He>Uu+aLp)LB
zP5(YrEE%C55mqFd)2|Mp;haVJz$cByO3?JkeMZjrZq`-L*U1nU-R<0QX?D8;cLD7C
z#}!aVb)}NM5C7wS9I58~7^S_rmB@EVT?sC-*hIAvR!B>gFkh{BIRb^oGvc5jC}<6V
z@lNt8Eq_BXc-3|nj#xq~Gc_vQ(tRl3>5eun?;x3t9IjJ+=EbzbRmX1$oga?b=nWbA
z+$?uWQM4_6<zTA<7sShj*<gK1y4vw>Se{qXa)iIsk=dpmS;N~TeS-9$?Q1*l7=!fS
zWlajNn{B2CFwn#HJ?kBPbB2!TMZ*l-7<yT(v^QU>dTd$Vxe?s;IWp0^M6^ZsY%HX*
zG{+bWMF%5Q!`Q9ex?Anu#}(?!F(t{WKPAe&ST1pN>M|4!Vi9k=!U_F?u9j4M#Ypz8
z{7}0Z8-Bnh7I*xv*Hn^v5~PK>p6YR~F5DFleiB35r`IUc$smu`Gxfo+EeA%CUYP=_
z^J-~sr<u`Ri#w#7K%@!V<ged(?}iSc<qQCAdGt2l40ON_d6j8xA;5@@@95bL1c3Us
zM-8XK`VIW5epuKC7(JhXXl+mcc=3II42$6Y|C67|V}}6ZgOlr<fB%b+`KTySDP|P#
EUt#k*DF6Tf

diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
deleted file mode 100644
index ee50a72abe21babd04e8188e5a2e37c22719ef7e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9869
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
Qw>V2)T1Bcx!Yu6n0AEu_TmS$7


From fad2445d9c6cc2ae0c67758a00c72177cf4f2bb6 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 11 Sep 2024 14:08:23 +1000
Subject: [PATCH 507/547] Add CI pipeline to generate a new beta

---
 .../release-pipelines/new-beta-release.yml    | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 .buildkite/release-pipelines/new-beta-release.yml

diff --git a/.buildkite/release-pipelines/new-beta-release.yml b/.buildkite/release-pipelines/new-beta-release.yml
new file mode 100644
index 000000000..0c5dd40d7
--- /dev/null
+++ b/.buildkite/release-pipelines/new-beta-release.yml
@@ -0,0 +1,35 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
+---
+
+agents:
+  queue: mac
+
+# The new beta workflow needs to run on macOS because it uses SwiftGen under the hood.
+#
+# Notice that SwiftGen should work Linux, but we haven't tested it yet.
+# One thing at a time...
+env:
+  IMAGE_ID: $IMAGE_ID
+
+steps:
+  - label: New Beta Release
+    plugins: [$CI_TOOLKIT]
+    command: |
+      echo '--- :git: Configure Git for Release Management'
+      .buildkite/commands/configure-git-for-release-management.sh
+
+      echo '--- :git: Checkout Release Branch'
+      .buildkite/commands/checkout-release-branch.sh
+
+      echo '--- :ruby: Set up Ruby Tools'
+      install_gems
+
+      echo '--- :closed_lock_with_key: Access Secrets'
+      bundle exec fastlane run configure_apply
+
+      echo '--- :shipit: New Beta Release'
+      bundle exec fastlane new_beta_release skip_confirm:true
+    retry:
+      manual:
+        # If those jobs fail, one should always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite
+        allowed: false

From 76b14950726221af0318a76eca104dbf32b5d52b Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 11 Sep 2024 14:11:14 +1000
Subject: [PATCH 508/547] Create release backmerge as part of
 `new_beta_release`

---
 fastlane/lanes/release.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 4f69efd97..6f20a4c97 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -133,8 +133,8 @@
     new_build_code = build_code_next
     UI.important <<~MESSAGE
       New beta:
-      • Current build code: #{build_code_current}
-      • New build code: #{new_build_code}
+      - Current build code: #{build_code_current}
+      - New build code: #{new_build_code}
     MESSAGE
 
     UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.") unless skip_confirm || UI.confirm('Do you want to continue?')
@@ -148,8 +148,10 @@
       version_long: new_build_code
     )
     commit_version_and_build_files
+
+    version = release_version_current
     # Uses build_code_current let user double-check result.
-    UI.success "Done! Release version: #{release_version_current}. New build code: #{build_code_current}."
+    UI.success "Done! Release version: #{version}. New build code: #{build_code_current}."
 
     UI.important('Pushing changes to remote and triggering the beta build...')
     UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.") unless skip_confirm || UI.confirm('Do you want to continue?')
@@ -158,7 +160,7 @@
 
     trigger_beta_build(branch_to_build: release_branch_name)
 
-    # TODO: Switch to working branch and open back-merge PR
+    create_release_backmerge_pr(version_to_merge: version, next_version: release_version_next)
   end
 
   desc 'Trigger the final release build on CI'

From a25315594ab7375f8a30efc97e0de253f8199dcc Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 11 Sep 2024 14:24:14 +1000
Subject: [PATCH 509/547] Create backmerge PR for new beta

---
 fastlane/lanes/release.rb | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 6f20a4c97..d8722a8b0 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -160,7 +160,18 @@
 
     trigger_beta_build(branch_to_build: release_branch_name)
 
-    create_release_backmerge_pr(version_to_merge: version, next_version: release_version_next)
+    pr_url = create_release_management_pull_request(
+      release_version: version,
+      base_branch: DEFAULT_BRANCH,
+      title: "Merge #{new_build_code} beta"
+    )
+
+    next unless is_ci
+
+    message = <<~MESSAGE
+      New beta triggered successfully. Next, review and merge the [integration PR](#{pr_url}).
+    MESSAGE
+    buildkite_annotate(context: 'new-beta-completed', style: 'success', message: message)
   end
 
   desc 'Trigger the final release build on CI'
@@ -357,9 +368,21 @@ def delete_all_metadata_release_notes(store_metadata_folder: STORE_METADATA_FOLD
   )
 end
 
-def create_release_management_pull_request(release_version:, base_branch:, title:)
+def create_release_management_pull_request(
+  release_version:,
+  base_branch:,
+  title:,
+  use_integration_branch: true
+)
   token = EnvManager.get_required_env!('GITHUB_TOKEN')
 
+  if use_integration_branch
+    Fastlane::Helper::GitHelper.create_branch(
+      title.downcase.gsub(' ', '-'),
+      from: git_branch
+    )
+  end
+
   pr_url = create_pull_request(
     api_token: token,
     repo: GITHUB_REPO,

From 7c2f5dd0d963afc4472d70e0f6d1775179f13fcc Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 11 Sep 2024 16:29:13 +1000
Subject: [PATCH 510/547] Use named block parameters in `new_hotfix_release`
 lane

---
 fastlane/Fastfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 4c892e9d3..01c9b8e6b 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -90,11 +90,11 @@ platform :ios do
   # bundle exec fastlane new_hotfix_release skip_confirm:true version:10.6.1
   #####################################################################################
   desc 'Creates a new hotfix branch for the given version:x.y.z. The branch will be cut from the tag x.y of the previous release'
-  lane :new_hotfix_release do |options|
-    prev_ver = ios_hotfix_prechecks(options)
+  lane :new_hotfix_release do |version:, skip_prechecks: false|
+    prev_ver = ios_hotfix_prechecks unless skip_prechecks
     ios_bump_version_hotfix(
       previous_version: prev_ver,
-      version: options[:version]
+      version: version
     )
   end
 

From 1fc822399fcaee3c4edabe19fc5fbd8d8217a2b0 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 11 Sep 2024 16:29:43 +1000
Subject: [PATCH 511/547] Use named block parameters in
 `finalize_hotfix_release` lane

---
 fastlane/Fastfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 01c9b8e6b..0597dcb3e 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -110,8 +110,8 @@ platform :ios do
   # bundle exec fastlane finalize_hotfix_release skip_confirm:true
   #####################################################################################
   desc 'Performs the final checks and triggers a release build for the hotfix in the current branch'
-  lane :finalize_hotfix_release do |options|
-    ios_finalize_prechecks(options)
+  lane :finalize_hotfix_release do |skip_prechecks: false|
+    ios_finalize_prechecks unless skip_prechecks
     version = ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
     trigger_release_build(branch_to_build: "release/#{version}")
   end

From 05f7b0f22d26806ce06cc291b29fd4a5253f017f Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 11 Sep 2024 16:30:00 +1000
Subject: [PATCH 512/547] Use named block parameters in
 `build_and_upload_release` lane

---
 fastlane/Fastfile | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 0597dcb3e..72a43bae2 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -179,26 +179,29 @@ platform :ios do
   # bundle exec fastlane build_and_upload_release beta_release:true
   #####################################################################################
   desc 'Builds and uploads for distribution'
-  lane :build_and_upload_release do |options|
-    ios_build_prechecks(
-      skip_confirm: options[:skip_confirm],
-      internal: false,
-      internal_on_single_version: options[:beta_release],
-      external: true
-    )
+  lane :build_and_upload_release do |skip_confirm: false, skip_prechecks: false, beta_release: true, create_gh_release: false|
+    unless skip_prechecks
+      ios_build_prechecks(
+        skip_confirm: skip_confirm,
+        internal: false,
+        internal_on_single_version: beta_release,
+        external: true
+      )
+      ios_build_preflight
+    end
 
-    ios_build_preflight
-    if options[:beta_release]
+    if beta_release
       build_and_upload_internal(
         skip_prechecks: true,
-        skip_confirm: options[:skip_confirm]
+        skip_confirm: skip_confirm
       )
     end
+
     build_and_upload_to_app_store_connect(
       skip_prechecks: true,
-      skip_confirm: options[:skip_confirm],
-      beta_release: options[:beta_release],
-      create_release: options[:create_gh_release]
+      skip_confirm: skip_confirm,
+      beta_release: beta_release,
+      create_release: create_gh_release
     )
   end
 

From 65f78778419d681cb45a8a4fc0ff946b10d5e4af Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 11 Sep 2024 16:30:21 +1000
Subject: [PATCH 513/547] Use named block parameters in
 `build_and_upload_internal` lane

---
 fastlane/Fastfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 72a43bae2..5630c51b1 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -218,14 +218,14 @@ platform :ios do
   # bundle exec fastlane build_and_upload_internal skip_confirm:true
   #####################################################################################
   desc 'Builds and updates for distribution'
-  lane :build_and_upload_internal do |options|
+  lane :build_and_upload_internal do |skip_prechecks: false, skip_confirm: false|
     unless options[:skip_prechecks]
       ios_build_prechecks(
-        skip_confirm: options[:skip_confirm],
+        skip_confirm: skip_confirm,
         internal: false
       )
     end
-    ios_build_preflight unless options[:skip_prechecks]
+    ios_build_preflight unless skip_prechecks
 
     internal_code_signing
 

From 5e597796ac13e1c327f55073c084ef747e7689e8 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 11 Sep 2024 16:30:40 +1000
Subject: [PATCH 514/547] Use named block parameters in
 `update_metadata_on_app_store_connect` lane

---
 fastlane/Fastfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 5630c51b1..6ed2551d6 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -270,11 +270,10 @@ platform :ios do
   # @option [Boolean] with_screenshots (default: false) If true, will also upload the latest screenshot files to ASC
   #
   desc 'Upload the localized metadata to App Store Connect, optionally including screenshots.'
-  lane :update_metadata_on_app_store_connect do |options|
+  lane :update_metadata_on_app_store_connect do |with_screenshots: false|
     # Skip screenshots by default. The naming is "with" to make it clear that
     # callers need to opt-in to adding screenshots. The naming of the deliver
     # (upload_to_app_store) parameter, on the other hand, uses the skip verb.
-    with_screenshots = options.fetch(:with_screenshots, false)
     skip_screenshots = !with_screenshots
 
     upload_to_app_store(

From db5033463bbb59914a42e1a87fcdbb0ee4e83340 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 11 Sep 2024 16:43:04 +1000
Subject: [PATCH 515/547] Remove deprecated `ios_*` actions from
 `new_hotfix_release`

---
 fastlane/Fastfile | 45 ++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 40 insertions(+), 5 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 6ed2551d6..092766ba8 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -90,11 +90,46 @@ platform :ios do
   # bundle exec fastlane new_hotfix_release skip_confirm:true version:10.6.1
   #####################################################################################
   desc 'Creates a new hotfix branch for the given version:x.y.z. The branch will be cut from the tag x.y of the previous release'
-  lane :new_hotfix_release do |version:, skip_prechecks: false|
-    prev_ver = ios_hotfix_prechecks unless skip_prechecks
-    ios_bump_version_hotfix(
-      previous_version: prev_ver,
-      version: version
+  lane :new_hotfix_release do |version:, skip_confirm: false, skip_prechecks: false|
+    ensure_git_status_clean unless skip_prechecks
+
+    # Parse the provided version into an AppVersion object
+    parsed_version = VERSION_FORMATTER.parse(version)
+    build_code_hotfix = BUILD_CODE_FORMATTER.build_code(version: parsed_version)
+    previous_version = VERSION_FORMATTER.release_version(VERSION_CALCULATOR.previous_patch_version(version: parsed_version))
+
+    UI.important <<-MESSAGE
+      New hotfix version: #{version}
+      New build code: #{build_code_hotfix}
+      Branching from tag: #{previous_version}
+    MESSAGE
+    UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.") unless skip_confirm || UI.confirm('Do you want to continue?')
+
+    UI.user_error!("Version #{version} already exists! Abort!") if git_tag_exists(tag: version)
+    UI.user_error!("No tag found for version #{previous_version}. A hotfix branch cannot be created.") unless git_tag_exists(tag: previous_version)
+
+    UI.message('Creating hotfix branch...')
+    Fastlane::Helper::GitHelper.create_branch(
+      release_branch_name(release_version: version),
+      from: previous_version
+    )
+    UI.success("Done! New hotfix branch is: #{git_branch}")
+
+    UI.message('Bumping hotfix version and build code...')
+    VERSION_FILE.write(
+      version_short: version,
+      version_long: build_code_hotfix
+    )
+    commit_version_bump
+
+    unless skip_confirm || UI.confirm('Ready to push changes to remote?')
+      UI.message("Terminating as requested. Don't forget to run the remainder of this automation manually.")
+      next
+    end
+
+    push_to_git_remote(
+      tags: false,
+      set_upstream: is_ci == false # only set upstream when running locally, useless in transient CI builds
     )
   end
 

From eb050d1d64734e9d474305fa082451ef5fc27c8f Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 11 Sep 2024 17:02:49 +1000
Subject: [PATCH 516/547] Move `new_hotfix_release` to `release.rb`

---
 fastlane/Fastfile         | 43 --------------------------------------
 fastlane/lanes/release.rb | 44 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 092766ba8..a1a0f57fc 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -89,49 +89,6 @@ platform :ios do
   # bundle exec fastlane new_hotfix_release version:10.6.1
   # bundle exec fastlane new_hotfix_release skip_confirm:true version:10.6.1
   #####################################################################################
-  desc 'Creates a new hotfix branch for the given version:x.y.z. The branch will be cut from the tag x.y of the previous release'
-  lane :new_hotfix_release do |version:, skip_confirm: false, skip_prechecks: false|
-    ensure_git_status_clean unless skip_prechecks
-
-    # Parse the provided version into an AppVersion object
-    parsed_version = VERSION_FORMATTER.parse(version)
-    build_code_hotfix = BUILD_CODE_FORMATTER.build_code(version: parsed_version)
-    previous_version = VERSION_FORMATTER.release_version(VERSION_CALCULATOR.previous_patch_version(version: parsed_version))
-
-    UI.important <<-MESSAGE
-      New hotfix version: #{version}
-      New build code: #{build_code_hotfix}
-      Branching from tag: #{previous_version}
-    MESSAGE
-    UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.") unless skip_confirm || UI.confirm('Do you want to continue?')
-
-    UI.user_error!("Version #{version} already exists! Abort!") if git_tag_exists(tag: version)
-    UI.user_error!("No tag found for version #{previous_version}. A hotfix branch cannot be created.") unless git_tag_exists(tag: previous_version)
-
-    UI.message('Creating hotfix branch...')
-    Fastlane::Helper::GitHelper.create_branch(
-      release_branch_name(release_version: version),
-      from: previous_version
-    )
-    UI.success("Done! New hotfix branch is: #{git_branch}")
-
-    UI.message('Bumping hotfix version and build code...')
-    VERSION_FILE.write(
-      version_short: version,
-      version_long: build_code_hotfix
-    )
-    commit_version_bump
-
-    unless skip_confirm || UI.confirm('Ready to push changes to remote?')
-      UI.message("Terminating as requested. Don't forget to run the remainder of this automation manually.")
-      next
-    end
-
-    push_to_git_remote(
-      tags: false,
-      set_upstream: is_ci == false # only set upstream when running locally, useless in transient CI builds
-    )
-  end
 
   #####################################################################################
   # finalize_hotfix_release
diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index d8722a8b0..885176d28 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -234,6 +234,50 @@
     end
   end
 
+  desc 'Creates a new hotfix branch for the given version:x.y.z. The branch will be cut from the tag x.y of the previous release'
+  lane :new_hotfix_release do |version:, skip_confirm: false, skip_prechecks: false|
+    ensure_git_status_clean unless skip_prechecks
+
+    # Parse the provided version into an AppVersion object
+    parsed_version = VERSION_FORMATTER.parse(version)
+    build_code_hotfix = BUILD_CODE_FORMATTER.build_code(version: parsed_version)
+    previous_version = VERSION_FORMATTER.release_version(VERSION_CALCULATOR.previous_patch_version(version: parsed_version))
+
+    UI.important <<-MESSAGE
+      New hotfix version: #{version}
+      New build code: #{build_code_hotfix}
+      Branching from tag: #{previous_version}
+    MESSAGE
+    UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.") unless skip_confirm || UI.confirm('Do you want to continue?')
+
+    UI.user_error!("Version #{version} already exists! Abort!") if git_tag_exists(tag: version)
+    UI.user_error!("No tag found for version #{previous_version}. A hotfix branch cannot be created.") unless git_tag_exists(tag: previous_version)
+
+    UI.message('Creating hotfix branch...')
+    Fastlane::Helper::GitHelper.create_branch(
+      release_branch_name(release_version: version),
+      from: previous_version
+    )
+    UI.success("Done! New hotfix branch is: #{git_branch}")
+
+    UI.message('Bumping hotfix version and build code...')
+    VERSION_FILE.write(
+      version_short: version,
+      version_long: build_code_hotfix
+    )
+    commit_version_bump
+
+    unless skip_confirm || UI.confirm('Ready to push changes to remote?')
+      UI.message("Terminating as requested. Don't forget to run the remainder of this automation manually.")
+      next
+    end
+
+    push_to_git_remote(
+      tags: false,
+      set_upstream: is_ci == false # only set upstream when running locally, useless in transient CI builds
+    )
+  end
+
   lane :trigger_beta_build do |branch_to_build:|
     trigger_buildkite_release_build(branch: branch_to_build, beta: true)
   end

From 2fad7e0ebfaf890a7d9c2cef9a886dbb28ee6d9c Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 11 Sep 2024 17:03:47 +1000
Subject: [PATCH 517/547] Move `finalize_hotfix_release` to `release.rb`

---
 fastlane/Fastfile         | 31 -------------------------------
 fastlane/lanes/release.rb |  7 +++++++
 2 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index a1a0f57fc..f092ca759 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -77,37 +77,6 @@ ENV['PUBLIC_CONFIG_FILE'] = VERSION_FILE_PATH
 ENV['FL_RELEASE_TOOLKIT_DEFAULT_BRANCH'] = 'trunk'
 
 platform :ios do
-  #####################################################################################
-  # new_hotfix_release
-  # -----------------------------------------------------------------------------------
-  # This lane creates the release branch for a new hotfix release.
-  # -----------------------------------------------------------------------------------
-  # Usage:
-  # bundle exec fastlane new_hotfix_release [skip_confirm:<skip confirm>] [version:<version>]
-  #
-  # Example:
-  # bundle exec fastlane new_hotfix_release version:10.6.1
-  # bundle exec fastlane new_hotfix_release skip_confirm:true version:10.6.1
-  #####################################################################################
-
-  #####################################################################################
-  # finalize_hotfix_release
-  # -----------------------------------------------------------------------------------
-  # This lane finalizes the hotfix branch.
-  # -----------------------------------------------------------------------------------
-  # Usage:
-  # bundle exec fastlane finalize_hotfix_release [skip_confirm:<skip confirm>]
-  #
-  # Example:
-  # bundle exec fastlane finalize_hotfix_release skip_confirm:true
-  #####################################################################################
-  desc 'Performs the final checks and triggers a release build for the hotfix in the current branch'
-  lane :finalize_hotfix_release do |skip_prechecks: false|
-    ios_finalize_prechecks unless skip_prechecks
-    version = ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
-    trigger_release_build(branch_to_build: "release/#{version}")
-  end
-
   #####################################################################################
   # build_and_upload_beta_release
   # -----------------------------------------------------------------------------------
diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 885176d28..5f477c175 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -278,6 +278,13 @@
     )
   end
 
+  desc 'Performs the final checks and triggers a release build for the hotfix in the current branch'
+  lane :finalize_hotfix_release do |skip_prechecks: false|
+    ios_finalize_prechecks unless skip_prechecks
+    version = ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
+    trigger_release_build(branch_to_build: "release/#{version}")
+  end
+
   lane :trigger_beta_build do |branch_to_build:|
     trigger_buildkite_release_build(branch: branch_to_build, beta: true)
   end

From 0f2f2072257df5ae72e7823b6e283f0ac4a10ef7 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 11 Sep 2024 17:05:19 +1000
Subject: [PATCH 518/547] Remove deprecated `ios_*` actions from
 `finalize_hotfix_release`

---
 fastlane/lanes/release.rb | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 5f477c175..6fc0fdeb4 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -279,10 +279,31 @@
   end
 
   desc 'Performs the final checks and triggers a release build for the hotfix in the current branch'
-  lane :finalize_hotfix_release do |skip_prechecks: false|
-    ios_finalize_prechecks unless skip_prechecks
-    version = ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH)
-    trigger_release_build(branch_to_build: "release/#{version}")
+  lane :finalize_hotfix_release do |skip_confirm: true, skip_prechecks: false|
+    unless skip_prechecks
+      ensure_git_branch_is_release_branch!
+      ensure_git_status_clean
+    end
+
+    hotfix_version = release_version_current
+
+    UI.important("Will triggrer hotfix build for version #{hotfix_version}")
+    UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.") unless skip_confirm || UI.confirm('Do you want to continue?')
+
+    trigger_release_build(branch_to_build: release_branch_name(release_version: hotfix_version))
+
+    # TODO: Create backmerge PR once migrated to release-toolkit 12.0
+    # create_backmerge_pr
+
+    # Close hotfix milestone
+    begin
+      close_milestone(
+        repository: GITHUB_REPO,
+        milestone: hotfix_version
+      )
+    rescue StandardError => e
+      report_milestone_error(error_title: "Error closing milestone `#{hotfix_version}`: #{e.message}")
+    end
   end
 
   lane :trigger_beta_build do |branch_to_build:|

From a1c9481a5bc92e91a54d54d6a76966145910355c Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 11 Sep 2024 17:07:55 +1000
Subject: [PATCH 519/547] Remove unused
 `build_and_upload_beta|stable_release|release` lanes

---
 fastlane/Fastfile | 89 -----------------------------------------------
 1 file changed, 89 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index f092ca759..ecce1a15e 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -77,95 +77,6 @@ ENV['PUBLIC_CONFIG_FILE'] = VERSION_FILE_PATH
 ENV['FL_RELEASE_TOOLKIT_DEFAULT_BRANCH'] = 'trunk'
 
 platform :ios do
-  #####################################################################################
-  # build_and_upload_beta_release
-  # -----------------------------------------------------------------------------------
-  # This lane builds a beta release of the app and optionally uploads
-  # it for both internal and external distribution
-  # -----------------------------------------------------------------------------------
-  # Usage:
-  # bundle exec fastlane build_and_upload_beta_release [skip_confirm:<skip confirm>]
-  #   [create_gh_release:<create release on GH>]
-  #
-  # Example:
-  # bundle exec fastlane build_and_upload_beta_release
-  # bundle exec fastlane build_and_upload_beta_release skip_confirm:true
-  # bundle exec fastlane build_and_upload_beta_release create_gh_release:true
-  #####################################################################################
-  desc 'Builds and uploads a beta release for distribution'
-  lane :build_and_upload_beta_release do |options|
-    build_and_upload_release(
-      skip_confirm: options[:skip_confirm],
-      create_gh_release: options[:create_gh_release],
-      beta_release: true
-    )
-  end
-
-  #####################################################################################
-  # build_and_upload_stable_release
-  # -----------------------------------------------------------------------------------
-  # This lane builds a stable release of the app and optionally uploads
-  # it for distribution
-  # -----------------------------------------------------------------------------------
-  # Usage:
-  # bundle exec fastlane build_and_upload_stable_release [skip_confirm:<skip confirm>]
-  #   [create_gh_release:<create release on GH>]
-  #
-  # Example:
-  # bundle exec fastlane build_and_upload_stable_release
-  # bundle exec fastlane build_and_upload_stable_release skip_confirm:true
-  # bundle exec fastlane build_and_upload_stable_release create_gh_release:true
-  #####################################################################################
-  desc 'Builds and uploads a stable release for distribution'
-  lane :build_and_upload_stable_release do |options|
-    build_and_upload_release(
-      skip_confirm: options[:skip_confirm],
-      create_gh_release: options[:create_gh_release],
-      beta_release: false
-    )
-  end
-
-  #####################################################################################
-  # build_and_upload_release
-  # -----------------------------------------------------------------------------------
-  # This lane builds the app and uploads it for both internal and external distribution
-  # -----------------------------------------------------------------------------------
-  # Usage:
-  # bundle exec fastlane build_and_upload_release [skip_confirm:<skip confirm>]
-  #   [create_gh_release:<create release on GH>] [beta_release:<is a beta release>]
-  #
-  # Example:
-  # bundle exec fastlane build_and_upload_release
-  # bundle exec fastlane build_and_upload_release skip_confirm:true
-  # bundle exec fastlane build_and_upload_release beta_release:true
-  #####################################################################################
-  desc 'Builds and uploads for distribution'
-  lane :build_and_upload_release do |skip_confirm: false, skip_prechecks: false, beta_release: true, create_gh_release: false|
-    unless skip_prechecks
-      ios_build_prechecks(
-        skip_confirm: skip_confirm,
-        internal: false,
-        internal_on_single_version: beta_release,
-        external: true
-      )
-      ios_build_preflight
-    end
-
-    if beta_release
-      build_and_upload_internal(
-        skip_prechecks: true,
-        skip_confirm: skip_confirm
-      )
-    end
-
-    build_and_upload_to_app_store_connect(
-      skip_prechecks: true,
-      skip_confirm: skip_confirm,
-      beta_release: beta_release,
-      create_release: create_gh_release
-    )
-  end
-
   #####################################################################################
   # build_and_upload_internal
   # -----------------------------------------------------------------------------------

From 9ff5a0694fa79578e8844eb1243846f1170ffaf1 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 11 Sep 2024 17:09:14 +1000
Subject: [PATCH 520/547] Delete unused `build_and_upload_internal` lane

---
 fastlane/Fastfile | 60 -----------------------------------------------
 1 file changed, 60 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index ecce1a15e..a1caa71ed 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -77,66 +77,6 @@ ENV['PUBLIC_CONFIG_FILE'] = VERSION_FILE_PATH
 ENV['FL_RELEASE_TOOLKIT_DEFAULT_BRANCH'] = 'trunk'
 
 platform :ios do
-  #####################################################################################
-  # build_and_upload_internal
-  # -----------------------------------------------------------------------------------
-  # This lane builds the app and upload it for internal testing
-  # -----------------------------------------------------------------------------------
-  # Usage:
-  # bundle exec fastlane build_and_upload_internal [skip_confirm:<skip confirm>]
-  #
-  # Example:
-  # bundle exec fastlane build_and_upload_internal
-  # bundle exec fastlane build_and_upload_internal skip_confirm:true
-  #####################################################################################
-  desc 'Builds and updates for distribution'
-  lane :build_and_upload_internal do |skip_prechecks: false, skip_confirm: false|
-    unless options[:skip_prechecks]
-      ios_build_prechecks(
-        skip_confirm: skip_confirm,
-        internal: false
-      )
-    end
-    ios_build_preflight unless skip_prechecks
-
-    internal_code_signing
-
-    gym(
-      scheme: 'Simplenote',
-      configuration: 'Distribution Internal',
-      workspace: WORKSPACE,
-      export_method: 'enterprise',
-      clean: true,
-      output_directory: OUTPUT_DIRECTORY_PATH,
-      export_team_id: TEAM_ID_ENTERPRISE,
-      export_options: {
-        method: 'enterprise',
-        provisioningProfiles: simplenote_provisioning_profiles(
-          root_bundle_id: "#{APP_STORE_BUNDLE_IDENTIFIER}.Internal",
-          match_type: 'InHouse'
-        )
-      }
-    )
-
-    File.rename(File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote.ipa'), File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote Internal.ipa'))
-
-    appcenter_upload(
-      api_token: EnvManager.get_required_env!('APPCENTER_API_TOKEN'),
-      owner_name: 'automattic',
-      owner_type: 'organization',
-      app_name: 'Simplenote',
-      file: File.join(OUTPUT_DIRECTORY_PATH, 'Simplenote Internal.ipa'),
-      notify_testers: false
-    )
-
-    sentry_upload_dsym(
-      auth_token: EnvManager.get_required_env!('SENTRY_AUTH_TOKEN'),
-      org_slug: 'a8c',
-      project_slug: 'simplenote-ios',
-      dsym_path: lane_context[SharedValues::DSYM_OUTPUT_PATH]
-    )
-  end
-
   # Upload the localized metadata (from `fastlane/metadata/`) to App Store Connect
   #
   # @option [Boolean] with_screenshots (default: false) If true, will also upload the latest screenshot files to ASC

From 6eff98bcbc0c33c655fdbd576814d70f9eeae62b Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 11 Sep 2024 17:10:08 +1000
Subject: [PATCH 521/547] Remove deprecated `ios_get_app_version` from update
 ASC metadata lane

---
 fastlane/Fastfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index a1caa71ed..7c10f389a 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -90,7 +90,7 @@ platform :ios do
 
     upload_to_app_store(
       app_identifier: APP_STORE_BUNDLE_IDENTIFIER,
-      app_version: ios_get_app_version(public_version_xcconfig_file: VERSION_FILE_PATH),
+      app_version: release_version_current,
       skip_binary_upload: true,
       screenshots_path: promo_screenshots_directory,
       skip_screenshots: skip_screenshots,

From a7b3d5b11d10f08c65b9e9fe95b1638bcd88c25b Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 11 Sep 2024 17:12:38 +1000
Subject: [PATCH 522/547] Remove deprecated `ios_current_branch_is_hotfix` from
 `finalize_release`

---
 fastlane/lanes/release.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 6fc0fdeb4..3fff452e4 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -176,7 +176,7 @@
 
   desc 'Trigger the final release build on CI'
   lane :finalize_release do |skip_confirm: false|
-    UI.user_error!('To finalize a hotfix, please use the finalize_hotfix_release lane instead') if ios_current_branch_is_hotfix
+    UI.user_error!('To finalize a hotfix, please use the finalize_hotfix_release lane instead') if release_is_hotfix?
 
     ensure_git_status_clean
     ensure_git_branch_is_release_branch!
@@ -480,3 +480,9 @@ def create_release_management_pull_request(
   # Return the PR URL
   pr_url
 end
+
+def release_is_hotfix?
+  VERSION_CALCULATOR.release_is_hotfix?(
+    version: VERSION_FORMATTER.parse(VERSION_FILE.read_release_version)
+  )
+end

From b4e2a68d0bd00b23117c7bb00c9192d83b602dd6 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 11 Sep 2024 17:21:26 +1000
Subject: [PATCH 523/547] Upgrade to release-toolkit 12.0

---
 Gemfile                 | 2 +-
 Gemfile.lock            | 6 +++---
 fastlane/lanes/build.rb | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 085001d07..166d46262 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,7 @@ gem 'danger-dangermattic', '~> 1.0'
 gem 'fastlane', '~> 2'
 gem 'fastlane-plugin-appcenter', '~> 2.1.2'
 gem 'fastlane-plugin-sentry', '~> 1.6'
-gem 'fastlane-plugin-wpmreleasetoolkit', '~> 11.0', '>= 11.0.1'
+gem 'fastlane-plugin-wpmreleasetoolkit', '~> 12.0'
 
 group :screenshots, optional: true do
   gem 'rmagick', '~> 3.2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 99f722ff7..c134643c0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -204,7 +204,7 @@ GEM
     fastlane-plugin-appcenter (2.1.2)
     fastlane-plugin-sentry (1.22.0)
       os (~> 1.1, >= 1.1.4)
-    fastlane-plugin-wpmreleasetoolkit (11.1.0)
+    fastlane-plugin-wpmreleasetoolkit (12.0.0)
       activesupport (>= 6.1.7.1)
       buildkit (~> 1.5)
       chroma (= 0.2.0)
@@ -213,7 +213,7 @@ GEM
       git (~> 1.3)
       google-cloud-storage (~> 1.31)
       java-properties (~> 0.3.0)
-      nokogiri (~> 1.11, < 1.17)
+      nokogiri (~> 1.11)
       octokit (~> 6.1)
       parallel (~> 1.14)
       plist (~> 3.1)
@@ -397,7 +397,7 @@ DEPENDENCIES
   fastlane (~> 2)
   fastlane-plugin-appcenter (~> 2.1.2)
   fastlane-plugin-sentry (~> 1.6)
-  fastlane-plugin-wpmreleasetoolkit (~> 11.0, >= 11.0.1)
+  fastlane-plugin-wpmreleasetoolkit (~> 12.0)
   rmagick (~> 3.2.0)
 
 BUNDLED WITH
diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb
index f1754d342..62b357c0e 100644
--- a/fastlane/lanes/build.rb
+++ b/fastlane/lanes/build.rb
@@ -61,7 +61,7 @@
   next unless create_release
 
   version = beta_release ? build_code_current : release_version_current
-  create_release(
+  create_github_release(
     repository: GITHUB_REPO,
     version: version,
     release_notes_file_path: RELEASE_NOTES_SOURCE_PATH,

From 4d462501812abb94d3bf36ad6ac4fe61ab5a6639 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 11 Sep 2024 19:51:18 +1000
Subject: [PATCH 524/547] Consolidate backmerge PR creation via single
 `release-toolkit` action

---
 fastlane/lanes/release.rb | 102 ++++++++++++++------------------------
 1 file changed, 36 insertions(+), 66 deletions(-)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 3fff452e4..d86e52208 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -112,18 +112,13 @@
 
     trigger_beta_build(branch_to_build: release_branch_name(release_version: version))
 
-    pr_url = create_release_management_pull_request(
-      release_version: version,
-      base_branch: DEFAULT_BRANCH,
-      title: "Merge #{version} code freeze"
-    )
-
-    next unless is_ci
+    pr_url = create_backmerge_pr!
 
     message = <<~MESSAGE
       Code freeze completed successfully. Next, review and merge the [integration PR](#{pr_url}).
     MESSAGE
-    buildkite_annotate(context: 'code-freeze-completed', style: 'success', message: message)
+    buildkite_annotate(context: 'code-freeze-completed', style: 'success', message: message) if is_ci
+    UI.success(message)
   end
 
   lane :new_beta_release do |skip_confirm: false|
@@ -160,18 +155,13 @@
 
     trigger_beta_build(branch_to_build: release_branch_name)
 
-    pr_url = create_release_management_pull_request(
-      release_version: version,
-      base_branch: DEFAULT_BRANCH,
-      title: "Merge #{new_build_code} beta"
-    )
-
-    next unless is_ci
+    pr_url = create_backmerge_pr!
 
     message = <<~MESSAGE
       New beta triggered successfully. Next, review and merge the [integration PR](#{pr_url}).
     MESSAGE
-    buildkite_annotate(context: 'new-beta-completed', style: 'success', message: message)
+    buildkite_annotate(context: 'new-beta-completed', style: 'success', message: message) if is_ci
+    UI.success(message)
   end
 
   desc 'Trigger the final release build on CI'
@@ -209,7 +199,7 @@
 
     trigger_release_build(branch_to_build: release_branch_name)
 
-    create_release_backmerge_pr(version_to_merge: version, next_version: release_version_next)
+    create_backmerge_prs
 
     remove_branch_protection(
       repository: GITHUB_REPO,
@@ -292,8 +282,7 @@
 
     trigger_release_build(branch_to_build: release_branch_name(release_version: hotfix_version))
 
-    # TODO: Create backmerge PR once migrated to release-toolkit 12.0
-    # create_backmerge_pr
+    create_backmerge_prs
 
     # Close hotfix milestone
     begin
@@ -347,18 +336,40 @@ def trigger_buildkite_release_build(branch:, beta:)
   buildkite_annotate(style: 'info', context: 'trigger-release-build', message: message)
 end
 
-def create_release_backmerge_pr(version_to_merge:, next_version:)
+def create_backmerge_pr!
+  pr_urls = create_backmerge_prs
+
+  return pr_urls unless pr_urls > 1
+
+  backmerge_error_message = UI.user_error! <<~ERROR
+    Unexpectedly opened more than one backmerge pull request. URLs:
+    #{pr_urls.map { |url| "- #{url}" }.join("\n")}
+  ERROR
+  buildkite_annotate(style: 'error', context: 'error-creating-backmerge', message: backmerge_error_message) if is_ci
+  UI.user_error!(backmerge_error_message)
+end
+
+# Notice the plural in the name.
+# The action this method calls may create multiple backmerge PRs, depending on how many releas branches with version greater than the source are in the remote.
+def create_backmerge_prs
+  version = release_version_current
+
   create_release_backmerge_pull_request(
     repository: GITHUB_REPO,
-    source_branch: release_branch_name(release_version: version_to_merge),
+    source_branch: release_branch_name(release_version: version),
     labels: ['Releases'],
-    milestone_title: next_version
+    milestone_title: release_version_next
   )
 rescue StandardError => e
   error_message = <<-MESSAGE
-    Error creating backmerge pull request: #{e.message}
-    If this is not the first time you are running the release task, the backmerge PR for the version `#{version_to_merge}` might have already been previously created.
-    Please close any previous backmerge PR for `#{version_to_merge}`, delete the previous merge branch, then run the release task again.
+    Error creating backmerge pull request:
+
+    ```
+    #{e.message}
+    ```
+
+    If this is not the first time you are running the release task, the backmerge PR for version `#{version}` might have already been created.
+    Please close any pre-existing backmerge PR for `#{version}`, delete the previous merge branch, then run the release automation again.
   MESSAGE
 
   buildkite_annotate(style: 'error', context: 'error-creating-backmerge', message: error_message) if is_ci
@@ -440,47 +451,6 @@ def delete_all_metadata_release_notes(store_metadata_folder: STORE_METADATA_FOLD
   )
 end
 
-def create_release_management_pull_request(
-  release_version:,
-  base_branch:,
-  title:,
-  use_integration_branch: true
-)
-  token = EnvManager.get_required_env!('GITHUB_TOKEN')
-
-  if use_integration_branch
-    Fastlane::Helper::GitHelper.create_branch(
-      title.downcase.gsub(' ', '-'),
-      from: git_branch
-    )
-  end
-
-  pr_url = create_pull_request(
-    api_token: token,
-    repo: GITHUB_REPO,
-    title: title,
-    head: Fastlane::Helper::GitHelper.current_git_branch,
-    base: base_branch,
-    labels: 'Releases'
-  )
-
-  # Next, set the milestone for the PR
-  #
-  # The create_pull_request action has a 'milestone' parameter, but it expects the milestone id.
-  # We don't know the id of the milestone, but we can use a different action to set it.
-  #
-  # PR URLs are in the format github.com/org/repo/pull/id
-  pr_number = File.basename(pr_url)
-  update_assigned_milestone(
-    repository: GITHUB_REPO,
-    numbers: [pr_number],
-    to_milestone: release_version
-  )
-
-  # Return the PR URL
-  pr_url
-end
-
 def release_is_hotfix?
   VERSION_CALCULATOR.release_is_hotfix?(
     version: VERSION_FORMATTER.parse(VERSION_FILE.read_release_version)

From e9c41f0c648374dc5c8c239068a0d58c52b1d6af Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 11 Sep 2024 19:55:33 +1000
Subject: [PATCH 525/547] Add lane to trigger new beta release in CI

---
 fastlane/lanes/ci_releases.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/fastlane/lanes/ci_releases.rb b/fastlane/lanes/ci_releases.rb
index c59892f45..b0e1525b6 100644
--- a/fastlane/lanes/ci_releases.rb
+++ b/fastlane/lanes/ci_releases.rb
@@ -23,4 +23,15 @@
       environment: { RELEASE_VERSION: release_version }
     )
   end
+
+  lane :trigger_new_beta_in_ci do |release_version: release_version_current|
+    buildkite_trigger_build(
+      buildkite_organization: BUILDKITE_ORGANIZATION,
+      buildkite_pipeline: BUILDKITE_PIPELINE,
+      branch: release_branch_name(release_version: release_version),
+      pipeline_file: File.join(PIPELINES_ROOT, 'new-beta-release.yml'),
+      message: "New beta for #{release_version}",
+      environment: { RELEASE_VERSION: release_version }
+    )
+  end
 end

From 6711daa0b754885ce39e578dfae5fbe6e9acbc2f Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 11 Sep 2024 20:06:07 +1000
Subject: [PATCH 526/547] Remove noisy comment

---
 fastlane/lanes/release.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index d86e52208..7af9270bc 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -228,7 +228,6 @@
   lane :new_hotfix_release do |version:, skip_confirm: false, skip_prechecks: false|
     ensure_git_status_clean unless skip_prechecks
 
-    # Parse the provided version into an AppVersion object
     parsed_version = VERSION_FORMATTER.parse(version)
     build_code_hotfix = BUILD_CODE_FORMATTER.build_code(version: parsed_version)
     previous_version = VERSION_FORMATTER.release_version(VERSION_CALCULATOR.previous_patch_version(version: parsed_version))

From 67ac37cfe17c37b0f0b9d8f73e12eaa69426d60f Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 11 Sep 2024 20:08:17 +1000
Subject: [PATCH 527/547] Remove noisy comment

---
 fastlane/lanes/release.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 7af9270bc..a380b34b5 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -283,7 +283,6 @@
 
     create_backmerge_prs
 
-    # Close hotfix milestone
     begin
       close_milestone(
         repository: GITHUB_REPO,

From 69d373e1e9d369335653ae7688f2e56dcfccbc82 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 11 Sep 2024 20:12:19 +1000
Subject: [PATCH 528/547] Remove var assignment that became unnecessary along
 the way

---
 fastlane/lanes/release.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index a380b34b5..629ad1d92 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -143,10 +143,8 @@
       version_long: new_build_code
     )
     commit_version_and_build_files
-
-    version = release_version_current
     # Uses build_code_current let user double-check result.
-    UI.success "Done! Release version: #{version}. New build code: #{build_code_current}."
+    UI.success "Done! Release version: #{release_version_current}. New build code: #{build_code_current}."
 
     UI.important('Pushing changes to remote and triggering the beta build...')
     UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.") unless skip_confirm || UI.confirm('Do you want to continue?')

From 6af72cb60f7cf56e4d2b0997a542b39771553aa8 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Thu, 12 Sep 2024 12:11:56 +1000
Subject: [PATCH 529/547] Fix typo: `s/releas/release`

Co-authored-by: Olivier Halligon <olivier.halligon@automattic.com>
---
 fastlane/lanes/release.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 629ad1d92..fd3234f31 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -346,7 +346,7 @@ def create_backmerge_pr!
 end
 
 # Notice the plural in the name.
-# The action this method calls may create multiple backmerge PRs, depending on how many releas branches with version greater than the source are in the remote.
+# The action this method calls may create multiple backmerge PRs, depending on how many release branches with version greater than the source are in the remote.
 def create_backmerge_prs
   version = release_version_current
 

From 71bdb7fe497f15b6a994faa2e887480bc520cb91 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Thu, 12 Sep 2024 12:17:58 +1000
Subject: [PATCH 530/547] Add required `.length` call in an array count check

Co-authored-by: Ian Guedes Maia <iangmaia@users.noreply.github.com>
---
 fastlane/lanes/release.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index fd3234f31..33f28e57b 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -335,7 +335,7 @@ def trigger_buildkite_release_build(branch:, beta:)
 def create_backmerge_pr!
   pr_urls = create_backmerge_prs
 
-  return pr_urls unless pr_urls > 1
+  return pr_urls unless pr_urls.length > 1
 
   backmerge_error_message = UI.user_error! <<~ERROR
     Unexpectedly opened more than one backmerge pull request. URLs:

From 05dd02e339fe5a96384a885ffdedbfa32a69a78f Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Thu, 12 Sep 2024 12:27:17 +1000
Subject: [PATCH 531/547] Remove unused `ci_releases.rb` lanes

We no longer need repo-level automation to trigger release lanes.

See
https://github.com/Automattic/simplenote-ios/pull/1655#discussion_r1753900531
---
 fastlane/lanes/ci_releases.rb | 37 -----------------------------------
 1 file changed, 37 deletions(-)
 delete mode 100644 fastlane/lanes/ci_releases.rb

diff --git a/fastlane/lanes/ci_releases.rb b/fastlane/lanes/ci_releases.rb
deleted file mode 100644
index b0e1525b6..000000000
--- a/fastlane/lanes/ci_releases.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-PIPELINES_ROOT = 'release-pipelines'
-
-platform :ios do
-  lane :trigger_code_freeze_in_ci do
-    buildkite_trigger_build(
-      buildkite_organization: BUILDKITE_ORGANIZATION,
-      buildkite_pipeline: BUILDKITE_PIPELINE,
-      branch: DEFAULT_BRANCH,
-      pipeline_file: File.join(PIPELINES_ROOT, 'start-code-freeze.yml'),
-      message: 'Start Code Freeze'
-    )
-  end
-
-  lane :trigger_complete_code_freeze_in_ci do |release_version: release_version_current|
-    buildkite_trigger_build(
-      buildkite_organization: BUILDKITE_ORGANIZATION,
-      buildkite_pipeline: BUILDKITE_PIPELINE,
-      branch: release_branch_name(release_version: release_version),
-      pipeline_file: File.join(PIPELINES_ROOT, 'complete-code-freeze.yml'),
-      message: "Complete code freeze for #{release_version}",
-      environment: { RELEASE_VERSION: release_version }
-    )
-  end
-
-  lane :trigger_new_beta_in_ci do |release_version: release_version_current|
-    buildkite_trigger_build(
-      buildkite_organization: BUILDKITE_ORGANIZATION,
-      buildkite_pipeline: BUILDKITE_PIPELINE,
-      branch: release_branch_name(release_version: release_version),
-      pipeline_file: File.join(PIPELINES_ROOT, 'new-beta-release.yml'),
-      message: "New beta for #{release_version}",
-      environment: { RELEASE_VERSION: release_version }
-    )
-  end
-end

From 9da02d385f8b82b93fd1226b8218438d18472c9f Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Thu, 12 Sep 2024 13:05:43 +1000
Subject: [PATCH 532/547] Remove code fencing from error message as it might
 mis-render

Co-authored-by: Ian Guedes Maia <iangmaia@users.noreply.github.com>
---
 fastlane/lanes/release.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 33f28e57b..e4ef0076c 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -360,9 +360,7 @@ def create_backmerge_prs
   error_message = <<-MESSAGE
     Error creating backmerge pull request:
 
-    ```
     #{e.message}
-    ```
 
     If this is not the first time you are running the release task, the backmerge PR for version `#{version}` might have already been created.
     Please close any pre-existing backmerge PR for `#{version}`, delete the previous merge branch, then run the release automation again.

From d1248f0f81c80b702b1574be71ec912c06366ccb Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Fri, 13 Sep 2024 14:16:36 +1000
Subject: [PATCH 533/547] Remove import for removed lanes file

---
 fastlane/Fastfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 7c10f389a..aa1cb1fb3 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -51,7 +51,6 @@ require_relative 'lib/env_manager'
 # Important: These need to be imported after all the constants have been defined because they access them.
 # A bit of a leaky abstraction but makes for lanes that are easier to write...
 import 'lanes/build.rb'
-import 'lanes/ci_releases.rb'
 import 'lanes/localization.rb'
 import 'lanes/release.rb'
 

From e48732f1e619a5bb68705263b1f5bfbd4fed57a4 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 16 Sep 2024 15:47:27 +1000
Subject: [PATCH 534/547] Rename `code_freeze` to `start_code_freeze` for
 consistency

---
 fastlane/lanes/release.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index e4ef0076c..676fc8f58 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -3,7 +3,7 @@
 # Lanes related to the Release Process (Code Freeze, Betas, Final Build, App Store Submission…)
 
 platform :ios do
-  lane :code_freeze do |skip_confirm: false|
+  lane :start_code_freeze do |skip_confirm: false|
     ensure_git_status_clean
 
     Fastlane::Helper::GitHelper.checkout_and_pull(DEFAULT_BRANCH)

From 338525e46fde6f6de74ea81a4ab145b11990e144 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 16 Sep 2024 20:24:18 +1000
Subject: [PATCH 535/547] Use `start_code_freeze` in Buildkite pipeline

Follow up to e48732f1e619a5bb68705263b1f5bfbd4fed57a4
---
 .buildkite/release-pipelines/start-code-freeze.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/release-pipelines/start-code-freeze.yml b/.buildkite/release-pipelines/start-code-freeze.yml
index 2d4ee58ae..49fabdaf4 100644
--- a/.buildkite/release-pipelines/start-code-freeze.yml
+++ b/.buildkite/release-pipelines/start-code-freeze.yml
@@ -17,7 +17,7 @@ steps:
       install_gems
 
       echo '--- :shipit: Start code freeze'
-      bundle exec fastlane code_freeze skip_confirm:true
+      bundle exec fastlane start_code_freeze skip_confirm:true
     retry:
       manual:
         # If failed, we prefer retrying via ReleaseV2 rather than Buildkite.

From 2f89dc074cdcfd8a1d36cff7918598e5f61df522 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 16 Sep 2024 20:24:45 +1000
Subject: [PATCH 536/547] Add additional entries to `RELEASE-NOTES.txt`

---
 RELEASE-NOTES.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 6e405dc3a..39ecc4c8b 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,10 +1,12 @@
 4.54
 -----
+- Updated icons to work with new iOS 18 styles
+- Add fall back login with username and password option to login
 - Updated link to privacy notice for California users
 
 4.53
 -----
-
+- Under the hood improvements
 
 4.52
 -----

From 315d5f153e81875fa1fbf594f275e42adcfd8b34 Mon Sep 17 00:00:00 2001
From: Automattic Release Bot <mobile+wpmobilebot@automattic.com>
Date: Mon, 16 Sep 2024 07:11:28 -0400
Subject: [PATCH 537/547] Bump version number

---
 config/Version.Public.xcconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/Version.Public.xcconfig b/config/Version.Public.xcconfig
index 94333b261..ab34b4025 100644
--- a/config/Version.Public.xcconfig
+++ b/config/Version.Public.xcconfig
@@ -1,2 +1,2 @@
-VERSION_LONG = 4.53.0.1
-VERSION_SHORT = 4.53
+VERSION_LONG = 4.54.0.0
+VERSION_SHORT = 4.54

From 7b592516277525954ba5a5a43745421964ab5017 Mon Sep 17 00:00:00 2001
From: Automattic Release Bot <mobile+wpmobilebot@automattic.com>
Date: Mon, 16 Sep 2024 07:11:28 -0400
Subject: [PATCH 538/547] Delete previous version release notes before code
 freeze

---
 fastlane/metadata/ar-SA/release_notes.txt   | 1 -
 fastlane/metadata/de-DE/release_notes.txt   | 1 -
 fastlane/metadata/default/release_notes.txt | 1 -
 fastlane/metadata/es-ES/release_notes.txt   | 1 -
 fastlane/metadata/fr-FR/release_notes.txt   | 1 -
 fastlane/metadata/he/release_notes.txt      | 1 -
 fastlane/metadata/id/release_notes.txt      | 1 -
 fastlane/metadata/it/release_notes.txt      | 1 -
 fastlane/metadata/ja/release_notes.txt      | 1 -
 fastlane/metadata/ko/release_notes.txt      | 1 -
 fastlane/metadata/pt-BR/release_notes.txt   | 1 -
 fastlane/metadata/ru/release_notes.txt      | 1 -
 fastlane/metadata/sv/release_notes.txt      | 1 -
 fastlane/metadata/tr/release_notes.txt      | 1 -
 fastlane/metadata/zh-Hans/release_notes.txt | 1 -
 fastlane/metadata/zh-Hant/release_notes.txt | 1 -
 16 files changed, 16 deletions(-)
 delete mode 100644 fastlane/metadata/ar-SA/release_notes.txt
 delete mode 100644 fastlane/metadata/de-DE/release_notes.txt
 delete mode 100644 fastlane/metadata/default/release_notes.txt
 delete mode 100644 fastlane/metadata/es-ES/release_notes.txt
 delete mode 100644 fastlane/metadata/fr-FR/release_notes.txt
 delete mode 100644 fastlane/metadata/he/release_notes.txt
 delete mode 100644 fastlane/metadata/id/release_notes.txt
 delete mode 100644 fastlane/metadata/it/release_notes.txt
 delete mode 100644 fastlane/metadata/ja/release_notes.txt
 delete mode 100644 fastlane/metadata/ko/release_notes.txt
 delete mode 100644 fastlane/metadata/pt-BR/release_notes.txt
 delete mode 100644 fastlane/metadata/ru/release_notes.txt
 delete mode 100644 fastlane/metadata/sv/release_notes.txt
 delete mode 100644 fastlane/metadata/tr/release_notes.txt
 delete mode 100644 fastlane/metadata/zh-Hans/release_notes.txt
 delete mode 100644 fastlane/metadata/zh-Hant/release_notes.txt

diff --git a/fastlane/metadata/ar-SA/release_notes.txt b/fastlane/metadata/ar-SA/release_notes.txt
deleted file mode 100644
index 1d9d28bf1..000000000
--- a/fastlane/metadata/ar-SA/release_notes.txt
+++ /dev/null
@@ -1 +0,0 @@
-التحسينات جارية.
diff --git a/fastlane/metadata/de-DE/release_notes.txt b/fastlane/metadata/de-DE/release_notes.txt
deleted file mode 100644
index e0a07e7a4..000000000
--- a/fastlane/metadata/de-DE/release_notes.txt
+++ /dev/null
@@ -1 +0,0 @@
-Verbesserungen hinter den Kulissen.
diff --git a/fastlane/metadata/default/release_notes.txt b/fastlane/metadata/default/release_notes.txt
deleted file mode 100644
index b216c8740..000000000
--- a/fastlane/metadata/default/release_notes.txt
+++ /dev/null
@@ -1 +0,0 @@
-Improvements under the hood.
diff --git a/fastlane/metadata/es-ES/release_notes.txt b/fastlane/metadata/es-ES/release_notes.txt
deleted file mode 100644
index 34ac38a9d..000000000
--- a/fastlane/metadata/es-ES/release_notes.txt
+++ /dev/null
@@ -1 +0,0 @@
-Mejoras en los detalles técnicos.
diff --git a/fastlane/metadata/fr-FR/release_notes.txt b/fastlane/metadata/fr-FR/release_notes.txt
deleted file mode 100644
index e1bd9610e..000000000
--- a/fastlane/metadata/fr-FR/release_notes.txt
+++ /dev/null
@@ -1 +0,0 @@
-Des améliorations sous le capot.
diff --git a/fastlane/metadata/he/release_notes.txt b/fastlane/metadata/he/release_notes.txt
deleted file mode 100644
index d903505ba..000000000
--- a/fastlane/metadata/he/release_notes.txt
+++ /dev/null
@@ -1 +0,0 @@
-שיפורים מאחורי הקלעים.
diff --git a/fastlane/metadata/id/release_notes.txt b/fastlane/metadata/id/release_notes.txt
deleted file mode 100644
index df09b33e8..000000000
--- a/fastlane/metadata/id/release_notes.txt
+++ /dev/null
@@ -1 +0,0 @@
-Kami sedang melakukan penyempurnaan.
diff --git a/fastlane/metadata/it/release_notes.txt b/fastlane/metadata/it/release_notes.txt
deleted file mode 100644
index bc1b0b0d3..000000000
--- a/fastlane/metadata/it/release_notes.txt
+++ /dev/null
@@ -1 +0,0 @@
-Miglioramenti dietro le quinte.
diff --git a/fastlane/metadata/ja/release_notes.txt b/fastlane/metadata/ja/release_notes.txt
deleted file mode 100644
index 9fb2e99cd..000000000
--- a/fastlane/metadata/ja/release_notes.txt
+++ /dev/null
@@ -1 +0,0 @@
-内部を改良しました。
diff --git a/fastlane/metadata/ko/release_notes.txt b/fastlane/metadata/ko/release_notes.txt
deleted file mode 100644
index 392f47bb1..000000000
--- a/fastlane/metadata/ko/release_notes.txt
+++ /dev/null
@@ -1 +0,0 @@
-내부 개선 사항.
diff --git a/fastlane/metadata/pt-BR/release_notes.txt b/fastlane/metadata/pt-BR/release_notes.txt
deleted file mode 100644
index cd77caf8d..000000000
--- a/fastlane/metadata/pt-BR/release_notes.txt
+++ /dev/null
@@ -1 +0,0 @@
-Melhorias no sistema.
diff --git a/fastlane/metadata/ru/release_notes.txt b/fastlane/metadata/ru/release_notes.txt
deleted file mode 100644
index de2fb16ae..000000000
--- a/fastlane/metadata/ru/release_notes.txt
+++ /dev/null
@@ -1 +0,0 @@
-Целый мешок усовершенствований.
diff --git a/fastlane/metadata/sv/release_notes.txt b/fastlane/metadata/sv/release_notes.txt
deleted file mode 100644
index dafc92d0b..000000000
--- a/fastlane/metadata/sv/release_notes.txt
+++ /dev/null
@@ -1 +0,0 @@
-Förbättringar under huven.
diff --git a/fastlane/metadata/tr/release_notes.txt b/fastlane/metadata/tr/release_notes.txt
deleted file mode 100644
index 77cece35c..000000000
--- a/fastlane/metadata/tr/release_notes.txt
+++ /dev/null
@@ -1 +0,0 @@
-Arka planda yapılan iyileştirmeler.
diff --git a/fastlane/metadata/zh-Hans/release_notes.txt b/fastlane/metadata/zh-Hans/release_notes.txt
deleted file mode 100644
index e86fa6dce..000000000
--- a/fastlane/metadata/zh-Hans/release_notes.txt
+++ /dev/null
@@ -1 +0,0 @@
-后台进行的改进。
diff --git a/fastlane/metadata/zh-Hant/release_notes.txt b/fastlane/metadata/zh-Hant/release_notes.txt
deleted file mode 100644
index f1d542b59..000000000
--- a/fastlane/metadata/zh-Hant/release_notes.txt
+++ /dev/null
@@ -1 +0,0 @@
-內部的強化項目。

From 6c1b10bd947edf70f0ca618203950910a8bcee51 Mon Sep 17 00:00:00 2001
From: Automattic Release Bot <mobile+wpmobilebot@automattic.com>
Date: Mon, 16 Sep 2024 07:11:28 -0400
Subject: [PATCH 539/547] Update draft release notes for 4.54.

---
 fastlane/metadata/default/release_notes.txt | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 fastlane/metadata/default/release_notes.txt

diff --git a/fastlane/metadata/default/release_notes.txt b/fastlane/metadata/default/release_notes.txt
new file mode 100644
index 000000000..9922f088e
--- /dev/null
+++ b/fastlane/metadata/default/release_notes.txt
@@ -0,0 +1,4 @@
+- Updated icons to work with new iOS 18 styles
+- Add fall back login with username and password option to login
+- Updated link to privacy notice for California users
+

From 0e65e17b9657ce8fe928e6219b3e61f16c1e595b Mon Sep 17 00:00:00 2001
From: Automattic Release Bot <mobile+wpmobilebot@automattic.com>
Date: Mon, 16 Sep 2024 07:11:28 -0400
Subject: [PATCH 540/547] Release Notes: add new section for next version
 (4.55)

---
 RELEASE-NOTES.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 39ecc4c8b..317d019a0 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,3 +1,7 @@
+4.55
+-----
+
+
 4.54
 -----
 - Updated icons to work with new iOS 18 styles

From e78730e1c6b1b9e0e5d23bf9de81e90c5820451b Mon Sep 17 00:00:00 2001
From: Automattic Release Bot <mobile+wpmobilebot@automattic.com>
Date: Mon, 16 Sep 2024 04:15:13 -0700
Subject: [PATCH 541/547] Freeze strings for localization

---
 Simplenote/en.lproj/Localizable.strings | Bin 69070 -> 69760 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Simplenote/en.lproj/Localizable.strings b/Simplenote/en.lproj/Localizable.strings
index efc04d5d429dd389cac291f2b71cd650f832ac96..cbd0bf2e2f8dbc4eb860eb9d267e2fe92a489049 100644
GIT binary patch
delta 301
zcmX>%o26kP%Z4eXlNa0(nQY=D#$U=%%#g}Z#E{33$dJpBI+@W~dUD(41)ez!`3&g{
z3JjS*83mwBB9JZxk~u(F$)Lxe1QfLeVkICSugb}5dyO~mC}nBDYbB4m*W?FZ*~CG{
zD*zn?vM>|Ot^^uiI+^i@_~eACER*9NbJ*(uRpbMmtN?TfP!32ZgPn(PQaI2Ab)as7
OW{Kl4YxCN#iV^^`xk`lq

delta 19
bcmZoz$Z~Er%Z4eXn;(>EG;GfMAtV6+Up@&y


From bbb71c127e9d02811125fb3135d0ce4d5fdd0f62 Mon Sep 17 00:00:00 2001
From: Automattic Release Bot <mobile+wpmobilebot@automattic.com>
Date: Mon, 16 Sep 2024 04:15:14 -0700
Subject: [PATCH 542/547] Update metadata strings

---
 Simplenote/Resources/AppStoreStrings.pot | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Simplenote/Resources/AppStoreStrings.pot b/Simplenote/Resources/AppStoreStrings.pot
index 5d1802a71..6acd42935 100644
--- a/Simplenote/Resources/AppStoreStrings.pot
+++ b/Simplenote/Resources/AppStoreStrings.pot
@@ -53,7 +53,7 @@ msgid ""
 "\n"
 "Privacy Policy: https://automattic.com/privacy/\n"
 "Terms of Service: https://simplenote.com/terms/\n"
-"Privacy Notice for California Users: https://automattic.com/privacy/#us-privacy-laws\n"
+"California Users Privacy Notice: https://automattic.com/privacy/#us-privacy-laws\n"
 "\n"
 "--\n"
 "\n"
@@ -66,8 +66,11 @@ msgctxt "app_store_keywords"
 msgid "notes,note,markdown,journal,sync,to-do,list,cloud,notebook,simple,notepad,tag,todo,writing,memo"
 msgstr ""
 
-msgctxt "v4.53-whats-new"
+msgctxt "v4.54-whats-new"
 msgid ""
-"Improvements under the hood.\n"
+"- Updated icons to work with new iOS 18 styles\n"
+"- Add fall back login with username and password option to login\n"
+"- Updated link to privacy notice for California users\n"
+"\n"
 msgstr ""
 

From ee71ad14db70c96e351d1b1b2f646c66bd177173 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 23 Sep 2024 17:46:28 +1000
Subject: [PATCH 543/547] Fix wrong plugin var in beta release pipeline

---
 .buildkite/release-pipelines/new-beta-release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/release-pipelines/new-beta-release.yml b/.buildkite/release-pipelines/new-beta-release.yml
index 0c5dd40d7..b4c37a32b 100644
--- a/.buildkite/release-pipelines/new-beta-release.yml
+++ b/.buildkite/release-pipelines/new-beta-release.yml
@@ -13,7 +13,7 @@ env:
 
 steps:
   - label: New Beta Release
-    plugins: [$CI_TOOLKIT]
+    plugins: [$CI_TOOLKIT_PLUGIN]
     command: |
       echo '--- :git: Configure Git for Release Management'
       .buildkite/commands/configure-git-for-release-management.sh

From f1d9a50ea7a5471c3b629f98264ab85fca0027b2 Mon Sep 17 00:00:00 2001
From: Automattic Release Bot <mobile+wpmobilebot@automattic.com>
Date: Mon, 23 Sep 2024 00:56:07 -0700
Subject: [PATCH 544/547] =?UTF-8?q?Update=20app=20translations=20=E2=80=93?=
 =?UTF-8?q?=20`Localizable.strings`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Simplenote/ar.lproj/Localizable.strings         |  8 +++++++-
 Simplenote/de.lproj/Localizable.strings         |  8 +++++++-
 Simplenote/es.lproj/Localizable.strings         |  8 +++++++-
 Simplenote/fr.lproj/Localizable.strings         |  8 +++++++-
 Simplenote/he.lproj/Localizable.strings         |  8 +++++++-
 Simplenote/id.lproj/Localizable.strings         |  8 +++++++-
 Simplenote/it.lproj/Localizable.strings         |  8 +++++++-
 Simplenote/ja.lproj/Localizable.strings         |  8 +++++++-
 Simplenote/ko.lproj/Localizable.strings         |  8 +++++++-
 Simplenote/nl.lproj/Localizable.strings         | 10 ++++++++--
 Simplenote/pt-BR.lproj/Localizable.strings      |  8 +++++++-
 Simplenote/ru.lproj/Localizable.strings         |  8 +++++++-
 Simplenote/sv.lproj/Localizable.strings         |  8 +++++++-
 Simplenote/tr.lproj/Localizable.strings         |  8 +++++++-
 Simplenote/zh-Hans-CN.lproj/Localizable.strings |  8 +++++++-
 Simplenote/zh-Hant-TW.lproj/Localizable.strings |  8 +++++++-
 16 files changed, 113 insertions(+), 17 deletions(-)

diff --git a/Simplenote/ar.lproj/Localizable.strings b/Simplenote/ar.lproj/Localizable.strings
index 1a2af3414..b14070493 100644
--- a/Simplenote/ar.lproj/Localizable.strings
+++ b/Simplenote/ar.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-09-12 11:54:02+0000 */
+/* Translation-Revision-Date: 2024-09-19 12:54:03+0000 */
 /* Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: ar */
@@ -987,6 +987,9 @@
 /* Visit app.simplenote.com in the browser */
 "Visit Web App" = "زيارة تطبيق الويب";
 
+/* Option to login with username and password *PREFIX*: printed in dark color */
+"We'll email you a code to log in, or you can" = "سنرسل إليك كودًا بالبريد لتسجيل الدخول، أو يمكنك";
+
 /* Generic error */
 "We're having problems. Please try again soon." = "لدينا مشكلات. يُرجى المحاولة مرة أخرى لاحقًا.";
 
@@ -1042,6 +1045,9 @@
 /* Message shown in note list when no notes are in the trash */
 "Your trash is empty" = "سلة المهملات لديك فارغة";
 
+/* Option to login with username and password *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue */
+"log in manually." = "التسجيل يدويًا.";
+
 /* Search Operator for tags. Please preserve the semicolons when translating! */
 "tag:" = "وسم:";
 
diff --git a/Simplenote/de.lproj/Localizable.strings b/Simplenote/de.lproj/Localizable.strings
index 41222eb95..62cff2571 100644
--- a/Simplenote/de.lproj/Localizable.strings
+++ b/Simplenote/de.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-09-11 12:54:02+0000 */
+/* Translation-Revision-Date: 2024-09-19 12:54:03+0000 */
 /* Plural-Forms: nplurals=2; plural=n != 1; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: de */
@@ -987,6 +987,9 @@
 /* Visit app.simplenote.com in the browser */
 "Visit Web App" = "Web-App aufrufen";
 
+/* Option to login with username and password *PREFIX*: printed in dark color */
+"We'll email you a code to log in, or you can" = "Wir senden dir eine E-Mail mit einem Code zur Anmeldung.";
+
 /* Generic error */
 "We're having problems. Please try again soon." = "Momentan gibt es ein paar Probleme. Bitte versuche es später erneut.";
 
@@ -1042,6 +1045,9 @@
 /* Message shown in note list when no notes are in the trash */
 "Your trash is empty" = "Der Papierkorb ist leer";
 
+/* Option to login with username and password *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue */
+"log in manually." = "Alternativ kannst du dich manuell anmelden.";
+
 /* Search Operator for tags. Please preserve the semicolons when translating! */
 "tag:" = "Schlagwort:";
 
diff --git a/Simplenote/es.lproj/Localizable.strings b/Simplenote/es.lproj/Localizable.strings
index c61baf15e..9e521bf46 100644
--- a/Simplenote/es.lproj/Localizable.strings
+++ b/Simplenote/es.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-09-11 16:54:02+0000 */
+/* Translation-Revision-Date: 2024-09-18 16:54:03+0000 */
 /* Plural-Forms: nplurals=2; plural=n != 1; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: es */
@@ -987,6 +987,9 @@
 /* Visit app.simplenote.com in the browser */
 "Visit Web App" = "Visitar aplicación web";
 
+/* Option to login with username and password *PREFIX*: printed in dark color */
+"We'll email you a code to log in, or you can" = "Te enviaremos por correo electrónico un código para iniciar sesión; también puedes";
+
 /* Generic error */
 "We're having problems. Please try again soon." = "Estamos teniendo algunos problemas. Inténtalo de nuevo pronto.";
 
@@ -1042,6 +1045,9 @@
 /* Message shown in note list when no notes are in the trash */
 "Your trash is empty" = "La papelera está vacía";
 
+/* Option to login with username and password *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue */
+"log in manually." = "hacerlo manualmente.";
+
 /* Search Operator for tags. Please preserve the semicolons when translating! */
 "tag:" = "etiqueta:";
 
diff --git a/Simplenote/fr.lproj/Localizable.strings b/Simplenote/fr.lproj/Localizable.strings
index 882a74000..a15125a77 100644
--- a/Simplenote/fr.lproj/Localizable.strings
+++ b/Simplenote/fr.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-09-12 09:54:03+0000 */
+/* Translation-Revision-Date: 2024-09-19 12:54:03+0000 */
 /* Plural-Forms: nplurals=2; plural=n > 1; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: fr */
@@ -987,6 +987,9 @@
 /* Visit app.simplenote.com in the browser */
 "Visit Web App" = "Visiter l'application Web";
 
+/* Option to login with username and password *PREFIX*: printed in dark color */
+"We'll email you a code to log in, or you can" = "Nous vous enverrons par e-mail un code pour vous connecter, ou vous pouvez";
+
 /* Generic error */
 "We're having problems. Please try again soon." = "Nous rencontrons des problèmes. Veuillez réessayer dans quelques instants.";
 
@@ -1042,6 +1045,9 @@
 /* Message shown in note list when no notes are in the trash */
 "Your trash is empty" = "Votre corbeille est vide";
 
+/* Option to login with username and password *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue */
+"log in manually." = "vous connecter manuellement.";
+
 /* Search Operator for tags. Please preserve the semicolons when translating! */
 "tag:" = "étiquette :";
 
diff --git a/Simplenote/he.lproj/Localizable.strings b/Simplenote/he.lproj/Localizable.strings
index 9eedfccd9..e91e2f7a8 100644
--- a/Simplenote/he.lproj/Localizable.strings
+++ b/Simplenote/he.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-09-11 16:54:02+0000 */
+/* Translation-Revision-Date: 2024-09-19 14:54:02+0000 */
 /* Plural-Forms: nplurals=2; plural=n != 1; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: he_IL */
@@ -987,6 +987,9 @@
 /* Visit app.simplenote.com in the browser */
 "Visit Web App" = "מעבר לאפליקציית הרשת";
 
+/* Option to login with username and password *PREFIX*: printed in dark color */
+"We'll email you a code to log in, or you can" = "אנחנו נשלח לך אימייל עם הקוד להתחברות, או שאפשר";
+
 /* Generic error */
 "We're having problems. Please try again soon." = "נתקלנו בבעיות. יש לנסות שוב בקרוב.";
 
@@ -1042,6 +1045,9 @@
 /* Message shown in note list when no notes are in the trash */
 "Your trash is empty" = "הפח שלך ריק";
 
+/* Option to login with username and password *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue */
+"log in manually." = "להתחבר באופן ידני.";
+
 /* Search Operator for tags. Please preserve the semicolons when translating! */
 "tag:" = "תגית:";
 
diff --git a/Simplenote/id.lproj/Localizable.strings b/Simplenote/id.lproj/Localizable.strings
index fe74cb71a..570efc088 100644
--- a/Simplenote/id.lproj/Localizable.strings
+++ b/Simplenote/id.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-09-12 09:54:03+0000 */
+/* Translation-Revision-Date: 2024-09-19 09:54:03+0000 */
 /* Plural-Forms: nplurals=2; plural=n > 1; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: id */
@@ -984,6 +984,9 @@
 /* Visit app.simplenote.com in the browser */
 "Visit Web App" = "Kunjungi Aplikasi Web";
 
+/* Option to login with username and password *PREFIX*: printed in dark color */
+"We'll email you a code to log in, or you can" = "Kami akan mengirimkan email berisi kode untuk login atau Anda dapat";
+
 /* Generic error */
 "We're having problems. Please try again soon." = "Kami mengalami masalah. Harap coba lagi nanti.";
 
@@ -1039,6 +1042,9 @@
 /* Message shown in note list when no notes are in the trash */
 "Your trash is empty" = "Sampah Anda kosong";
 
+/* Option to login with username and password *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue */
+"log in manually." = "login secara manual";
+
 /* Search Operator for tags. Please preserve the semicolons when translating! */
 "tag:" = "tag:";
 
diff --git a/Simplenote/it.lproj/Localizable.strings b/Simplenote/it.lproj/Localizable.strings
index 1c908e346..d0dc71239 100644
--- a/Simplenote/it.lproj/Localizable.strings
+++ b/Simplenote/it.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-09-12 11:54:03+0000 */
+/* Translation-Revision-Date: 2024-09-18 20:54:02+0000 */
 /* Plural-Forms: nplurals=2; plural=n != 1; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: it */
@@ -987,6 +987,9 @@
 /* Visit app.simplenote.com in the browser */
 "Visit Web App" = "Visita l'app web";
 
+/* Option to login with username and password *PREFIX*: printed in dark color */
+"We'll email you a code to log in, or you can" = "Ti invieremo un codice per l'accesso, oppure puoi";
+
 /* Generic error */
 "We're having problems. Please try again soon." = "Stiamo riscontrando dei problemi. Riprova a breve.";
 
@@ -1042,6 +1045,9 @@
 /* Message shown in note list when no notes are in the trash */
 "Your trash is empty" = "Il tuo cestino è vuoto";
 
+/* Option to login with username and password *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue */
+"log in manually." = "accedere manualmente.";
+
 /* Search Operator for tags. Please preserve the semicolons when translating! */
 "tag:" = "- Tag:";
 
diff --git a/Simplenote/ja.lproj/Localizable.strings b/Simplenote/ja.lproj/Localizable.strings
index ce92e35bd..c42fb097e 100644
--- a/Simplenote/ja.lproj/Localizable.strings
+++ b/Simplenote/ja.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-09-12 09:54:03+0000 */
+/* Translation-Revision-Date: 2024-09-19 09:54:03+0000 */
 /* Plural-Forms: nplurals=1; plural=0; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: ja_JP */
@@ -987,6 +987,9 @@
 /* Visit app.simplenote.com in the browser */
 "Visit Web App" = "Web アプリにアクセス";
 
+/* Option to login with username and password *PREFIX*: printed in dark color */
+"We'll email you a code to log in, or you can" = "ログインするためのコードをメールでお送りします。または、";
+
 /* Generic error */
 "We're having problems. Please try again soon." = "問題が発生しました。すぐにもう一度実行してください。";
 
@@ -1042,6 +1045,9 @@
 /* Message shown in note list when no notes are in the trash */
 "Your trash is empty" = "ゴミ箱は空です";
 
+/* Option to login with username and password *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue */
+"log in manually." = "手動でログインすることもできます。";
+
 /* Search Operator for tags. Please preserve the semicolons when translating! */
 "tag:" = "タグ :";
 
diff --git a/Simplenote/ko.lproj/Localizable.strings b/Simplenote/ko.lproj/Localizable.strings
index 637c2e5d0..d0284fbaa 100644
--- a/Simplenote/ko.lproj/Localizable.strings
+++ b/Simplenote/ko.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-09-12 09:54:03+0000 */
+/* Translation-Revision-Date: 2024-09-20 09:54:08+0000 */
 /* Plural-Forms: nplurals=1; plural=0; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: ko_KR */
@@ -987,6 +987,9 @@
 /* Visit app.simplenote.com in the browser */
 "Visit Web App" = "웹 앱 방문";
 
+/* Option to login with username and password *PREFIX*: printed in dark color */
+"We'll email you a code to log in, or you can" = "이메일을 통해 받으신 코드로 로그인할 수 있으며";
+
 /* Generic error */
 "We're having problems. Please try again soon." = "문제가 있습니다. 나중에 다시 시도하세요.";
 
@@ -1042,6 +1045,9 @@
 /* Message shown in note list when no notes are in the trash */
 "Your trash is empty" = "휴지통이 비어 있습니다.";
 
+/* Option to login with username and password *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue */
+"log in manually." = "직접 로그인하셔도 됩니다.";
+
 /* Search Operator for tags. Please preserve the semicolons when translating! */
 "tag:" = "태그:";
 
diff --git a/Simplenote/nl.lproj/Localizable.strings b/Simplenote/nl.lproj/Localizable.strings
index 0706e97ef..5d8d33126 100644
--- a/Simplenote/nl.lproj/Localizable.strings
+++ b/Simplenote/nl.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-09-12 15:54:02+0000 */
+/* Translation-Revision-Date: 2024-09-20 09:54:07+0000 */
 /* Plural-Forms: nplurals=2; plural=n != 1; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: nl */
@@ -227,7 +227,7 @@
 "Could not create an account with the provided email address and password." = "Kan geen account maken met het opgegeven e-mailadres en wachtwoord.";
 
 /* Notifies user tag delete failed */
-"Could not delete tag" = "Kon de tag niet verwijderen";
+"Could not delete tag" = "Kon tag niet verwijderen";
 
 /* Note fetch error title */
 "Could not fetch Notes" = "Het is niet gelukt om notities op te halen";
@@ -987,6 +987,9 @@
 /* Visit app.simplenote.com in the browser */
 "Visit Web App" = "Web-app bezoeken";
 
+/* Option to login with username and password *PREFIX*: printed in dark color */
+"We'll email you a code to log in, or you can" = "We sturen je via e-mail een code die je kan gebruiken om in te loggen, of je kan";
+
 /* Generic error */
 "We're having problems. Please try again soon." = "We ondervinden wat problemen. Probeer het later opnieuw.";
 
@@ -1042,6 +1045,9 @@
 /* Message shown in note list when no notes are in the trash */
 "Your trash is empty" = "Je prullenbak is leeg";
 
+/* Option to login with username and password *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue */
+"log in manually." = "handmatig inloggen.";
+
 /* Search Operator for tags. Please preserve the semicolons when translating! */
 "tag:" = "tag:";
 
diff --git a/Simplenote/pt-BR.lproj/Localizable.strings b/Simplenote/pt-BR.lproj/Localizable.strings
index ef3ebd1d0..b98672fb0 100644
--- a/Simplenote/pt-BR.lproj/Localizable.strings
+++ b/Simplenote/pt-BR.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-09-11 14:54:03+0000 */
+/* Translation-Revision-Date: 2024-09-18 16:54:03+0000 */
 /* Plural-Forms: nplurals=2; plural=(n > 1); */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: pt_BR */
@@ -987,6 +987,9 @@
 /* Visit app.simplenote.com in the browser */
 "Visit Web App" = "Acessar o aplicativo para Web";
 
+/* Option to login with username and password *PREFIX*: printed in dark color */
+"We'll email you a code to log in, or you can" = "Enviaremos o código de login por e-mail. Se preferir,";
+
 /* Generic error */
 "We're having problems. Please try again soon." = "Estamos com problemas. Tente novamente mais tarde.";
 
@@ -1042,6 +1045,9 @@
 /* Message shown in note list when no notes are in the trash */
 "Your trash is empty" = "Sua lixeira está vazia";
 
+/* Option to login with username and password *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue */
+"log in manually." = "faça login manualmente.";
+
 /* Search Operator for tags. Please preserve the semicolons when translating! */
 "tag:" = "tag:";
 
diff --git a/Simplenote/ru.lproj/Localizable.strings b/Simplenote/ru.lproj/Localizable.strings
index 4732ea9e0..0c93c28b7 100644
--- a/Simplenote/ru.lproj/Localizable.strings
+++ b/Simplenote/ru.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-09-12 15:54:03+0000 */
+/* Translation-Revision-Date: 2024-09-19 09:54:03+0000 */
 /* Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2); */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: ru */
@@ -987,6 +987,9 @@
 /* Visit app.simplenote.com in the browser */
 "Visit Web App" = "Перейти в веб-приложение";
 
+/* Option to login with username and password *PREFIX*: printed in dark color */
+"We'll email you a code to log in, or you can" = "Мы пришлём вам код для входа по электронной почте, а кроме того, вы можете";
+
 /* Generic error */
 "We're having problems. Please try again soon." = "Произошла ошибка. Повторите попытку позже.";
 
@@ -1042,6 +1045,9 @@
 /* Message shown in note list when no notes are in the trash */
 "Your trash is empty" = "Корзина пуста";
 
+/* Option to login with username and password *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue */
+"log in manually." = "выполнить вход вручную.";
+
 /* Search Operator for tags. Please preserve the semicolons when translating! */
 "tag:" = "метка:";
 
diff --git a/Simplenote/sv.lproj/Localizable.strings b/Simplenote/sv.lproj/Localizable.strings
index b75d26d15..96fbfe7ac 100644
--- a/Simplenote/sv.lproj/Localizable.strings
+++ b/Simplenote/sv.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-09-11 10:54:03+0000 */
+/* Translation-Revision-Date: 2024-09-18 10:54:02+0000 */
 /* Plural-Forms: nplurals=2; plural=n != 1; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: sv_SE */
@@ -987,6 +987,9 @@
 /* Visit app.simplenote.com in the browser */
 "Visit Web App" = "Besök webbappen";
 
+/* Option to login with username and password *PREFIX*: printed in dark color */
+"We'll email you a code to log in, or you can" = "Vi skickar en kod till dig via e-post för att logga in, eller så kan du";
+
 /* Generic error */
 "We're having problems. Please try again soon." = "Vi har problem. Försök igen om en stund.";
 
@@ -1042,6 +1045,9 @@
 /* Message shown in note list when no notes are in the trash */
 "Your trash is empty" = "Din papperskorg är tom";
 
+/* Option to login with username and password *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue */
+"log in manually." = "logga in manuellt.";
+
 /* Search Operator for tags. Please preserve the semicolons when translating! */
 "tag:" = "etikett:";
 
diff --git a/Simplenote/tr.lproj/Localizable.strings b/Simplenote/tr.lproj/Localizable.strings
index dab41a5c3..5090e984f 100644
--- a/Simplenote/tr.lproj/Localizable.strings
+++ b/Simplenote/tr.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-09-12 09:54:03+0000 */
+/* Translation-Revision-Date: 2024-09-18 13:54:02+0000 */
 /* Plural-Forms: nplurals=2; plural=(n > 1); */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: tr */
@@ -987,6 +987,9 @@
 /* Visit app.simplenote.com in the browser */
 "Visit Web App" = "Web Uygulamasını Ziyaret Et";
 
+/* Option to login with username and password *PREFIX*: printed in dark color */
+"We'll email you a code to log in, or you can" = "Oturum açmanız için size e-postayla bir kod göndereceğiz veya manuel olarak";
+
 /* Generic error */
 "We're having problems. Please try again soon." = "Sorun yaşanıyor. Lütfen kısa bir süre sonra tekrar deneyin.";
 
@@ -1042,6 +1045,9 @@
 /* Message shown in note list when no notes are in the trash */
 "Your trash is empty" = "Çöp kutusu boş";
 
+/* Option to login with username and password *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue */
+"log in manually." = "oturum açabilirsiniz.";
+
 /* Search Operator for tags. Please preserve the semicolons when translating! */
 "tag:" = "etiket:";
 
diff --git a/Simplenote/zh-Hans-CN.lproj/Localizable.strings b/Simplenote/zh-Hans-CN.lproj/Localizable.strings
index 02d3d46b8..9547b91df 100644
--- a/Simplenote/zh-Hans-CN.lproj/Localizable.strings
+++ b/Simplenote/zh-Hans-CN.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-09-11 19:54:04+0000 */
+/* Translation-Revision-Date: 2024-09-18 10:54:02+0000 */
 /* Plural-Forms: nplurals=1; plural=0; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: zh_CN */
@@ -987,6 +987,9 @@
 /* Visit app.simplenote.com in the browser */
 "Visit Web App" = "访问 Web 应用程序";
 
+/* Option to login with username and password *PREFIX*: printed in dark color */
+"We'll email you a code to log in, or you can" = "我们将通过电子邮件向您发送登录代码，您也可以";
+
 /* Generic error */
 "We're having problems. Please try again soon." = "我们遇到了问题。请稍后重试。";
 
@@ -1042,6 +1045,9 @@
 /* Message shown in note list when no notes are in the trash */
 "Your trash is empty" = "您的回收站为空";
 
+/* Option to login with username and password *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue */
+"log in manually." = "手动登录。";
+
 /* Search Operator for tags. Please preserve the semicolons when translating! */
 "tag:" = "标签：";
 
diff --git a/Simplenote/zh-Hant-TW.lproj/Localizable.strings b/Simplenote/zh-Hant-TW.lproj/Localizable.strings
index b7419190a..451127cdf 100644
--- a/Simplenote/zh-Hant-TW.lproj/Localizable.strings
+++ b/Simplenote/zh-Hant-TW.lproj/Localizable.strings
@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-09-12 09:54:03+0000 */
+/* Translation-Revision-Date: 2024-09-20 11:54:02+0000 */
 /* Plural-Forms: nplurals=1; plural=0; */
 /* Generator: GlotPress/2.4.0-alpha */
 /* Language: zh_TW */
@@ -987,6 +987,9 @@
 /* Visit app.simplenote.com in the browser */
 "Visit Web App" = "前往網頁應用程式";
 
+/* Option to login with username and password *PREFIX*: printed in dark color */
+"We'll email you a code to log in, or you can" = "我們會透過電子郵件傳送登入代碼給你，你也可以";
+
 /* Generic error */
 "We're having problems. Please try again soon." = "發生問題，請再試一次。";
 
@@ -1042,6 +1045,9 @@
 /* Message shown in note list when no notes are in the trash */
 "Your trash is empty" = "你的垃圾桶是空的";
 
+/* Option to login with username and password *SUFFIX*: Concatenated with a space, after the PREFIX, and printed in blue */
+"log in manually." = "手動登入。";
+
 /* Search Operator for tags. Please preserve the semicolons when translating! */
 "tag:" = "標籤：";
 

From 64c9741f24291846c804ae84f6a2e1e6d5e11609 Mon Sep 17 00:00:00 2001
From: Automattic Release Bot <mobile+wpmobilebot@automattic.com>
Date: Mon, 23 Sep 2024 00:56:10 -0700
Subject: [PATCH 545/547] Update App Store metadata translations

---
 fastlane/metadata/ar-SA/description.txt     | 22 +++++------
 fastlane/metadata/ar-SA/keywords.txt        |  2 +-
 fastlane/metadata/ar-SA/release_notes.txt   |  4 ++
 fastlane/metadata/de-DE/description.txt     | 42 ++++++++++-----------
 fastlane/metadata/de-DE/release_notes.txt   |  4 ++
 fastlane/metadata/es-ES/description.txt     | 26 ++++++-------
 fastlane/metadata/es-ES/release_notes.txt   |  4 ++
 fastlane/metadata/fr-FR/description.txt     | 26 ++++++-------
 fastlane/metadata/fr-FR/release_notes.txt   |  4 ++
 fastlane/metadata/he/description.txt        | 32 ++++++++--------
 fastlane/metadata/he/release_notes.txt      |  4 ++
 fastlane/metadata/id/description.txt        | 24 ++++++------
 fastlane/metadata/id/release_notes.txt      |  4 ++
 fastlane/metadata/it/description.txt        |  4 +-
 fastlane/metadata/it/release_notes.txt      |  4 ++
 fastlane/metadata/ja/description.txt        | 32 ++++++++--------
 fastlane/metadata/ja/release_notes.txt      |  4 ++
 fastlane/metadata/ko/description.txt        | 28 +++++++-------
 fastlane/metadata/ko/release_notes.txt      |  4 ++
 fastlane/metadata/nl-NL/description.txt     | 18 ++++-----
 fastlane/metadata/nl-NL/release_notes.txt   |  4 ++
 fastlane/metadata/pt-BR/description.txt     | 24 ++++++------
 fastlane/metadata/pt-BR/release_notes.txt   |  4 ++
 fastlane/metadata/ru/description.txt        | 40 ++++++++++----------
 fastlane/metadata/ru/release_notes.txt      |  4 ++
 fastlane/metadata/sv/description.txt        | 26 ++++++-------
 fastlane/metadata/sv/release_notes.txt      |  4 ++
 fastlane/metadata/tr/description.txt        | 30 +++++++--------
 fastlane/metadata/tr/release_notes.txt      |  4 ++
 fastlane/metadata/zh-Hans/description.txt   | 24 ++++++------
 fastlane/metadata/zh-Hans/release_notes.txt |  4 ++
 fastlane/metadata/zh-Hant/description.txt   | 26 ++++++-------
 fastlane/metadata/zh-Hant/release_notes.txt |  4 ++
 33 files changed, 277 insertions(+), 213 deletions(-)
 create mode 100644 fastlane/metadata/ar-SA/release_notes.txt
 create mode 100644 fastlane/metadata/de-DE/release_notes.txt
 create mode 100644 fastlane/metadata/es-ES/release_notes.txt
 create mode 100644 fastlane/metadata/fr-FR/release_notes.txt
 create mode 100644 fastlane/metadata/he/release_notes.txt
 create mode 100644 fastlane/metadata/id/release_notes.txt
 create mode 100644 fastlane/metadata/it/release_notes.txt
 create mode 100644 fastlane/metadata/ja/release_notes.txt
 create mode 100644 fastlane/metadata/ko/release_notes.txt
 create mode 100644 fastlane/metadata/nl-NL/release_notes.txt
 create mode 100644 fastlane/metadata/pt-BR/release_notes.txt
 create mode 100644 fastlane/metadata/ru/release_notes.txt
 create mode 100644 fastlane/metadata/sv/release_notes.txt
 create mode 100644 fastlane/metadata/tr/release_notes.txt
 create mode 100644 fastlane/metadata/zh-Hans/release_notes.txt
 create mode 100644 fastlane/metadata/zh-Hant/release_notes.txt

diff --git a/fastlane/metadata/ar-SA/description.txt b/fastlane/metadata/ar-SA/description.txt
index 0dae58d3d..a5234d0b2 100644
--- a/fastlane/metadata/ar-SA/description.txt
+++ b/fastlane/metadata/ar-SA/description.txt
@@ -1,13 +1,13 @@
-إنَّ برنامج Simplenote من ضمن الطرق السهلة لتدوين الملحوظات، وإنشاء قوائم المهام، وتسجيل الأفكار، والمزيد. افتح البرنامج، ثم دوِّن بعض الأفكار، وهذا كل شيء. عندما تصبح مجموعتك كبيرة، حافظ على تنظيمها باستخدام الوسوم والدبابيس، واعثر على ما تحتاج إليه باستخدام البحث الفوري. نظرًا إلى أنَّ برنامج Simplenote سيقوم بالمزامنة عبر أجهزتك مجانًا، فإنَّ ملحوظاتك ستظل معك في جميع الأوقات.
+إن برنامج Simplenote من ضمن الطرق السهلة لتدوين الملحوظات، وإنشاء قوائم المهام، وتسجيل الأفكار، والمزيد. افتح البرنامج، ثم دوِّن بعض الأفكار، وهذا كل شيء. عندما تصبح مجموعتك كبيرة، حافظ على تنظيمها باستخدام الوسوم والدبابيس، واعثر على ما تحتاج إليه باستخدام البحث الفوري. نظرًا إلى أن برنامج Simplenote سيقوم بالمزامنة عبر أجهزتك مجانًا، فإن ملحوظاتك ستظل معك في جميع الأوقات.
 
-- استمتع بتجربة تدوين ملحوظات بسيطة
-- قم بمزامنة كل شيء عبر جميع أجهزتك
-- تعاون وشارك
-- ابقَ منظمًا باستخدام الوسوم
-- قم بتسجيل الدخول باستخدام بريدك الإلكتروني أو حسابك على ووردبريس.كوم
+- تجربة تدوين بسيطة للملحوظات
+- مزامنة كل شيء عبر جميع أجهزتك
+- التعاون والمشاركة
+- الحفاظ على تنظيم مجموعتك باستخدام الوسوم
+- تسجيل الدخول باستخدام بريدك الإلكتروني أو حسابك على ووردبريس.كوم
 
-وقم بالمزامنة بثقة
-- يمكنك المزامنة تلقائيًا بسلاسة عبر أي حاسوب أو هاتف أو جهاز لوحي.
+المزامنة بكل ثقة
+- يمكنك المزامنة بسهولة تلقائيًا عبر أي حاسوب أو هاتف أو جهاز لوحي.
 - انسخ كل شيء احتياطيًا وقم بمزامنته أثناء تدوين الملحوظات، لكيلا تفقد محتواك أبدًا.
 
 التعاون والمشاركة
@@ -24,14 +24,14 @@
 - اختر ترتيب فرز ملحوظاتك ووسومك.
 - ثبِّت الملحوظات التي تستخدمها أكثر من غيرها.
 - حرِّر الوسوم مباشرةً عن طريق تسميتها وترتيبها مجددًا.
-- احمِ محتواك بقفل رمز المرور.
+- حافظ على محتواك باستخدام تأمين رمز المرور.
 
 --
 
 سياسة الخصوصية: https://automattic.com/privacy/
-شروط الخدمة: https://simplenote.com/terms/
+شروط الخصوصية: https://simplenote.com/terms/
 إشعار الخصوصية الخاص بالمستخدمين في كاليفورنيا: https://automattic.com/privacy/#us-privacy-laws
 
 --
 
-تفضَّل بزيارة simplenote.com لتنزيل Simplenote لأجهزتك الأخرى.
+تفضَّل بزيارة simplenote.com لتنزيل برنامج Simplenote لأجهزتك الأخرى.
diff --git a/fastlane/metadata/ar-SA/keywords.txt b/fastlane/metadata/ar-SA/keywords.txt
index 66c12533b..be7cee772 100644
--- a/fastlane/metadata/ar-SA/keywords.txt
+++ b/fastlane/metadata/ar-SA/keywords.txt
@@ -1 +1 @@
-ملحوظات,ملحوظة,مهام مصغرة,صحيفة,مذكرات,مزامنة,قائمة مهام,مفكرة,بسيط,مفكرة,وسم قائمة مهام,كتابة
\ No newline at end of file
+ملحوظات,ملحوظة,مهام مصغرة,صحيفة,مذكرات,مزامنة,قائمة مهام,مفكرة,بسيط,مفكرة,وسم قائمة مهام,كتابة,مذكرة
diff --git a/fastlane/metadata/ar-SA/release_notes.txt b/fastlane/metadata/ar-SA/release_notes.txt
new file mode 100644
index 000000000..23cd4de4b
--- /dev/null
+++ b/fastlane/metadata/ar-SA/release_notes.txt
@@ -0,0 +1,4 @@
+- تم تحديث الأيقونات للعمل مع أنماط iOS 18
+- إضافة خيار تسجيل الدخول البديل باستخدام اسم المستخدم وكلمة المرور لتسجيل الدخول
+- تم تحديث رابط إشعار الخصوصية الخاص بالمستخدمين في كاليفورنيا
+
diff --git a/fastlane/metadata/de-DE/description.txt b/fastlane/metadata/de-DE/description.txt
index 036efd313..b670e15a3 100644
--- a/fastlane/metadata/de-DE/description.txt
+++ b/fastlane/metadata/de-DE/description.txt
@@ -1,36 +1,36 @@
-Mit Simplenote kannst du ganz einfach Notizen,Aufgabenlisten, Ideen und mehr festhalten. Einfach aufrufen, Gedanken notieren – fertig. Mit Schlagwörtern und Pins behältst du den Überblick über deine wachsende Sammlung und mit der Sofortsuche findest du das, was du brauchst. Da Simplenote kostenlos mit deinen Geräten synchronisiert wird, hast du deine Notizen jederzeit zur Hand.
+Mit Simplenote kannst du ganz einfach Notizen, Aufgabenlisten, Ideen und mehr festhalten. Einfach aufrufen, Gedanken notieren – fertig. Mit Schlagwörtern und Pins behältst du den Überblick über deine wachsende Sammlung und mit der Sofortsuche findest du das, was du brauchst. Da Simplenote kostenlos mit deinen Geräten synchronisiert wird, hast du deine Notizen jederzeit zur Hand.
 
 - Eine einfache Möglichkeit, Notizen zu erstellen
 - Alle Inhalte über alle deine Geräte hinweg synchronisieren
 - Zusammenarbeiten und Teilen
-- Mit Schlagwörtern den Überblick behalten 
-- Mit E-Mail-Adresse oder WordPress.com-Konto anmelden
+- Mit Schlagwörtern den Überblick behalten
+- Mit deiner E-Mail-Adresse oder deinem WordPress.com-Konto anmelden
 
-ZUVERLÄSSIGES SYNCHRONISIEREN
-- Inhalte automatisch und problemlos mit jedem Computer, Smartphone oder Tablet synchronisieren
-- Alle Notizen sichern und synchronisieren, damit keine Inhalte verloren gehen
+ZUVERLÄSSIG SYNCHRONISIEREN
+- Inhalte automatisch und problemlos mit jedem Computer, Smartphone oder Tablet synchronisieren.
+- Alle Notizen sichern und synchronisieren, damit keine Inhalte verloren gehen.
 
 ZUSAMMENARBEITEN UND TEILEN
-- Zusammenarbeiten und abstimmen: Teile Ideen mit einem Kollegen oder schreibe mit dem Mitbewohner eine Einkaufsliste.
-- Auswählen, ob Inhalte im Web veröffentlicht werden sollen, und einen Link mit den gewünschten Personen teilen
-- WordPress.com-Konto verbinden und Notizen direkt auf einer WordPress-Website veröffentlichen
-- Notizen schnell und einfach mit Drittanbieter-Apps teilen
-
-ORGANISEREN UND SUCHEN
-- Behalte mit Schlagwörtern den Überblick und suche und sortiere damit Inhalte.
-- Mit hervorgehobenen Stichwörtern sofort das finden, wonach du suchst
-- Mit Markdown Formatierungen hinzufügen
-- Aufgabenlisten erstellen
-- Die Sortierreihenfolge deiner Notizen und Schlagwörter auswählen
-- Die am häufigsten verwendeten Notizen anheften
-- Schlagwörter direkt bearbeiten, indem du sie umbenennst oder neu anordnest
-- Inhalte mit Zugangscode-Sperre schützen
+- Zusammenarbeiten und abstimmen: Ideen mit einem Kollegen teilen oder mit dem Mitbewohner eine Einkaufsliste schreiben.
+- Auswählen, ob Inhalte im Web veröffentlicht werden sollen, und einen Link mit den gewünschten Personen teilen.
+- WordPress.com-Konto verbinden und Notizen direkt auf einer WordPress-Website veröffentlichen.
+- Notizen schnell und einfach mit Drittanbieter-Apps teilen.
+
+ORGANISIEREN UND SUCHEN
+- Mit Schlagwörtern den Überblick behalten und Inhalte damit suchen und sortieren.
+- Mit hervorgehobenen Stichwörtern sofort das finden, wonach du suchst.
+- Mit Markdown Formatierungen hinzufügen.
+- Aufgabenlisten erstellen.
+- Die Sortierreihenfolge deiner Notizen und Schlagwörter auswählen.
+- Die am häufigsten verwendeten Notizen anheften.
+- Schlagwörter direkt bearbeiten, indem du sie umbenennst oder neu anordnest.
+- Inhalte mit Zugangscode-Sperre schützen.
 
 --
 
 Datenschutzerklärung: https://automattic.com/privacy/
 Geschäftsbedingungen: https://simplenote.com/terms/
-Datenschutzhinweis für Benutzer in Kalifornien: https://automattic.com/privacy/#us-privacy-laws
+Datenschutzhinweise für Benutzer in Kalifornien: https://automattic.com/privacy/#us-privacy-laws
 
 --
 
diff --git a/fastlane/metadata/de-DE/release_notes.txt b/fastlane/metadata/de-DE/release_notes.txt
new file mode 100644
index 000000000..28aa27984
--- /dev/null
+++ b/fastlane/metadata/de-DE/release_notes.txt
@@ -0,0 +1,4 @@
+- Aktualisierte Icons, die mit den neuen iOS 18-Stilen funktionieren
+- Fallback-Anmeldung mit Option für den Benutzernamen und das Passwort zur Anmeldung hinzufügen
+- Aktualisierter Link zu den Datenschutzhinweisen für Benutzer in Kalifornien
+
diff --git a/fastlane/metadata/es-ES/description.txt b/fastlane/metadata/es-ES/description.txt
index 61c787455..9c80f4ae8 100644
--- a/fastlane/metadata/es-ES/description.txt
+++ b/fastlane/metadata/es-ES/description.txt
@@ -1,22 +1,22 @@
 Simplenote es una forma fácil de tomar notas, crear listas de tareas, capturar ideas y mucho más. Abre la aplicación, escribe algunas líneas y listo. A medida que tu colección crezca, mantén el orden con etiquetas y chinchetas, y encuentra lo que necesites con la búsqueda instantánea. Como Simplenote se sincronizará gratuitamente con tus dispositivos, tus notas estarán contigo en todo momento.
 
-- Una experiencia sencilla para tomar notas
-- Sincroniza todos tus dispositivos
-- Colabora y comparte 
-- Organízate con las etiquetas
-- Inicia sesión con tu correo electrónico o cuenta WordPress.com
-
-SINCRONIZA CON CONFIANZA
-- Sincroniza fácilmente cualquier ordenador, teléfono móvil o tableta.
+- Una experiencia sencilla de toma de notas
+- Sincroniza tus datos en todos tus dispositivos
+- Colabora y comparte contenido
+- Mantén el orden con etiquetas
+- Accede con tu correo electrónico o con tu cuenta de WordPress.com
+
+SINCRONIZAR CON CONFIANZA
+- Tus datos se sincronizan automáticamente sin problemas en cualquier ordenador, teléfono o tableta.
 - Haz una copia de seguridad y sincronízalo todo mientras tomas notas, para que nunca pierdas tu contenido.
 
-COLABORA Y COMPARTE
-- Colabora y trabaja en equipo: comparte ideas con un compañero de trabajo o escribe la lista de la compra con tu compañero de piso.
+COLABORAR Y COMPARTIR
+- Colabora y trabaja en equipo: comparte ideas con un compañero de trabajo o crea una lista de la compra con tu compañero de piso.
 - Decide si quieres publicar tu contenido en la Web y comparte un enlace con quien tú quieras.
 - Publica contenido directamente en un sitio de WordPress conectando tu cuenta de WordPress.com.
 - Comparte contenido rápida y fácilmente con aplicaciones de terceros.
 
-ORGANIZA Y BUSCA
+ORGANIZAR Y BUSCAR
 - Mantén el orden aplicando etiquetas y úsalas para buscar y clasificar información rápidamente.
 - Encuentra de inmediato lo que buscas con el resaltado de palabras clave.
 - Utiliza el marcado para añadir formato.
@@ -30,8 +30,8 @@ ORGANIZA Y BUSCA
 
 Política de privacidad: https://automattic.com/privacy/
 Condiciones del servicio: https://simplenote.com/terms/
-Aviso de privacidad para usuarios de California: https://automattic.com/privacy/#us-privacy-laws
+Aviso de privacidad dirigido a los usuarios de California: https://automattic.com/privacy/#us-privacy-laws
 
 --
 
-Visita simplenote.com para descargar Simplenote en otros dispositivos.
+Ve a simplenote.com y descarga Simplenote en el resto de tus dispositivos.
diff --git a/fastlane/metadata/es-ES/release_notes.txt b/fastlane/metadata/es-ES/release_notes.txt
new file mode 100644
index 000000000..8ce8f1923
--- /dev/null
+++ b/fastlane/metadata/es-ES/release_notes.txt
@@ -0,0 +1,4 @@
+- Se han actualizado los iconos para que funcionen con los nuevos estilos de iOS 18
+- Añade la opción de inicio de sesión «fall back» con nombre de usuario y contraseña para iniciar sesión
+- Se ha actualizado el enlace que lleva al aviso de privacidad para usuarios de California
+
diff --git a/fastlane/metadata/fr-FR/description.txt b/fastlane/metadata/fr-FR/description.txt
index 9590adbec..c24bbbe26 100644
--- a/fastlane/metadata/fr-FR/description.txt
+++ b/fastlane/metadata/fr-FR/description.txt
@@ -1,30 +1,30 @@
-Simplenote est un outil facile pour prendre des notes, créer des listes de choses à faire, capturer des idées, etc. Il vous suffit de l’ouvrir, d’entrer vos réflexions, et le tour est joué. Au fur et à mesure que votre ensemble de notes augmente, vous pouvez les organiser à l’aide d’étiquettes et d’épingles, et trouver ce dont vous avez besoin par le biais de recherches instantanées. Simplenote assurant gratuitement la synchronisation sur tous vos appareils, vous disposez de vos notes à tout moment.
+Simplenote est un outil facile à utiliser pour prendre des notes, créer des listes de choses à faire, capturer des idées, etc. Il vous suffit de l’ouvrir, d’entrer vos réflexions, et le tour est joué. Au fur et à mesure que votre ensemble de notes augmente, vous pouvez les organiser à l’aide d’étiquettes et d’épingles, et trouver ce dont vous avez besoin par le biais de recherches instantanées. Puisque Simplenote assure gratuitement la synchronisation sur tous vos appareils, vous disposez de vos notes à tout moment.
 
-- Une expérience de prise de note simple
-- Une synchronisation complète sur tous vos appareils
-- Collaboration et partage
-- Organisation à l’aide d’étiquettes
-- Connexion par adresse e-mail ou compte WordPress.com
+- Une expérience de prise de notes simple
+- Tout synchroniser sur tous vos appareils
+- Collaborer et partager
+- Rester organisé avec des étiquettes
+- Se connecter avec une adresse e-mail ou un compte WordPress.com
 
-SYNCHRONISATION EN TOUTE CONFIANCE
-- Synchronisation automatique transparente sur n’importe quel ordinateur, téléphone ou tablette.
+SYNCHRONISER EN TOUTE CONFIANCE
+- Synchronisez votre travail automatiquement et en toute fluidité sur n’importe quel ordinateur, téléphone ou tablette.
 - Sauvegardez et synchronisez tout lors de votre prise de notes, afin de ne perdre aucun contenu.
 
-COLLABORATION ET PARTAGE
+COLLABORER ET PARTAGER
 - Collaborez, que ce soit pour partager vos idées avec un collègue ou rédiger la liste des courses avec votre colocataire.
 - Décidez si vous souhaitez publier votre contenu sur le Web et partagez un lien avec les personnes de votre choix.
 - Publiez votre contenu directement sur un site WordPress en vous connectant à votre compte WordPress.com.
 - Partagez facilement et rapidement avec des applications tierces.
 
-ORGANISATION ET RECHERCHE
+ORGANISER ET RECHERCHER
 - Organisez-vous à l’aide d’étiquettes et utilisez-les pour trier et rechercher rapidement ce dont vous avez besoin.
-- Trouvez instantanément ce que vous recherchez grâce à la mise en surbrillance de mots clés.
+- Trouvez instantanément ce que vous recherchez grâce à la mise en surbrillance de mots-clés.
 - Utilisez Markdown pour ajouter une mise en forme.
 - Créez des listes de choses à faire.
 - Choisissez l’ordre de tri de vos notes et étiquettes.
 - Épinglez les notes que vous utilisez le plus.
 - Modifiez directement les étiquettes en les renommant et les réorganisant.
-- Protégez votre contenu à l’aide d’un verrou avec code d’authentification.
+- Protégez votre contenu avec un code d’accès.
 
 --
 
@@ -34,4 +34,4 @@ Avis de confidentialité pour les utilisateurs californiens : https://automatti
 
 --
 
-Visitez simplenote.com afin de télécharger Simplenote pour vos autres appareils.
+Accédez à simplenote.com afin de télécharger Simplenote pour vos autres appareils.
diff --git a/fastlane/metadata/fr-FR/release_notes.txt b/fastlane/metadata/fr-FR/release_notes.txt
new file mode 100644
index 000000000..49965f950
--- /dev/null
+++ b/fastlane/metadata/fr-FR/release_notes.txt
@@ -0,0 +1,4 @@
+- Mise à jour des icônes pour qu’elles fonctionnent avec les nouveaux styles d’iOS 18
+- Ajout d’une connexion de secours avec identifiant et mot de passe en option
+- Mise à jour du lien vers l’avis de confidentialité pour les utilisateurs californiens
+
diff --git a/fastlane/metadata/he/description.txt b/fastlane/metadata/he/description.txt
index 0eaf80445..e82aa4b33 100644
--- a/fastlane/metadata/he/description.txt
+++ b/fastlane/metadata/he/description.txt
@@ -1,37 +1,37 @@
-האפליקציה Simplenote היא דרך קלה לרשום פתקים, ליצור רשימת משימות, לתעד רעיונות ועוד. פותחים את האפליקציה, רושמים כמה מחשבות, וזה הכול. כשיש לך הרבה פריטים באוסף, אפשר לשמור על הסדר באמצעות תגיות ונעצים ולמצוא את מה שנדרש לך בחיפוש מיידי. מאחר ש-Simplenote תסתנכרן בין כל המכשירים שלך, הפתקים שלך תמיד יהיו זמינים לשימושך בכל עת.
+האפליקציה Simplenote היא דרך קלה לרשום פתקים, ליצור רשימת משימות, לתעד רעיונות ועוד. פותחים את האפליקציה, רושמים כמה מחשבות, וזה הכול. כשיש לך הרבה פריטים באוסף, אפשר לשמור על הסדר באמצעות תגיות ונעצים ולמצוא את מה שנדרש לך בחיפוש מיידי. מאחר שהאפליקציה של Simplenote מסתנכרנת בין כל המכשירים שלך בחינם, הפתקים שלך תמיד יהיו זמינים לשימושך בכל עת.
 
-- חוויית שימוש פשוטה ברישום פתקים
-- לסנכרן את כל התוכן בין כל המכשירים שלך
-- לעבוד יחד ולשתף פתקים
-- לשמור על סדר בעזרת תגיות
-- להתחבר לאימייל או לחשבון שלך ב-WordPress.com
+- לרשום פתקים בקלות
+- לסכרן את התוכן כולו בין כל המכשירים שלך
+- לשתף תוכן ולשתף פעולה
+- להקפיד על ארגון בעזרת תגיות
+- להתחבר באמצעות האימייל שלך או החשבון שלך ב-WordPress.com
 
-לסנכרן ללא חשש
-- לסנכרן באופן יעיל ואוטומטי את התוכן בין המחשב, הטלפון והטאבלט.
+לסנכרן בביטחון
+- האפליקציה מסתנכרנת באופן אוטומטי בין כל המחשבים, הטלפונים או הטאבלטים.
 - ניתן לגבות ולסנכרן את כל התוכן במהלך הכתיבה של הפתקים ולא לאבד תוכן לעולם.
 
-לעבוד יחד ולשתף פתקים
-- לשתף פעולה ולעבוד יחד – לחלוק רעיונות עם עמיתים או לכתוב רשימת קניות עם השותפים לדירה.
+לשתף תוכן ולשתף פעולה
+- אפשר לשתף פעולה ולעבוד יחד – לחלוק רעיונות עם עמיתים או לכתוב רשימת קניות עם השותפים לדירה.
 - ניתן לבחור אם ברצונך לפרסם את התוכן שיצרת ברשת או לשתף קישור עם אנשים מסוימים לבחירתך.
 - ניתן לפרסם את התוכן ישירות לאתר שלך ב-WordPress.com באמצעות התחברות לחשבון שלך ב-WordPress.com.
 - אפשר לשתף את התוכן במהירות ובקלות באפליקציות של צד שלישי.
 
-לארגן ולחפש
-- אפשר להקפיד על ארגון בעזרת תגיות ולהשתמש בהן כדי לחפש פתקים ולמיין אותם מהר.
+ארגון וחיפוש
+- אפשר להקפיד על ארגון בעזרת תגיות ולהשתמש בהן לחיפוש ולמיון מהירים.
 - ניתן למצוא כל מה שברצונך לחפש באופן מיידי בעזרת הדגשה של מילות מפתח.
 - ניתן להשתמש ב-Markdown כדי להוסיף עיצוב.
 - ליצור רשימת משימות.
 - לבחור את סדר התצוגה של הפתקים והתגיות שלך.
 - לנעוץ את הפתקים שנמצאים בשימוש נפוץ.
 - לערוך תגיות באמצעות שינוי השם או הסדר.
-- להגן על התוכן שלך באמצעות קוד גישה.
+- להגן על התוכן שלך באמצעות נעילה של קוד סיסמה.
 
 --
 
 מדיניות פרטיות: https://automattic.com/privacy/
-תנאי שימוש: https://simplenote.com/terms/
-הודעת פרטיות למשתמשים בקליפורניה: https://automattic.com/privacy/#us-privacy-laws
+‎תנאי השירות: https://simplenote.com/terms/
+‎הודעת פרטיות למשתמשים מקליפורניה: https://automattic.com/privacy/#us-privacy-laws
 
 --
 
-יש לעבור לאתר simplenote.com ולהוריד את Simplenote למכשירים הנוספים שלך.
+ניתן לעבור אל simplenote.com כדי להוריד את Simplenote לשאר המכשירים שלך.
diff --git a/fastlane/metadata/he/release_notes.txt b/fastlane/metadata/he/release_notes.txt
new file mode 100644
index 000000000..13c0d2da8
--- /dev/null
+++ b/fastlane/metadata/he/release_notes.txt
@@ -0,0 +1,4 @@
+- עדכנו את הסמלים כדי להתאים אותם לסגנון של iOS 18
+- הוספנו ניסיון חוזר להתחברות באמצעות שם משתמש וסיסמה בכניסה
+- עדכנו את הקישור להצהרת הפרטיות עבור משתמשים בקליפורניה
+
diff --git a/fastlane/metadata/id/description.txt b/fastlane/metadata/id/description.txt
index a6125a3c2..d9ae41eeb 100644
--- a/fastlane/metadata/id/description.txt
+++ b/fastlane/metadata/id/description.txt
@@ -1,36 +1,36 @@
 Simplenote adalah cara yang mudah untuk menulis catatan, membuat daftar hal yang harus dilakukan, mengembangkan ide, dan banyak lagi. Buka, catat beberapa ide, dan selesai. Seiring dengan berkembangnya koleksi Anda, tetap rapi dengan tag dan fitur sematkan, serta temukan hal yang Anda butuhkan dengan pencarian instan. Karena Simplenote akan tersinkron dengan seluruh perangkat secara gratis, catatan akan terus bersama Anda kapan saja.
 
-- Pengalaman mencatat yang sederhana
-- Menyinkronkan semua catatan di berbagai perangkat Anda
-- Berkolaborasi dan berbagi
+- Pengalaman mencatat yang simpel
+- Sinkronkan semua catatan di seluruh perangkat
+- Lakukan kolaborasi dan bagikan
 - Tetap rapi dengan tag
-- Masuk dengan email atau akun WordPress.com Anda
+- Login dengan email atau akun WordPress.com Anda
 
-SINKRONISASI ANDAL
-- Menyinkronkan dengan lancar di semua jenis komputer, ponsel atau tablet secara otomatis.
+SINKRONKAN DENGAN PERCAYA DIRI
+- Sinkronkan dengan mulus secara otomatis di seluruh komputer, ponsel, atau tablet.
 - Cadangkan dan sinkronkan segala hal selagi Anda mencatat, sehingga Anda tidak akan kehilangan isi catatan.
 
-KOLABORASI DAN BERBAGI
-- Lakukan kolaborasi dan bekerja bersama -- bagikan ide dengan rekan kerja, atau tulis daftar belanja bersama teman sekamar.
+LAKUKAN KOLABORASI DAN BAGIKAN
+- Lakukan kolaborasi dan bekerja bersama -- bagikan ide dengan rekan kerja, atau tulis daftar belanja dengan rekan sekamar Anda.
 - Pilih untuk memublikasikan konten Anda ke web, dan bagikan tautan ke siapa pun yang Anda mau.
 - Publikasikan secara langsung ke situs WordPress dengan menyambungkan akun WordPress.com Anda.
 - Bagikan dengan aplikasi pihak ketiga secara mudah dan cepat.
 
-ATUR DAN CARI
-- Tetap rapi dengan tag; gunakan untuk pencarian dan penyortiran cepat.
+RAPIKAN DAN CARI
+- Tetap rapi dengan tag, dan gunakan untuk pencarian dan penyortiran cepat.
 - Temukan apa yang Anda cari secara instan dengan penyorotan kata kunci.
 - Gunakan markdown untuk menambahkan pemformatan.
 - Buat daftar hal yang harus dilakukan.
 - Pilih urutan penyortiran catatan dan tag.
 - Sematkan catatan yang paling sering Anda gunakan.
 - Sunting tag secara langsung dengan menamai dan mengurutkan ulang.
-- Lindungi konten Anda dengan kunci kode sandi.
+- Lindungi isi catatan Anda dengan kunci kode.
 
 --
 
 Kebijakan Privasi: https://automattic.com/privacy/
 Ketentuan Layanan: https://simplenote.com/terms/
-Pemberitahuan Privasi Pengguna California: https://automattic.com/privacy/#us-privacy-laws
+Pemberitahuan Privasi Pengguna di California: https://automattic.com/privacy/#us-privacy-laws
 
 --
 
diff --git a/fastlane/metadata/id/release_notes.txt b/fastlane/metadata/id/release_notes.txt
new file mode 100644
index 000000000..7e2398135
--- /dev/null
+++ b/fastlane/metadata/id/release_notes.txt
@@ -0,0 +1,4 @@
+- Perbarui ikon untuk dapat bekerja dengan penataan iOS 18 yang baru
+- Tambahkan login sementara dengan menggunakan nama pengguna dan kata sandi
+- Tautan diperbarui untuk pemberitahuan privasi untuk pengguna di California
+
diff --git a/fastlane/metadata/it/description.txt b/fastlane/metadata/it/description.txt
index 78efc7446..c94debb63 100644
--- a/fastlane/metadata/it/description.txt
+++ b/fastlane/metadata/it/description.txt
@@ -1,7 +1,7 @@
 Con Simplenote puoi prendere appunti in modo semplice, creare elenchi di cose da fare, registrare le tue idee e molto altro. Aprilo, annota alcune idee e il gioco è fatto. Mentre la tua raccolta cresce, organizzala con tag e spilli e cerca quello di cui hai bisogno con la funzione di ricerca istantanea. I tuoi appunti saranno sempre con te poiché Simplenote si sincronizzerà gratuitamente su tutti i tuoi dispositivi.
 
 - Vivi un'esperienza semplice per prendere appunti
-- Sincronizza di ogni cosa su tutti i tuoi dispositivi
+- Sincronizza ogni cosa su tutti i tuoi dispositivi
 - Collabora e condividi
 - Rimani organizzato con i tag
 - Accedi con la tua e-mail o con il tuo account WordPress.com
@@ -34,4 +34,4 @@ Nota sulla privacy per utenti in California: https://automattic.com/privacy/#us-
 
 --
 
-Visita simplenote.com per scaricare Simplenote per altri dispositivi.
+Visita simplenote.com e scarica Simplenote sugli altri dispositivi.
diff --git a/fastlane/metadata/it/release_notes.txt b/fastlane/metadata/it/release_notes.txt
new file mode 100644
index 000000000..24546a851
--- /dev/null
+++ b/fastlane/metadata/it/release_notes.txt
@@ -0,0 +1,4 @@
+- Aggiornato le icone per renderle compatibili con i nuovi stili di iOS 18
+- Aggiunto un accesso di ripiego con opzioni di nome utente e password per l'accesso
+- Aggiornato il link alla nota sulla privacy per utenti in California
+
diff --git a/fastlane/metadata/ja/description.txt b/fastlane/metadata/ja/description.txt
index 5077813bb..794aec289 100644
--- a/fastlane/metadata/ja/description.txt
+++ b/fastlane/metadata/ja/description.txt
@@ -1,37 +1,37 @@
-Simplenote では、メモ書き、ToDo リストの作成、アイデアのメモなどを簡単に行うことができます。 開いたら、あとは思い付いたことを書き込むだけ。 メモが増えても、タグやピンを使ってわかりやすくまとめることができます。クイック検索を使えば必要なものが見つかります。 メモは使用しているデバイスに無料で同期されるため、いつでも確認できます。
+Simplenote では、メモ書き、ToDo リストの作成、アイデアのメモなどを簡単に行うことができます。 開いたら、あとは思い付いたことを書き込むだけ。 メモが増えても、タグやピンを使ってわかりやすくまとめることができます。クイック検索を使えば必要なものが見つかります。 メモは使用している端末に無料で同期されるため、いつでも確認できます。
 
-- 簡単なメモ作り 
-- すべてのデバイスですべてを同期 
-- コラボレーションと共有
-- タグで見やすく整理 
-- メールまたは WordPress.com アカウントでログイン
+- 手軽にメモできる
+- すべての内容をすべての端末と同期
+- メモを共同編集し共有する
+- タグを使ってまとめられる
+- メールアドレスまたは WordPress.com アカウントでログイン
 
-秘密を保持しながら同期
-- コンピューター、携帯電話、タブレット間でシームレスに自動同期
+確実に同期
+- あらゆる PC、スマホ、タブレットともシームレスに自動で同期します。
 - 使用中にバックアップと同期を実行するため、データを紛失することはありません。
 
-コラボレーションと共有
-- コラボレーションして共に作業する -- 同僚とアイデアを共有したり、ルームメイトと買い物リストを作成したりできます。
+共同編集機能と共有機能
+- 複数で作業できる共同編集機能 - アイデアを仲間とシェアしたり、ルームメイトと一緒に買い物リストを作成したりできます。
 - コンテンツのウェブ公開と、特定の相手とのリンクのシェアから選択できます。
 - WordPress アカウントと連携させることで、WordPress サイトに直接公開できます。
 - サードパーティ製アプリとすばやく簡単に共有できます。
 
 整理と検索
-- タグを使用して見やすく整理し、タグからすばやく検索、並べ替えを行えます。
+- ノートにタグ付けしてわかりやすく整理。タグを使ってすばやく検索や分類ができます。
 - キーワードのハイライト表示で、探している部分がすばやく見つかります。
 - マークダウン機能による書式設定。
 - やることリストの作成。
 - ノートとタグのソート順序を選択。
 - よく使うノートをピンで固定。
 - 名前の編集と順序の並べ替えでタグを直接編集。
-- パスコードロックでコンテンツを保護。
+- パスコードによるロック機能でコンテンツを保護。
 
 --
 
-プライバシーポリシー : https://automattic.com/privacy/
-利用規約 : https://simplenote.com/terms/
-カリフォルニア州のユーザーへの新しいプライバシー通知 : https://automattic.com/privacy/#us-privacy-laws
+プライバシーポリシー: https://automattic.com/privacy/
+利用規約: https://simplenote.com/terms/
+カリフォルニア州のユーザーへのプライバシー通知: https://automattic.com/privacy/#us-privacy-laws
 
 --
 
-simplenote.com にアクセスして他のデバイスに Simplenote をダウンロード。
+simplenote.com にアクセスして、他の端末用の Simplenote をダウンロードしてください。
diff --git a/fastlane/metadata/ja/release_notes.txt b/fastlane/metadata/ja/release_notes.txt
new file mode 100644
index 000000000..c69992b82
--- /dev/null
+++ b/fastlane/metadata/ja/release_notes.txt
@@ -0,0 +1,4 @@
+- 新しい iOS 18 のスタイルに対応するようにアイコンを更新しました
+- ログインにユーザー名とパスワードのオプションを使用するフォールバックログインを追加します
+- カリフォルニア州のユーザーへのプライバシー通知のリンクを更新しました
+
diff --git a/fastlane/metadata/ko/description.txt b/fastlane/metadata/ko/description.txt
index 8f7681845..5caf0a28a 100644
--- a/fastlane/metadata/ko/description.txt
+++ b/fastlane/metadata/ko/description.txt
@@ -1,37 +1,37 @@
-Simplenote로 손쉽게 메모를 작성하고 할 일 목록을 만들고 아이디어를 보관할 수 있습니다. 메모를 열고 생각나는 아이디어를 적으면 끝입니다. 컬렉션의 내용이 다양해지면 태그와 핀으로 내용을 정리하고 빠른 검색 기능으로 필요한 내용을 찾을 수 있습니다. Simplenote는 여러 기기에서 무료로 동기화되기 때문에 내가 작성한 메모를 언제든지 확인할 수 있습니다.
+Simplenote로 손쉽게 메모를 작성하고 할 일 목록을 만들고 아이디어를 보관할 수 있습니다. 생각이 떠오르는 대로 적어 놓기만 하면 됩니다. 컬렉션의 내용이 다양해지면 태그와 핀으로 내용을 정리하고 빠른 검색 기능으로 필요한 내용을 찾을 수 있습니다. Simplenote가 사용하는 기기 전체에서 무료로 동기화되므로 항상 메모가 유지됩니다.
 
-- 간편한 메모 작성 환경
-- 모든 기기의 모든 콘텐츠 동기화
-- 협업 및 공유
+- 간단한 메모 작성 환경
+- 모든 기기에서 모든 콘텐츠 동기화
+- 공동 작업 및 공유
 - 태그로 깔끔하게 정리
 - 이메일 또는 워드프레스닷컴 계정으로 로그인
 
-원활한 동기화
-- 컴퓨터, 휴대폰 또는 태블릿에서 자동으로 문제없이 동기화됩니다.
+자신 있게 동기화
+- 모든 컴퓨터, 휴대폰 또는 태블릿에서 자동으로 원활하게 동기화됩니다.
 - 메모 작성과 동시에 모든 내용이 백업 및 동기화되므로 손실되는 내용이 없습니다.
 
-협업 및 공유
+공동 작업 및 공유
 - 공동으로 협력하여 작업하세요. 동료와 아이디어를 공유하거나 룸메이트와 함께 장보기 목록을 작성해 보세요.
 - 콘텐츠의 웹 공개 여부를 결정하고 원하는 사람과 링크를 공유하세요.
 - 워드프레스닷컴 계정에 연결하여 워드프레스 사이트에 바로 공개하세요.
-- 타사 앱과 빠르고 쉽게 공유할 수 있습니다.
+- 서드파티 앱과 빠르고 쉽게 공유하세요.
 
 정리 및 검색
 - 태그로 깔끔하게 정리하여 빠르게 검색하고 정렬해 보세요.
-- 키워드 강조 표시로 원하는 항목을 즉시 찾을 수 있습니다.
+- 키워드 강조 표시로 원하는 항목을 즉시 찾으세요.
 - 마크다운을 사용하여 서식을 추가하세요.
 - 할 일 목록을 만드세요.
 - 메모 및 태그 정렬 순서를 선택하세요.
 - 가장 많이 사용하는 메모를 고정하세요.
 - 이름을 바꾸고 순서를 변경하여 직접 태그를 편집하세요.
-- 패스코드 잠금으로 콘텐츠를 보호하세요.
+- 암호 잠금으로 콘텐츠를 보호하세요.
 
----
+--
 
 개인정보 취급방침: https://automattic.com/privacy/
-서비스 약관: https://simplenote.com/terms/
-캘리포니아 사용자 개인정보 고지사항: https://automattic.com/privacy/#us-privacy-laws
+https://simplenote.com/terms/
+캘리포니아 사용자 개인정보보호 고지: https://automattic.com/privacy/#us-privacy-laws
 
 --
 
-simplenote.com을 방문하여 다른 기기에서 사용할 Simplenote를 다운로드하세요.
+simplenote.com으로 이동하여 다른 기기에 Simplenote를 다운로드하세요.
diff --git a/fastlane/metadata/ko/release_notes.txt b/fastlane/metadata/ko/release_notes.txt
new file mode 100644
index 000000000..6346e49cf
--- /dev/null
+++ b/fastlane/metadata/ko/release_notes.txt
@@ -0,0 +1,4 @@
+- 새로운 iOS 18 스타일에서 지원하도록 아이콘이 업데이트됨
+- 사용자명과 비밀번호로 로그인할 수 있는 대체 로그인 옵션 추가
+- 캘리포니아 사용자를 위한 개인정보 취급방침 링크가 업데이트됨
+
diff --git a/fastlane/metadata/nl-NL/description.txt b/fastlane/metadata/nl-NL/description.txt
index 0ef1f5061..7377109f8 100644
--- a/fastlane/metadata/nl-NL/description.txt
+++ b/fastlane/metadata/nl-NL/description.txt
@@ -1,13 +1,13 @@
 Simplenote is een eenvoudige manier om aantekeningen te maken, takenlijsten op te stellen, ideeën vast te leggen en meer. Open Simplenote, schrijf je gedachten op en je bent klaar. Naarmate je verzameling groeit, kan je je opmerkingen geordend houden met tags en pins en zoeken naar wat je nodig hebt. Simplenote synchroniseert gratis met al je toestellen, waardoor je je opmerkingen altijd bij je hebt.
 
-- Een fijne ervaring voor notities maken
-- Synchroniseer alles op al je apparaten
-- Samenwerken en delen
-- Overzicht houden met tags
-- Log in met je e-mail of WordPress.com-account
+- Een eenvoudige manier om aantekeningen te maken
+- Synchroniseer alles op al je toestellen
+- Werk samen en deel
+- Houd het overzicht met tags
+- Log in met je e-mail of WordPress.com account
 
 VOL VERTROUWEN SYNCHRONISEREN
-- Automatisch zonder problemen synchroniseren op elke computer, telefoon of tablet.
+- Synchroniseer automatisch naadloos op computer, telefoon of tablet.
 - Maak back-ups en synchroniseer terwijl je opmerkingen maakt, zodat je je inhoud nooit kwijtraakt.
 
 SAMENWERKEN EN DELEN
@@ -24,14 +24,14 @@ ORGANISEREN EN ZOEKEN
 - Kies de sorteervolgorde voor je aantekeningen en tags.
 - Pin de aantekeningen die je het meest gebruikt.
 - Bewerk tags direct door ze een nieuwe naam te geven en de volgorde te wijzigen.
-- Bescherm je content met een pincodevergrendeling.
+- Bescherm je inhoud met een pincodevergrendeling.
 
 --
 
 Privacybeleid: https://automattic.com/privacy/
-Servicevoorwaarden: https://simplenote.com/terms/
+Terms of service: https://simplenote.com/terms/
 Privacyverklaring voor gebruikers in Californië: https://automattic.com/privacy/#us-privacy-laws
 
 --
 
-Ga naar simplenote.com om Simplenote voor je andere apparaten te downloaden.
+Ga naar simplenote.com om Simplenote te downloaden voor je andere apparaten.
diff --git a/fastlane/metadata/nl-NL/release_notes.txt b/fastlane/metadata/nl-NL/release_notes.txt
new file mode 100644
index 000000000..fb5ce0f87
--- /dev/null
+++ b/fastlane/metadata/nl-NL/release_notes.txt
@@ -0,0 +1,4 @@
+- Pictogrammen bijgewerkt om te werken met nieuwe iOS 18-stijlen
+-Back-up login toevoegen met gebruikersnaam en wachtwoordoptie om in te loggen
+-Bijgewerkt link naar privacyverklaring voor gebruikers in Californië
+
diff --git a/fastlane/metadata/pt-BR/description.txt b/fastlane/metadata/pt-BR/description.txt
index 2acd593e5..28f5f2f9f 100644
--- a/fastlane/metadata/pt-BR/description.txt
+++ b/fastlane/metadata/pt-BR/description.txt
@@ -1,30 +1,30 @@
-O Simplenote é uma maneira fácil de fazer anotações, criar listas de tarefas, captar ideias e muito mais. Abra-o, escreva o que quiser e pronto. Conforme a sua coleção aumenta, organize-a usando tags e pins, e encontre o que precisa com a pesquisa instantânea. Como o Simplenote será sincronizado em todos os seus dispositivos gratuitamente, suas anotações o acompanharão o tempo todo.
+O Simplenote é uma maneira fácil de fazer anotações, criar listas de tarefas, captar ideias e muito mais. Abra-o, escreva o que quiser e pronto. Conforme sua coleção cresce, mantenha tudo no seu devido lugar com tags e anotações fixadas para encontrar o que você precisa com uma pesquisa instantânea. Como o Simplenote é sincronizado em todos os seus dispositivos gratuitamente, suas anotações acompanham você o tempo todo.
 
-- Faça anotações de forma simples.
-- Sincronize tudo em todos os seus dispositivos.
-- Colabore e compartilhe.
-- Mantenha seu conteúdo organizado com tags.
-- Faça login com seu e-mail ou sua conta do WordPress.com.
+- Desfrute de uma experiência simples de anotação
+- Sincronize tudo em todos os seus dispositivos
+- Colabore e compartilhe
+- Mantenha tudo organizado com as tags
+- Faça login com seu e-mail ou conta do WordPress.com
 
 SINCRONIZE COM CONFIANÇA
-- Sincronize seu conteúdo automaticamente em qualquer computador, celular ou tablet.
-- Faça backup e sincronize tudo enquanto faz suas anotações, para não perder nenhum conteúdo.
+- Sincronize suas anotações de forma ininterrupta e automática em computadores, celulares e tablets.
+- Faça backup e sincronize tudo enquanto faz suas anotações para não perder nenhum conteúdo.
 
 COLABORE E COMPARTILHE
-- Colabore e trabalhe com outras pessoas: compartilhe ideias com um amigo ou faça uma lista de compras com seu colega de quarto.
-- Escolha se quer ou não publicar o seu conteúdo na Web e compartilhe um link com quem você desejar.
+- Colabore e trabalhe em conjunto: compartilhe suas ideias com um colega de trabalho, ou escreva uma lista de compras junto com seu colega de quarto.
+- Decida se quer publicar o conteúdo na Web e compartilhe um link com quem você quiser.
 - Publique diretamente em um site do WordPress ao conectar-se a sua conta do WordPress.com.
 - Compartilhe de forma rápida e simples com aplicativos de terceiros.
 
 ORGANIZE E PESQUISE
-- Mantenha seu conteúdo organizado com tags e use-as para classificar e pesquisar de forma rápida.
+- Organize seu conteúdo com as tags e as use para pesquisas e classificações rápidas.
 - Encontre o que está procurando, de forma instantânea, com o destaque de palavras-chave.
 - Use o markdown para adicionar formatação.
 - Crie listas de tarefas.
 - Selecione a ordem de classificação de suas anotações e tags.
 - Marque as anotações que mais usa.
 - Edite as tags diretamente, renomeando-as e reorganizando-as.
-- Proteja seu conteúdo usando o bloqueio com senha.
+- Proteja o seu conteúdo com um bloqueio por senha.
 
 --
 
diff --git a/fastlane/metadata/pt-BR/release_notes.txt b/fastlane/metadata/pt-BR/release_notes.txt
new file mode 100644
index 000000000..e0ed42b0d
--- /dev/null
+++ b/fastlane/metadata/pt-BR/release_notes.txt
@@ -0,0 +1,4 @@
+- Ícones atualizados para funcionar com novos estilos do iOS 18
+- Adicionamos uma alternativa de login com opção de nome de usuário e senha
+- Link do aviso de privacidade para usuários residentes da Califórnia atualizado
+
diff --git a/fastlane/metadata/ru/description.txt b/fastlane/metadata/ru/description.txt
index 870d89c24..e11422b84 100644
--- a/fastlane/metadata/ru/description.txt
+++ b/fastlane/metadata/ru/description.txt
@@ -1,37 +1,37 @@
 Simplenote — это простой способ делать заметки, создавать списки дел, записывать идеи и так далее. Откройте его, запишите свои мысли, и готово. Чтобы быстро находить заметки, используйте теги и булавки, а также функцию быстрого поиска. Simplenote бесплатно синхронизирует заметки на ваших устройствах — у вас всегда будет доступ к ним.
 
-- Простой удобный способ делать заметки
-- Синхронизируйте на всех своих устройствах
-- Совместное редактирование и обмен
-- Упорядочивание заметок с помощью меток
-- Вход с помощью эл. почты или учетной записи WordPress.com
-
-НАДЕЖНАЯ СИНХРОНИЗАЦИЯ
-- Автоматическая синхронизация на компьютере, телефоне или планшете.
-- Резервное копирование и синхронизация по мере ввода заметки, вы никогда ничего не потеряете.
-
-СОВМЕСТНАЯ РАБОТА И ОБМЕН
-- Работайте совместно, делитесь идеями с коллегами, составляйте список покупок вместе с друзьями.
-- Публикуйте материалы в Интернете и делитесь ссылками с кем-угодно.
+— Простой и удобный способ делать заметки.
+— Синхронизируйте на всех своих устройствах.
+— Работайте совместно и делитесь.
+— Упорядочивайте при помощи меток.
+— Входите с учётной записью электронной почты или WordPress.com.
+
+УВЕРЕННАЯ СИНХРОНИЗАЦИЯ
+— Автоматическая синхронизация на компьютере, телефоне или планшете.
+— Резервное копирование и синхронизация по мере ввода заметки: вы никогда ничего не потеряете.
+
+СОВМЕСТНАЯ РАБОТА И ОБМЕН ИНФОРМАЦИЕЙ
+— Работайте совместно: делитесь идеями с коллегами или составляйте списки покупок вместе с партнёром.
+— Публикуйте материалы в Интернете и делитесь ссылками с кем угодно.
 - Публикуйте прямо на сайте WordPress, подключив свою учетную запись WordPress.com.
-- Быстро и легко переносите заметки в другие приложения.
+— Быстро и легко переносите заметки в другие приложения.
 
 ОРГАНИЗАЦИЯ И ПОИСК
-- Используйте метки для быстрого поиска и сортировки.
-- Мгновенно находите то, что нужно, с помощью выделения ключевых слов.
+— Используйте метки для быстрого поиска и сортировки.
+— Мгновенно находите то, что нужно, выделяя ключевые слова.
 - Используйте разметку для форматирования.
 - Создавайте списки дел.
 - Выбирайте порядок сортировки заметок и тегов.
 - Прикалывайте булавками самые популярные заметки.
-- Редактируйте теги: меняйте их имена и порядок расположения.
-- Защищайте заметки с помощью пароля.
+— Редактируйте теги: меняйте их имена и порядок расположения.
+— Защищайте заметки с помощью пароля.
 
 --
 
 Политика конфиденциальности: https://automattic.com/privacy/
 Условия предоставления услуг: https://simplenote.com/terms/
-Заявление о защите конфиденциальности пользователей из Калифорнии: https://automattic.com/privacy/#us-privacy-laws
+Уведомление о конфиденциальности для жителей Калифорнии: https://automattic.com/privacy/#us-privacy-laws
 
 --
 
-Перейдите на simplenote.com, чтобы загрузить Simplenote на другие устройства.
+Посетите страницу simplenote.com, чтобы загрузить Simplenote для других устройств.
diff --git a/fastlane/metadata/ru/release_notes.txt b/fastlane/metadata/ru/release_notes.txt
new file mode 100644
index 000000000..58e305475
--- /dev/null
+++ b/fastlane/metadata/ru/release_notes.txt
@@ -0,0 +1,4 @@
+— Значки обновлены в соответствии со стилями новой iOS 18
+— Добавлена опция резервного входа с именем пользователя и паролем
+— Обновлена ссылка на заявление о защите конфиденциальности для пользователей из Калифорнии
+
diff --git a/fastlane/metadata/sv/description.txt b/fastlane/metadata/sv/description.txt
index a75ec01ef..50e37c979 100644
--- a/fastlane/metadata/sv/description.txt
+++ b/fastlane/metadata/sv/description.txt
@@ -1,37 +1,37 @@
-Simplenote är ett enkelt sätt att göra anteckningar, skapa att-göra-listor, skriva ner idéer med mera. Öppna appen, skriv ner några tankar och du är klar. Allteftersom din samling växer kan du hålla dig organiserad med hjälp av etiketter och stift samt hitta vad du behöver med omedelbara sökningar. Eftersom Simplenote synkroniseras kostnadsfritt på alla dina enheter kan du alltd komma åt dina anteckningar.
+Simplenote är ett enkelt sätt att göra anteckningar, skapa att-göra-listor, skriva ner idéer med mera. Öppna appen, skriv ner några tankar och du är klar. Allteftersom din samling växer kan du hålla dig organiserad med hjälp av etiketter och stift samt hitta vad du behöver med omedelbara sökningar. Eftersom Simplenote synkroniseras kostnadsfritt på alla dina enheter kan du alltid komma åt dina anteckningar.
 
 - En enkel anteckningsupplevelse
-- Synkronisera allt över dina enheter
+- Synkronisera allt på alla dina enheter
 - Samarbeta och dela
-- Var organiserad med etiketter
-- Logga in på din e-post eller ditt WordPress.com-konto
+- Håll ordning och reda med etiketter
+- Logga in med din e-postadress eller ditt WordPress.com-konto
 
-SYNKRONISERA TRYGGT
-- Synkronisera automatiskt och sömlöst mellan alla datorer, telefoner och surfplattor.
+SYNKRONISERA MED SJÄLVFÖRTROENDE
+- Synkronisera automatiskt och smidigt på dator, telefon eller surfplatta.
 - Säkerhetskopiera och synkronisera allt när du gör anteckningar, så att du aldrig förlorar ditt innehåll
 
 SAMARBETA OCH DELA
-Samarbeta och arbeta tillsammans – dela idéer med en kollega eller skriv en inköpslista med din rumskamrat.
+- Samarbeta och arbeta tillsammans – dela idéer med en kollega eller skriv en handlingslista tillsammans med din rumskamrat.
 - Välj om du vill publicera ditt innehåll på webben och dela länkar med vem du vill.
 - Publicera direkt till en WordPress-webbplats genom att ansluta ditt WordPress.com-konto.
 - Dela snabbt och enkelt med tredjepartsappar.
 
 ORGANISERA OCH SÖK
-- Håll dig organiserad med etiketter och använd dem för snabb sökning och sortering.
+- Håll ordning och reda med etiketter och använd dem för snabb sökning och sortering.
 - Hitta vad du letar efter omedelbart med nyckelordsmarkering.
 - Använd markdown för att lägga till formatering.
 - Skapa att göra-listor.
 - Välj sorteringsordningen för dina anteckningar och etiketter.
 - Fäst de anteckningar som du använder mest.
 - Redigera etiketter direkt genom att byta namn eller ändra ordning på dem.
-Skydda ditt innehåll med ett lösenordslås.
+- Skydda ditt innehåll med ett lösenordslås.
 
-–
+--
 
-Sekretesspolicy: https://automattic.com/privacy/
+Integritetspolicy: https://automattic.com/privacy/
 Användarvillkor: https://simplenote.com/terms/
-Sekretessmeddelande för användare i Kalifornien: https://automattic.com/privacy/#us-privacy-laws
+Integritetsmeddelande för användare i Kalifornien: https://automattic.com/privacy/#us-privacy-laws
 
-–
+--
 
 Besök simplenote.com för att ladda ner Simplenote till dina andra enheter.
diff --git a/fastlane/metadata/sv/release_notes.txt b/fastlane/metadata/sv/release_notes.txt
new file mode 100644
index 000000000..20714a737
--- /dev/null
+++ b/fastlane/metadata/sv/release_notes.txt
@@ -0,0 +1,4 @@
+- Uppdaterade ikoner som fungerar med nya iOS 18-stilar
+- Lägg till fallback-inloggning med alternativ för användarnamn och lösenord för att logga in
+- Uppdaterad länk till integritetsmeddelande för användare i Kalifornien
+
diff --git a/fastlane/metadata/tr/description.txt b/fastlane/metadata/tr/description.txt
index b1dcca8c4..3e4dc9007 100644
--- a/fastlane/metadata/tr/description.txt
+++ b/fastlane/metadata/tr/description.txt
@@ -1,37 +1,37 @@
 Simplenote not tutmanın, yapılacaklar listesi oluşturmanın, fikirlerinizi kaydetmenin ve daha fazlasını yapmanın kolay bir yoludur. Uygulamayı açıp düşüncelerinizi yazmanız yeterlidir. Koleksiyonunuz büyüdükçe etiketler ve iğnelerle düzeninizi koruyun. Anında arama özelliğiyle ihtiyacınız olanları bulun. Simplenote, cihazlarınızda ücretsiz olarak eşitlendiğinden notlarınız her zaman sizinledir.
 
-- Basit bir not alma deneyimi
-- Tüm cihazlarınızdaki her şeyi eşitleyin
-- İşbirliği yapın ve paylaşın
-- Etiketler sayesinde düzenli kalın
-- E-postanızla veya WordPress.com hesabınızla oturum açın
-
-GÜVENLE SENKRONİZE EDİN
-- Herhangi bir bilgisayar, telefon veya tablette otomatik olarak sorunsuz senkronizasyon yapın.
+- Basit bir not tutma deneyimi
+- Her şeyi tüm cihazlarınızda eşitleyin
+- İş birliği yapın ve paylaşın
+- Etiketlerle düzeninizi koruyun
+- E-postanız veya WordPress.com hesabınızla giriş yapın
+
+GÜVENLE EŞİTLEYİN
+- İstediğiniz bilgisayarda, telefonda veya tablette sorunsuzca otomatik eşitleme yapın.
 - İçeriğinizi hiçbir zaman kaybetmemek için not tutarken her şeyi yedekleyin ve eşitleyin.
 
-İŞBİRLİĞİ YAPIN VE PAYLAŞIN
-- İşbirliği yapın ve birlikte çalışın - fikirlerinizi iş arkadaşınızla paylaşın veya oda arkadaşınızla bir alışveriş listesi yazın.
+İŞ BİRLİĞİ YAPIN VE PAYLAŞIN
+- İş birliği yapın ve birlikte çalışın: Fikirlerinizi bir iş arkadaşınızla paylaşın veya ev arkadaşınızla alışveriş listesi yapın.
 - İçeriğinizi web'de yayımlayıp yayımlamayacağınızı seçin ve istediğiniz kişilerle bağlantı paylaşın.
 - WordPress.com hesabınızı bağlayarak içeriğinizi doğrudan bir WordPress sitesinde yayımlayın.
 - Üçüncü taraf uygulamalarıyla hızla ve kolayca paylaşım yapın.
 
 DÜZENLEYİN VE ARAYIN
-- Etiketler sayesinde düzenli kalın ve bunları kullanarak hızlı şekilde arama ve sıralama yapın.
+- Etiketlerle düzeninizi koruyun. Bunları hızlı arama ve sıralama için kullanın.
 - Anahtar sözcük vurgulama ile aradığınız her şeyi anında bulun.
 - Biçimlendirme eklemek için Markdown'ı kullanın.
 - Yapılacaklar listesi oluşturun.
 - Notlarınızın ve etiketlerinizin nasıl sıralanacağını seçin.
 - En çok kullandığınız notları sabitleyin.
 - Etiketleri düzenleyerek yeniden adlandırın ve yeniden sıralayın.
-- Bir parola kilidi ile içeriğinizi koruyun.
+- İçeriğinizi parola kilidiyle koruyun.
 
 --
 
 Gizlilik Politikası: https://automattic.com/privacy/
-Hizmet Şartları: https://simplenote.com/terms/
-Kaliforniya'daki Kullanıcılar için Gizlilik Bildirimi: https://automattic.com/privacy/#us-privacy-laws
+Hizmet Koşulları: https://simplenote.com/terms/
+Kaliforniya'daki Kullanıcılar İçin Gizlilik Bildirimi: https://automattic.com/privacy/#us-privacy-laws
 
 --
 
-Diğer cihazlarınız için Simplenote'u indirmek üzere simplenote.com adresini ziyaret edin.
+simplenote.com adresine giderek diğer cihazlarınıza da Simplenote uygulamasını indirin.
diff --git a/fastlane/metadata/tr/release_notes.txt b/fastlane/metadata/tr/release_notes.txt
new file mode 100644
index 000000000..58a4fdad0
--- /dev/null
+++ b/fastlane/metadata/tr/release_notes.txt
@@ -0,0 +1,4 @@
+- Yeni iOS 18 stilleriyle çalışması için simgeler güncellendi
+- Oturum açmak için kullanıcı ve şifre seçeneği içeren ikinci oturum açma eklendi
+- Kaliforniya'daki kullanıcılar için gizlilik bildirimine giden bağlantı güncellendi
+
diff --git a/fastlane/metadata/zh-Hans/description.txt b/fastlane/metadata/zh-Hans/description.txt
index f66262b4b..062d8895e 100644
--- a/fastlane/metadata/zh-Hans/description.txt
+++ b/fastlane/metadata/zh-Hans/description.txt
@@ -1,23 +1,23 @@
 Simplenote 可帮助您轻松记录笔记、创建任务清单、捕捉想法等。 只需打开并写下一些想法即可。 随着合集增多，您可以使用标签和固定按钮对其进行整理，通过快速搜索找到您需要的内容。 因为 Simplenote 会在您的设备之间免费同步，所以您可以随时随地访问您的笔记。
 
-- 简单易用的笔记体验
-- 在所有设备之间同步一切内容
-- 协作和共享
+- 轻松的笔记记录体验
+- 在所有设备之间同步所有内容
+- 协作与共享
 - 使用标签保持整洁有序
-- 使用电子邮件地址或 WordPress.com 帐户登录
+- 使用您的电子邮件或 WordPress.com 账户登录
 
-安心同步
-- 自动无缝地跨任何电脑、手机或平板电脑同步。
+同步无忧
+- 自动在所有计算机、手机或平板电脑之间无缝同步。
 - 在您记录笔记时备份并同步所有内容，因此您永远不会丢失内容。
 
-协作和共享
-- 协作与合作 - 与同事分享想法，或者写一份需要与室友一同采购的杂货清单。
+协作与共享
+- 协作与合作：与同事分享想法或与室友一起写购物清单。
 - 选择是否在网络上发布您的内容，并与您的理想对象共享链接。
 - 连接至您的 WordPress.com 帐户，可直接在 WordPress 站点上发布。
 - 快速轻松地与第三方应用共享。
 
-整理和搜索
-- 使用标签保持整洁有序，还可以通过标签快速搜索和分类。
+整理与搜索
+- 使用标签保持整洁有序，并通过标签快速搜索和分类。
 - 通过高亮显示关键字，快速找到您所需的内容。
 - 使用 Markdown 添加格式。
 - 创建任务清单。
@@ -30,8 +30,8 @@ Simplenote 可帮助您轻松记录笔记、创建任务清单、捕捉想法等
 
 隐私政策：https://automattic.com/privacy/
 服务条款：https://simplenote.com/terms/
-加州用户隐私声明：hhttps://automattic.com/privacy/#us-privacy-laws
+加州用户隐私声明：https://automattic.com/privacy/#us-privacy-laws
 
 --
 
-访问 simplenote.com，下载适用于您的其他设备的 Simplenote。
+访问 simplenote.com，将 Simplenote 下载至您的其他设备上。
diff --git a/fastlane/metadata/zh-Hans/release_notes.txt b/fastlane/metadata/zh-Hans/release_notes.txt
new file mode 100644
index 000000000..51bd95f3d
--- /dev/null
+++ b/fastlane/metadata/zh-Hans/release_notes.txt
@@ -0,0 +1,4 @@
+- 更新了图标，使其与 iOS 18 的新样式相匹配
+- 增加了使用用户名和密码进行回退登录的登录选项
+- 更新了面向加州用户的隐私声明的链接
+
diff --git a/fastlane/metadata/zh-Hant/description.txt b/fastlane/metadata/zh-Hant/description.txt
index b6039298f..9c8742ea0 100644
--- a/fastlane/metadata/zh-Hant/description.txt
+++ b/fastlane/metadata/zh-Hant/description.txt
@@ -1,22 +1,22 @@
-Simplenote 讓你輕鬆做筆記、建立待辦事項清單、記下想法等等。 開啟程式、寫下想法，這樣就大功告成囉。 隨著收集的資料越來越多，標籤和釘選功能可讓你保持井井有條，你也可以使用即時搜尋功能尋找所需資料。 Simplenote 提供免費跨裝置同步，讓你隨時隨地將筆記帶在身邊。
+Simplenote 讓你輕鬆做筆記、建立待辦事項清單、記下想法等等。 開啟程式、記下想法，大功告成。 隨著收集的資料越來越多，標籤和釘選功能可讓你保持井井有條，你也可以使用即時搜尋功能尋找所需資料。 Simplenote 提供免費跨裝置同步功能，讓你隨時隨地將筆記帶在身邊。
 
-- 輕鬆做筆記
-- 在所有裝置同步全部內容
-- 協同合作並彼此分享
-- 使用標籤整理筆記
-- 使用你的電子郵件地址或 WordPress.com 帳號登入
+- 享受輕鬆做筆記的體驗
+- 所有內容會同步到所有裝置
+- 協作與共用
+- 使用標籤統整資料
+- 使用電子郵件或 WordPress.com 帳號即可登入
 
-放心同步筆記
-- 順利將筆記自動同步至任何電腦、手機或平板電腦。
+放心同步
+- 順利自動同步到任何電腦、手機或平板電腦。
 - 做筆記的當下同時備份和同步，讓你永遠不會遺失內容。
 
-協同合作並彼此分享
+協作與共用
 - 共同作業，與同事分享想法，或與室友合寫購物清單。
 - 能夠選擇是否將筆記內容發佈到網路，並與任何人分享連結。
 - 連結 WordPress.com 帳號即可將筆記直接發表至 WordPress 網站。
 - 輕鬆快速與第三方應用程式共享筆記。
 
-整理及搜尋
+整理和搜尋
 - 使用標籤即可讓一切保持井井有條，還能快速搜尋和排序。
 - 輸入關鍵字可立即找到所需內容。
 - 使用 Markdown 即可新增格式。
@@ -24,14 +24,14 @@ Simplenote 讓你輕鬆做筆記、建立待辦事項清單、記下想法等等
 - 為筆記和標籤選擇排序順序。
 - 釘選最常用的筆記。
 - 重新命名和重新排序即可直接編輯標籤。
-- 透過密碼鎖定保護你的內容。
+- 使用密碼鎖定保護你的內容。
 
 --
 
 隱私權政策：https://automattic.com/privacy/
 服務條款：https://simplenote.com/terms/
-加州使用者隱私權聲明：https://automattic.com/privacy/#us-privacy-laws
+加州使用者的隱私權聲明：https://automattic.com/privacy/#us-privacy-laws
 
 --
 
-若要下載 Simplenote 到其他裝置，請前往 simplenote.com。
+如需為其他裝置下載 Simplenote，請造訪 simplenote.com。
diff --git a/fastlane/metadata/zh-Hant/release_notes.txt b/fastlane/metadata/zh-Hant/release_notes.txt
new file mode 100644
index 000000000..3d39bc13c
--- /dev/null
+++ b/fastlane/metadata/zh-Hant/release_notes.txt
@@ -0,0 +1,4 @@
+- 更新圖示以搭配新的 iOS 18 樣式
+- 新增可透過使用者名稱和密碼選項登入的備用登入方式
+- 更新了加州使用者隱私權聲明的連結
+

From 5761479a444d404a9014a65732b271c7224c9ea0 Mon Sep 17 00:00:00 2001
From: Automattic Release Bot <mobile+wpmobilebot@automattic.com>
Date: Mon, 23 Sep 2024 00:56:10 -0700
Subject: [PATCH 546/547] Trim ar-SA keywords to be less than 100 characters

---
 fastlane/metadata/ar-SA/keywords.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/metadata/ar-SA/keywords.txt b/fastlane/metadata/ar-SA/keywords.txt
index be7cee772..66c12533b 100644
--- a/fastlane/metadata/ar-SA/keywords.txt
+++ b/fastlane/metadata/ar-SA/keywords.txt
@@ -1 +1 @@
-ملحوظات,ملحوظة,مهام مصغرة,صحيفة,مذكرات,مزامنة,قائمة مهام,مفكرة,بسيط,مفكرة,وسم قائمة مهام,كتابة,مذكرة
+ملحوظات,ملحوظة,مهام مصغرة,صحيفة,مذكرات,مزامنة,قائمة مهام,مفكرة,بسيط,مفكرة,وسم قائمة مهام,كتابة
\ No newline at end of file

From a33c757f5c0029829f9cbda2ebfdc84c4449c8c4 Mon Sep 17 00:00:00 2001
From: Automattic Release Bot <mobile+wpmobilebot@automattic.com>
Date: Mon, 23 Sep 2024 00:56:10 -0700
Subject: [PATCH 547/547] Bump version number

---
 config/Version.Public.xcconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/Version.Public.xcconfig b/config/Version.Public.xcconfig
index ab34b4025..48aa834d9 100644
--- a/config/Version.Public.xcconfig
+++ b/config/Version.Public.xcconfig
@@ -1,2 +1,2 @@
-VERSION_LONG = 4.54.0.0
+VERSION_LONG = 4.54.0.1
 VERSION_SHORT = 4.54