From fb315931a41a2c730451a35f775eb4fa570671e8 Mon Sep 17 00:00:00 2001
From: Stephenie Harris <scoutharris@gmail.com>
Date: Thu, 11 Jun 2020 14:22:11 -0600
Subject: [PATCH 1/5] Remove Giphy files and usage.

---
 .../Classes/Services/MediaImportService.swift |   3 -
 .../WPAnalyticsTrackerAutomatticTracks.m      |  17 --
 .../Analytics/WPAppAnalytics+Media.swift      |   5 -
 .../AztecPostViewController.swift             |  12 +-
 .../Media/Giphy/GiphyDataLoader.swift         |  60 ------
 .../Media/Giphy/GiphyDataSource.swift         | 199 ------------------
 .../ViewRelated/Media/Giphy/GiphyMedia.swift  | 102 ---------
 .../Media/Giphy/GiphyMediaGroup.swift         |  27 ---
 .../Media/Giphy/GiphyPageable.swift           |  39 ----
 .../ViewRelated/Media/Giphy/GiphyPicker.swift | 149 -------------
 .../Media/Giphy/GiphyResultsPage.swift        |  24 ---
 .../Media/Giphy/GiphyService.swift            |  30 ---
 .../Media/Giphy/GiphyStrings.swift            |  25 ---
 .../Giphy/NoResultsGiphyConfiguration.swift   |  28 ---
 .../MediaLibraryMediaPickingCoordinator.swift |  22 +-
 .../Media/MediaLibraryViewController.swift    |  17 --
 .../AztecMediaPickingCoordinator.swift        |  15 +-
 .../giphy-attribution.imageset/Contents.json  |  26 ---
 .../giphy-attribution.png                     | Bin 824 -> 0 bytes
 .../giphy-attribution@2x.png                  | Bin 5921 -> 0 bytes
 .../giphy-attribution@3x.png                  | Bin 8537 -> 0 bytes
 WordPress/WordPress.xcodeproj/project.pbxproj |  48 -----
 22 files changed, 4 insertions(+), 844 deletions(-)
 delete mode 100644 WordPress/Classes/ViewRelated/Media/Giphy/GiphyDataLoader.swift
 delete mode 100644 WordPress/Classes/ViewRelated/Media/Giphy/GiphyDataSource.swift
 delete mode 100644 WordPress/Classes/ViewRelated/Media/Giphy/GiphyMedia.swift
 delete mode 100644 WordPress/Classes/ViewRelated/Media/Giphy/GiphyMediaGroup.swift
 delete mode 100644 WordPress/Classes/ViewRelated/Media/Giphy/GiphyPageable.swift
 delete mode 100644 WordPress/Classes/ViewRelated/Media/Giphy/GiphyPicker.swift
 delete mode 100644 WordPress/Classes/ViewRelated/Media/Giphy/GiphyResultsPage.swift
 delete mode 100644 WordPress/Classes/ViewRelated/Media/Giphy/GiphyService.swift
 delete mode 100644 WordPress/Classes/ViewRelated/Media/Giphy/GiphyStrings.swift
 delete mode 100644 WordPress/Classes/ViewRelated/Media/Giphy/NoResultsGiphyConfiguration.swift
 delete mode 100644 WordPress/Resources/AppImages.xcassets/giphy-attribution.imageset/Contents.json
 delete mode 100644 WordPress/Resources/AppImages.xcassets/giphy-attribution.imageset/giphy-attribution.png
 delete mode 100644 WordPress/Resources/AppImages.xcassets/giphy-attribution.imageset/giphy-attribution@2x.png
 delete mode 100644 WordPress/Resources/AppImages.xcassets/giphy-attribution.imageset/giphy-attribution@3x.png

diff --git a/WordPress/Classes/Services/MediaImportService.swift b/WordPress/Classes/Services/MediaImportService.swift
index 153a6aa06616..26b8beed66eb 100644
--- a/WordPress/Classes/Services/MediaImportService.swift
+++ b/WordPress/Classes/Services/MediaImportService.swift
@@ -86,9 +86,6 @@ open class MediaImportService: LocalCoreDataService {
             exporter.videoOptions = self.exporterVideoOptions
             exporter.urlOptions = self.exporterURLOptions
             return exporter
-        case let giphyMedia as GiphyMedia:
-            let exporter = MediaExternalExporter(externalAsset: giphyMedia)
-            return exporter
         case let stockPhotosMedia as StockPhotosMedia:
             let exporter = MediaExternalExporter(externalAsset: stockPhotosMedia)
             return exporter
diff --git a/WordPress/Classes/Utility/Analytics/WPAnalyticsTrackerAutomatticTracks.m b/WordPress/Classes/Utility/Analytics/WPAnalyticsTrackerAutomatticTracks.m
index 5ebe32412024..b7b0c5ce9c9b 100644
--- a/WordPress/Classes/Utility/Analytics/WPAnalyticsTrackerAutomatticTracks.m
+++ b/WordPress/Classes/Utility/Analytics/WPAnalyticsTrackerAutomatticTracks.m
@@ -446,10 +446,6 @@ + (TracksEventPair *)eventPairForStat:(WPAnalyticsStat)stat
         case WPAnalyticsStatDomainCreditRedemptionTapped:
             eventName = @"domain_credit_redemption_tapped";
             break;
-        case WPAnalyticsStatEditorAddedPhotoViaGiphy:
-            eventName = @"editor_photo_added";
-            eventProperties = @{ @"via" : @"giphy" };
-            break;
         case WPAnalyticsStatEditorAddedPhotoViaLocalLibrary:
             eventName = @"editor_photo_added";
             eventProperties = @{ @"via" : @"local_library" };
@@ -708,15 +704,6 @@ + (TracksEventPair *)eventPairForStat:(WPAnalyticsStat)stat
         case WPAnalyticsStatEnhancedSiteCreationErrorShown:
             eventName = @"enhanced_site_creation_error_shown";
             break;
-        case WPAnalyticsStatGiphyAccessed:
-            eventName = @"giphy_accessed";
-            break;
-        case WPAnalyticsStatGiphySearched:
-            eventName = @"giphy_searched";
-            break;
-        case WPAnalyticsStatGiphyUploaded:
-            eventName = @"giphy_uploaded";
-            break;
         case WPAnalyticsStatGravatarCropped:
             eventName = @"me_gravatar_cropped";
             break;
@@ -880,10 +867,6 @@ + (TracksEventPair *)eventPairForStat:(WPAnalyticsStat)stat
             eventName = @"media_library_photo_added";
             eventProperties = @{ @"via" : @"device_library" };
             break;
-        case WPAnalyticsStatMediaLibraryAddedPhotoViaGiphy:
-            eventName = @"media_library_photo_added";
-            eventProperties = @{ @"via" : @"giphy" };
-            break;
         case WPAnalyticsStatMediaLibraryAddedPhotoViaOtherApps:
             eventName = @"media_library_photo_added";
             eventProperties = @{ @"via" : @"other_library" };
diff --git a/WordPress/Classes/Utility/Analytics/WPAppAnalytics+Media.swift b/WordPress/Classes/Utility/Analytics/WPAppAnalytics+Media.swift
index 81b1093b40fe..0d4af8374aa9 100644
--- a/WordPress/Classes/Utility/Analytics/WPAppAnalytics+Media.swift
+++ b/WordPress/Classes/Utility/Analytics/WPAppAnalytics+Media.swift
@@ -134,8 +134,6 @@ enum MediaUploadOrigin {
         // Media Library
         case (.mediaLibrary(let source), .image) where source == .deviceLibrary:
             return .mediaLibraryAddedPhotoViaDeviceLibrary
-        case (.mediaLibrary(let source), .image) where source == .giphy:
-            return .mediaLibraryAddedPhotoViaGiphy
         case (.mediaLibrary(let source), .image) where source == .otherApps:
             return .mediaLibraryAddedPhotoViaOtherApps
         case (.mediaLibrary(let source), .image) where source == .stockPhotos:
@@ -149,8 +147,6 @@ enum MediaUploadOrigin {
         case (.mediaLibrary(let source), .video) where source == .camera:
             return .mediaLibraryAddedVideoViaCamera
         // Editor
-        case (.editor(let source), .image) where source == .giphy :
-            return .editorAddedPhotoViaGiphy
         case (.editor(let source), .image) where source == .deviceLibrary:
             return .editorAddedPhotoViaLocalLibrary
         case (.editor(let source), .image) where source == .wpMediaLibrary:
@@ -181,7 +177,6 @@ enum MediaSource {
     case wpMediaLibrary
     case stockPhotos
     case camera
-    case giphy
     case mediaEditor
     case tenor
 }
diff --git a/WordPress/Classes/ViewRelated/Aztec/ViewControllers/AztecPostViewController.swift b/WordPress/Classes/ViewRelated/Aztec/ViewControllers/AztecPostViewController.swift
index 6e4d97409700..4e900b4e3636 100644
--- a/WordPress/Classes/ViewRelated/Aztec/ViewControllers/AztecPostViewController.swift
+++ b/WordPress/Classes/ViewRelated/Aztec/ViewControllers/AztecPostViewController.swift
@@ -2392,10 +2392,10 @@ extension AztecPostViewController {
         attachment?.uploadID = media.uploadID
     }
 
-    /// Sets the badge title of `attachment` to "GIF" if either the media is being imported from Giphy,
+    /// Sets the badge title of `attachment` to "GIF" if either the media is being imported from Tenor,
     /// or if it's a PHAsset with an animated playback style.
     private func setGifBadgeIfNecessary(for attachment: MediaAttachment, asset: ExportableAsset, source: MediaSource) {
-        var isGif = [.giphy, .tenor].contains(source)
+        var isGif = source == .tenor
 
         if let asset = asset as? PHAsset,
             asset.playbackStyle == .imageAnimated {
@@ -3307,14 +3307,6 @@ extension AztecPostViewController: StockPhotosPickerDelegate {
     }
 }
 
-extension AztecPostViewController: GiphyPickerDelegate {
-    func giphyPicker(_ picker: GiphyPicker, didFinishPicking assets: [GiphyMedia]) {
-        assets.forEach {
-            insert(exportableAsset: $0, source: .giphy)
-        }
-    }
-}
-
 extension AztecPostViewController: TenorPickerDelegate {
     func tenorPicker(_ picker: TenorPicker, didFinishPicking assets: [TenorMedia]) {
         assets.forEach {
diff --git a/WordPress/Classes/ViewRelated/Media/Giphy/GiphyDataLoader.swift b/WordPress/Classes/ViewRelated/Media/Giphy/GiphyDataLoader.swift
deleted file mode 100644
index 661e72401a50..000000000000
--- a/WordPress/Classes/ViewRelated/Media/Giphy/GiphyDataLoader.swift
+++ /dev/null
@@ -1,60 +0,0 @@
-/// Implementations of this protocol will be notified when data is loaded from the GiphyService
-protocol GiphyDataLoaderDelegate: class {
-    func didLoad(media: [GiphyMedia], reset: Bool)
-}
-
-/// Uses the GiphyService to load GIFs, handling pagination
-final class GiphyDataLoader {
-    private let service: GiphyService
-    private var request: GiphySearchParams?
-
-    private weak var delegate: GiphyDataLoaderDelegate?
-
-    fileprivate enum State {
-        case loading
-        case idle
-    }
-
-    fileprivate var state: State = .idle
-
-    init(service: GiphyService, delegate: GiphyDataLoaderDelegate) {
-        self.service = service
-        self.delegate = delegate
-    }
-
-    func search(_ params: GiphySearchParams) {
-        request = params
-        let isFirstPage = request?.pageable?.pageIndex == GiphyPageable.defaultPageIndex
-        state = .loading
-        DispatchQueue.main.async { [weak self] in
-            WPAnalytics.track(.giphySearched)
-            self?.service.search(params: params) { resultsPage in
-                self?.state = .idle
-                self?.request = GiphySearchParams(text: self?.request?.text, pageable: resultsPage.nextPageable())
-
-                if let content = resultsPage.content() {
-                    self?.delegate?.didLoad(media: content, reset: isFirstPage)
-                }
-            }
-        }
-    }
-
-    func loadNextPage() {
-        // Bail out if there is another active request
-        guard state == .idle else {
-            return
-        }
-
-        // Bail out if we are not aware of the pagination status
-        guard let request = request else {
-            return
-        }
-
-        // Bail out if we do not expect more pages of data
-        guard request.pageable?.next() != nil else {
-            return
-        }
-
-        search(request)
-    }
-}
diff --git a/WordPress/Classes/ViewRelated/Media/Giphy/GiphyDataSource.swift b/WordPress/Classes/ViewRelated/Media/Giphy/GiphyDataSource.swift
deleted file mode 100644
index 915b33bd339b..000000000000
--- a/WordPress/Classes/ViewRelated/Media/Giphy/GiphyDataSource.swift
+++ /dev/null
@@ -1,199 +0,0 @@
-import WPMediaPicker
-
-
-/// Data Source for Giphy
-final class GiphyDataSource: NSObject, WPMediaCollectionDataSource {
-    fileprivate static let paginationThreshold = 10
-
-    fileprivate var gifMedia = [GiphyMedia]()
-    var observers = [String: WPMediaChangesBlock]()
-    private var dataLoader: GiphyDataLoader?
-
-    var onStartLoading: (() -> Void)?
-    var onStopLoading: (() -> Void)?
-
-    private let scheduler = Scheduler(seconds: 0.5)
-
-    private(set) var searchQuery: String = ""
-
-    init(service: GiphyService) {
-        super.init()
-        self.dataLoader = GiphyDataLoader(service: service, delegate: self)
-    }
-
-    func clearSearch(notifyObservers shouldNotify: Bool) {
-        gifMedia.removeAll()
-        if shouldNotify {
-            notifyObservers()
-        }
-    }
-
-    func search(for searchText: String?) {
-        searchQuery = searchText ?? ""
-
-        guard searchText?.isEmpty == false else {
-            clearSearch(notifyObservers: true)
-            scheduler.cancel()
-            return
-        }
-
-        scheduler.debounce { [weak self] in
-            let params = GiphySearchParams(text: searchText, pageable: GiphyPageable.first())
-            self?.search(params)
-            self?.onStartLoading?()
-        }
-    }
-
-    private func search(_ params: GiphySearchParams) {
-        dataLoader?.search(params)
-    }
-
-    func numberOfGroups() -> Int {
-        return 1
-    }
-
-    func group(at index: Int) -> WPMediaGroup {
-        return GiphyMediaGroup()
-    }
-
-    func selectedGroup() -> WPMediaGroup? {
-        return GiphyMediaGroup()
-    }
-
-    func numberOfAssets() -> Int {
-        return gifMedia.count
-    }
-
-    func media(at index: Int) -> WPMediaAsset {
-        fetchMoreContentIfNecessary(index)
-        return gifMedia[index]
-    }
-
-    func media(withIdentifier identifier: String) -> WPMediaAsset? {
-        return gifMedia.filter { $0.identifier() == identifier }.first
-    }
-
-    func registerChangeObserverBlock(_ callback: @escaping WPMediaChangesBlock) -> NSObjectProtocol {
-        let blockKey = UUID().uuidString
-        observers[blockKey] = callback
-        return blockKey as NSString
-    }
-
-    func unregisterChangeObserver(_ blockKey: NSObjectProtocol) {
-        guard let key = blockKey as? String else {
-            assertionFailure("blockKey must be of type String")
-            return
-        }
-        observers.removeValue(forKey: key)
-    }
-
-    func registerGroupChangeObserverBlock(_ callback: @escaping WPMediaGroupChangesBlock) -> NSObjectProtocol {
-        // The group never changes
-        return NSNull()
-    }
-
-    func unregisterGroupChangeObserver(_ blockKey: NSObjectProtocol) {
-        // The group never changes
-    }
-
-    func loadData(with options: WPMediaLoadOptions, success successBlock: WPMediaSuccessBlock?, failure failureBlock: WPMediaFailureBlock? = nil) {
-        successBlock?()
-    }
-
-    func mediaTypeFilter() -> WPMediaType {
-        return .image
-    }
-
-    func ascendingOrdering() -> Bool {
-        return true
-    }
-
-    func searchCancelled() {
-        searchQuery = ""
-        clearSearch(notifyObservers: true)
-    }
-
-    // MARK: Unused protocol methods
-
-    func setSelectedGroup(_ group: WPMediaGroup) {
-        //
-    }
-
-    func add(_ image: UIImage, metadata: [AnyHashable: Any]?, completionBlock: WPMediaAddedBlock? = nil) {
-        //
-    }
-
-    func addVideo(from url: URL, completionBlock: WPMediaAddedBlock? = nil) {
-        //
-    }
-
-    func setMediaTypeFilter(_ filter: WPMediaType) {
-        //
-    }
-
-    func setAscendingOrdering(_ ascending: Bool) {
-        //
-    }
-}
-
-
-// MARK: - Helpers
-
-extension GiphyDataSource {
-    private func notifyObservers(incremental: Bool = false, inserted: IndexSet = IndexSet()) {
-        DispatchQueue.main.async {
-            self.observers.forEach {
-            $0.value(incremental, IndexSet(), inserted, IndexSet(), [])
-            }
-        }
-    }
-}
-
-// MARK: - Pagination
-
-extension GiphyDataSource {
-    fileprivate func fetchMoreContentIfNecessary(_ index: Int) {
-        if shouldLoadMore(index) {
-            dataLoader?.loadNextPage()
-        }
-    }
-
-    private func shouldLoadMore(_ index: Int) -> Bool {
-        return index + type(of: self).paginationThreshold >= numberOfAssets()
-    }
-}
-
-extension GiphyDataSource: GiphyDataLoaderDelegate {
-    func didLoad(media: [GiphyMedia], reset: Bool) {
-        defer {
-            onStopLoading?()
-        }
-
-        guard media.count > 0 && searchQuery.count > 0 else {
-            clearSearch(notifyObservers: true)
-            return
-        }
-
-        if reset {
-            overwriteMedia(with: media)
-        } else {
-            appendMedia(with: media)
-        }
-    }
-
-    private func overwriteMedia(with media: [GiphyMedia]) {
-        gifMedia = media
-        notifyObservers(incremental: false)
-    }
-
-    private func appendMedia(with media: [GiphyMedia]) {
-        let currentMaxIndex = gifMedia.count
-        let newMaxIndex = currentMaxIndex + media.count - 1
-
-        let isIncremental = currentMaxIndex != 0
-        let insertedIndexes = IndexSet(integersIn: currentMaxIndex...newMaxIndex)
-
-        gifMedia.append(contentsOf: media)
-        notifyObservers(incremental: isIncremental, inserted: insertedIndexes)
-    }
-}
diff --git a/WordPress/Classes/ViewRelated/Media/Giphy/GiphyMedia.swift b/WordPress/Classes/ViewRelated/Media/Giphy/GiphyMedia.swift
deleted file mode 100644
index 892218f64c5e..000000000000
--- a/WordPress/Classes/ViewRelated/Media/Giphy/GiphyMedia.swift
+++ /dev/null
@@ -1,102 +0,0 @@
-import WPMediaPicker
-import MobileCoreServices
-
-struct GiphyImageCollection {
-    private(set) var largeURL: URL
-    private(set) var previewURL: URL
-    private(set) var staticThumbnailURL: URL
-    private(set) var largeSize: CGSize
-}
-
-/// Models a Giphy image
-///
-final class GiphyMedia: NSObject {
-    private(set) var id: String
-    private(set) var name: String
-    private(set) var caption: String
-    private let updatedDate: Date
-    private let images: GiphyImageCollection
-
-    init(id: String, name: String, caption: String, images: GiphyImageCollection, date: Date? = nil) {
-        self.id = id
-        self.name = name
-        self.caption = caption
-        self.updatedDate = date ?? Date()
-        self.images = images
-    }
-}
-
-extension GiphyMedia: WPMediaAsset {
-    func image(with size: CGSize, completionHandler: @escaping WPMediaImageBlock) -> WPMediaRequestID {
-        let url = imageURL(with: size)
-
-        DispatchQueue.global().async {
-            do {
-                let data = try Data(contentsOf: url)
-                let image = UIImage(data: data)
-                completionHandler(image, nil)
-            } catch {
-                completionHandler(nil, error)
-            }
-        }
-
-        // Giphy API doesn't return a numerical ID value
-        return 0
-    }
-
-    private func imageURL(with size: CGSize) -> URL {
-        return size == .zero ? images.previewURL : images.staticThumbnailURL
-    }
-
-    func cancelImageRequest(_ requestID: WPMediaRequestID) {
-        // Can't be canceled
-    }
-
-    func videoAsset(completionHandler: @escaping WPMediaAssetBlock) -> WPMediaRequestID {
-        return 0
-    }
-
-    func assetType() -> WPMediaType {
-        return .image
-    }
-
-    func duration() -> TimeInterval {
-        return 0
-    }
-
-    func baseAsset() -> Any {
-        return self
-    }
-
-    func identifier() -> String {
-        return id
-    }
-
-    func date() -> Date {
-        return updatedDate
-    }
-
-    func pixelSize() -> CGSize {
-        return images.largeSize
-    }
-
-    func utTypeIdentifier() -> String? {
-        return String(kUTTypeGIF)
-    }
-}
-
-// MARK: - ExportableAsset conformance
-
-extension GiphyMedia: ExportableAsset {
-    var assetMediaType: MediaType {
-        return .image
-    }
-}
-
-// MARK: - MediaExternalAsset conformance
-//
-extension GiphyMedia: MediaExternalAsset {
-    var URL: URL {
-        return images.previewURL
-    }
-}
diff --git a/WordPress/Classes/ViewRelated/Media/Giphy/GiphyMediaGroup.swift b/WordPress/Classes/ViewRelated/Media/Giphy/GiphyMediaGroup.swift
deleted file mode 100644
index 469ea0bcc829..000000000000
--- a/WordPress/Classes/ViewRelated/Media/Giphy/GiphyMediaGroup.swift
+++ /dev/null
@@ -1,27 +0,0 @@
-import WPMediaPicker
-
-final class GiphyMediaGroup: NSObject, WPMediaGroup {
-    func name() -> String {
-        return String.giphy
-    }
-
-    func image(with size: CGSize, completionHandler: @escaping WPMediaImageBlock) -> WPMediaRequestID {
-        return 0
-    }
-
-    func cancelImageRequest(_ requestID: WPMediaRequestID) {
-        //
-    }
-
-    func baseGroup() -> Any {
-        return ""
-    }
-
-    func identifier() -> String {
-        return "group id"
-    }
-
-    func numberOfAssets(of mediaType: WPMediaType, completionHandler: WPMediaCountBlock? = nil) -> Int {
-        return 10
-    }
-}
diff --git a/WordPress/Classes/ViewRelated/Media/Giphy/GiphyPageable.swift b/WordPress/Classes/ViewRelated/Media/Giphy/GiphyPageable.swift
deleted file mode 100644
index 479153b46845..000000000000
--- a/WordPress/Classes/ViewRelated/Media/Giphy/GiphyPageable.swift
+++ /dev/null
@@ -1,39 +0,0 @@
-
-struct GiphyPageable: Pageable {
-    let itemsPerPage: Int
-    let pageHandle: Int
-
-    static let defaultPageSize = 40
-    static let defaultPageIndex = 0
-
-    func next() -> Pageable? {
-        if pageHandle == 0 {
-            return nil
-        }
-
-        return GiphyPageable(itemsPerPage: itemsPerPage, pageHandle: pageHandle)
-    }
-
-    var pageSize: Int {
-        return itemsPerPage
-    }
-
-    var pageIndex: Int {
-        return pageHandle
-    }
-}
-
-extension GiphyPageable {
-    /// Builds the Pageable corresponding to the first page, with the default page size.
-    ///
-    /// - Returns: A GiphyPageable configured with the default page size and the initial page handle
-    static func first() -> GiphyPageable {
-        return GiphyPageable(itemsPerPage: defaultPageSize, pageHandle: defaultPageIndex)
-    }
-}
-
-extension GiphyPageable: CustomStringConvertible {
-    var description: String {
-        return "Giphy Pageable: count \(itemsPerPage) next: \(pageHandle)"
-    }
-}
diff --git a/WordPress/Classes/ViewRelated/Media/Giphy/GiphyPicker.swift b/WordPress/Classes/ViewRelated/Media/Giphy/GiphyPicker.swift
deleted file mode 100644
index fa9b855e79bb..000000000000
--- a/WordPress/Classes/ViewRelated/Media/Giphy/GiphyPicker.swift
+++ /dev/null
@@ -1,149 +0,0 @@
-import WPMediaPicker
-import MobileCoreServices
-
-protocol GiphyPickerDelegate: AnyObject {
-    func giphyPicker(_ picker: GiphyPicker, didFinishPicking assets: [GiphyMedia])
-}
-
-/// Presents the Giphy main interface
-final class GiphyPicker: NSObject {
-    private lazy var dataSource: GiphyDataSource = {
-        return GiphyDataSource(service: giphyService)
-    }()
-
-    private lazy var giphyService: GiphyService = {
-        return GiphyService()
-    }()
-
-    /// Helps choosing the correct view controller for previewing a media asset
-    ///
-    private var mediaPreviewHelper: MediaPreviewHelper!
-
-    weak var delegate: GiphyPickerDelegate?
-    private var blog: Blog?
-    private var observerToken: NSObjectProtocol?
-
-    private let searchHint = NoResultsViewController.controller()
-
-    private var pickerOptions: WPMediaPickerOptions = {
-        let options = WPMediaPickerOptions()
-        options.showMostRecentFirst = true
-        options.filter = [.all]
-        options.allowCaptureOfMedia = false
-        options.showSearchBar = true
-        options.badgedUTTypes = [String(kUTTypeGIF)]
-        options.preferredStatusBarStyle = .lightContent
-        return options
-    }()
-
-    private lazy var picker: WPNavigationMediaPickerViewController = {
-        let picker = WPNavigationMediaPickerViewController(options: pickerOptions)
-        picker.delegate = self
-        picker.startOnGroupSelector = false
-        picker.showGroupSelector = false
-        picker.dataSource = dataSource
-        picker.cancelButtonTitle = .closePicker
-        return picker
-    }()
-
-    func presentPicker(origin: UIViewController, blog: Blog) {
-        NoResultsGiphyConfiguration.configureAsIntro(searchHint)
-        self.blog = blog
-
-        origin.present(picker, animated: true) {
-            self.picker.mediaPicker.searchBar?.becomeFirstResponder()
-        }
-
-        observeDataSource()
-        trackAccess()
-    }
-
-    private func observeDataSource() {
-        observerToken = dataSource.registerChangeObserverBlock { [weak self] (_, _, _, _, assets) in
-            self?.updateHintView()
-        }
-        dataSource.onStartLoading = { [weak self] in
-            NoResultsGiphyConfiguration.configureAsLoading(self!.searchHint)
-        }
-        dataSource.onStopLoading = { [weak self] in
-            self?.updateHintView()
-        }
-    }
-
-    private func shouldShowNoResults() -> Bool {
-        return dataSource.searchQuery.count > 0 && dataSource.numberOfAssets() == 0
-    }
-
-    private func updateHintView() {
-        searchHint.removeFromView()
-        if shouldShowNoResults() {
-            NoResultsGiphyConfiguration.configure(searchHint)
-        } else {
-            NoResultsGiphyConfiguration.configureAsIntro(searchHint)
-        }
-    }
-
-    deinit {
-        if let token = observerToken {
-            dataSource.unregisterChangeObserver(token)
-        }
-    }
-}
-
-extension GiphyPicker: WPMediaPickerViewControllerDelegate {
-    func mediaPickerController(_ picker: WPMediaPickerViewController, didFinishPicking assets: [WPMediaAsset]) {
-        guard let assets = assets as? [GiphyMedia] else {
-            assertionFailure("assets should be of type `[GiphyMedia]`")
-            return
-        }
-        delegate?.giphyPicker(self, didFinishPicking: assets)
-        picker.dismiss(animated: true)
-        dataSource.clearSearch(notifyObservers: false)
-        hideKeyboard(from: picker.searchBar)
-    }
-
-    func emptyViewController(forMediaPickerController picker: WPMediaPickerViewController) -> UIViewController? {
-        return searchHint
-    }
-
-    func mediaPickerControllerDidEndLoadingData(_ picker: WPMediaPickerViewController) {
-        if let searchBar = picker.searchBar {
-            WPStyleGuide.configureSearchBar(searchBar)
-        }
-    }
-
-    func mediaPickerControllerDidCancel(_ picker: WPMediaPickerViewController) {
-        picker.dismiss(animated: true)
-        dataSource.clearSearch(notifyObservers: false)
-        hideKeyboard(from: picker.searchBar)
-    }
-
-    func mediaPickerController(_ picker: WPMediaPickerViewController, didSelect asset: WPMediaAsset) {
-        hideKeyboard(from: picker.searchBar)
-    }
-
-    func mediaPickerController(_ picker: WPMediaPickerViewController, didDeselect asset: WPMediaAsset) {
-        hideKeyboard(from: picker.searchBar)
-    }
-
-    func mediaPickerController(_ picker: WPMediaPickerViewController, previewViewControllerFor assets: [WPMediaAsset], selectedIndex selected: Int) -> UIViewController? {
-        mediaPreviewHelper = MediaPreviewHelper(assets: assets)
-        return mediaPreviewHelper.previewViewController(selectedIndex: selected)
-    }
-
-    private func hideKeyboard(from view: UIView?) {
-        if let view = view, view.isFirstResponder {
-            //Fix animation conflict between dismissing the keyboard and showing the accessory input view
-            DispatchQueue.main.asyncAfter(deadline: .now() + 0.01) {
-                view.resignFirstResponder()
-            }
-        }
-    }
-}
-
-// MARK: - Tracks
-extension GiphyPicker {
-    fileprivate func trackAccess() {
-        WPAnalytics.track(.giphyAccessed)
-    }
-}
diff --git a/WordPress/Classes/ViewRelated/Media/Giphy/GiphyResultsPage.swift b/WordPress/Classes/ViewRelated/Media/Giphy/GiphyResultsPage.swift
deleted file mode 100644
index cfd9f8721071..000000000000
--- a/WordPress/Classes/ViewRelated/Media/Giphy/GiphyResultsPage.swift
+++ /dev/null
@@ -1,24 +0,0 @@
-
-final class GiphyResultsPage: ResultsPage {
-    private let results: [GiphyMedia]
-    private let pageable: Pageable?
-
-    init(results: [GiphyMedia], pageable: Pageable? = nil) {
-        self.results = results
-        self.pageable = pageable
-    }
-
-    func content() -> [GiphyMedia]? {
-        return results
-    }
-
-    func nextPageable() -> Pageable? {
-        return pageable?.next()
-    }
-}
-
-extension GiphyResultsPage {
-    static func empty() -> GiphyResultsPage {
-        return GiphyResultsPage(results: [], pageable: nil)
-    }
-}
diff --git a/WordPress/Classes/ViewRelated/Media/Giphy/GiphyService.swift b/WordPress/Classes/ViewRelated/Media/Giphy/GiphyService.swift
deleted file mode 100644
index 58281c6540ef..000000000000
--- a/WordPress/Classes/ViewRelated/Media/Giphy/GiphyService.swift
+++ /dev/null
@@ -1,30 +0,0 @@
-/// Encapsulates search parameters (text, pagination, etc)
-struct GiphySearchParams {
-    let text: String
-    let pageable: Pageable?
-
-    init(text: String?, pageable: Pageable?) {
-        self.text = text ?? ""
-        self.pageable = pageable
-    }
-}
-
-struct GiphyService {
-    func search(params: GiphySearchParams, completion: @escaping (GiphyResultsPage) -> Void) {
-        completion(GiphyResultsPage.empty())
-    }
-}
-
-
-
-// Allows us to mock out the pagination in tests
-protocol GPHPaginationType {
-    /// Total Result Count.
-    var totalCount: Int { get }
-
-    /// Actual Result Count (not always == limit)
-    var count: Int { get }
-
-    /// Offset to start next set of results.
-    var offset: Int { get }
-}
diff --git a/WordPress/Classes/ViewRelated/Media/Giphy/GiphyStrings.swift b/WordPress/Classes/ViewRelated/Media/Giphy/GiphyStrings.swift
deleted file mode 100644
index 36bc7669f246..000000000000
--- a/WordPress/Classes/ViewRelated/Media/Giphy/GiphyStrings.swift
+++ /dev/null
@@ -1,25 +0,0 @@
-/// Extension on String containing the literals for the Giphy feature
-extension String {
-    // MARK: - Entry point: alert controller
-    static var giphy: String {
-        return NSLocalizedString("Giphy", comment: "One of the options when selecting More in the Post Editor's format bar")
-    }
-
-    // MARK: - Placeholder
-    static var giphyPlaceholderTitle: String {
-        return NSLocalizedString("Search to find GIFs to add to your Media Library!", comment: "Title for placeholder in Giphy picker")
-    }
-
-    static var giphyPlaceholderSubtitle: String {
-        return NSLocalizedString("Powered by Giphy", comment: "Subtitle for placeholder in Giphy picker. `The company name 'Giphy' should always be written as it is.")
-    }
-
-    static var giphySearchNoResult: String {
-        return NSLocalizedString("No media matching your search", comment: "Phrase to show when the user searches for GIFs but there are no result to show.")
-    }
-
-    static var giphySearchLoading: String {
-        return NSLocalizedString("Loading GIFs...", comment: "Phrase to show when the user has searched for GIFs and they are being loaded.")
-    }
-
-}
diff --git a/WordPress/Classes/ViewRelated/Media/Giphy/NoResultsGiphyConfiguration.swift b/WordPress/Classes/ViewRelated/Media/Giphy/NoResultsGiphyConfiguration.swift
deleted file mode 100644
index 796a72c286d7..000000000000
--- a/WordPress/Classes/ViewRelated/Media/Giphy/NoResultsGiphyConfiguration.swift
+++ /dev/null
@@ -1,28 +0,0 @@
-// Empty state for Giphy
-
-struct NoResultsGiphyConfiguration {
-
-    static func configureAsIntro(_ viewController: NoResultsViewController) {
-        viewController.configure(title: .giphyPlaceholderTitle,
-                                 image: Constants.imageName,
-                                 subtitleImage: "giphy-attribution")
-
-        viewController.view.layoutIfNeeded()
-    }
-
-    static func configureAsLoading(_ viewController: NoResultsViewController) {
-        viewController.configure(title: .giphySearchLoading,
-                                 image: Constants.imageName)
-
-        viewController.view.layoutIfNeeded()
-    }
-
-    static func configure(_ viewController: NoResultsViewController) {
-        viewController.configureForNoSearchResults(title: .giphySearchNoResult)
-        viewController.view.layoutIfNeeded()
-    }
-
-    private enum Constants {
-        static let imageName = "media-no-results"
-    }
-}
diff --git a/WordPress/Classes/ViewRelated/Media/MediaLibraryMediaPickingCoordinator.swift b/WordPress/Classes/ViewRelated/Media/MediaLibraryMediaPickingCoordinator.swift
index 196d60620a84..1e3a8ef638b8 100644
--- a/WordPress/Classes/ViewRelated/Media/MediaLibraryMediaPickingCoordinator.swift
+++ b/WordPress/Classes/ViewRelated/Media/MediaLibraryMediaPickingCoordinator.swift
@@ -3,13 +3,11 @@ import WPMediaPicker
 
 /// Prepares the alert controller that will be presented when tapping the "+" button in Media Library
 final class MediaLibraryMediaPickingCoordinator {
-    typealias PickersDelegate = StockPhotosPickerDelegate & WPMediaPickerViewControllerDelegate
-                                & GiphyPickerDelegate & TenorPickerDelegate
+    typealias PickersDelegate = StockPhotosPickerDelegate & WPMediaPickerViewControllerDelegate & TenorPickerDelegate
     private weak var delegate: PickersDelegate?
     private var tenor: TenorPicker?
 
     private let stockPhotos = StockPhotosPicker()
-    private var giphy = GiphyPicker()
     private let cameraCapture = CameraCaptureCoordinator()
     private let mediaLibrary = MediaLibraryPicker()
 
@@ -18,7 +16,6 @@ final class MediaLibraryMediaPickingCoordinator {
 
         stockPhotos.delegate = delegate
         mediaLibrary.delegate = delegate
-        giphy.delegate = delegate
     }
 
     func present(context: MediaPickingContext) {
@@ -75,13 +72,6 @@ final class MediaLibraryMediaPickingCoordinator {
         })
     }
 
-
-    private func giphyAction(origin: UIViewController, blog: Blog) -> UIAlertAction {
-        return UIAlertAction(title: .giphy, style: .default, handler: { [weak self] action in
-            self?.showGiphy(origin: origin, blog: blog)
-        })
-    }
-
     private func tenorAction(origin: UIViewController, blog: Blog) -> UIAlertAction {
         return UIAlertAction(title: .tenor, style: .default, handler: { [weak self] action in
             self?.showTenor(origin: origin, blog: blog)
@@ -106,16 +96,6 @@ final class MediaLibraryMediaPickingCoordinator {
         stockPhotos.presentPicker(origin: origin, blog: blog)
     }
 
-    private func showGiphy(origin: UIViewController, blog: Blog) {
-        let delegate = giphy.delegate
-
-        // Create a new GiphyPicker each time so we don't save state
-        giphy = GiphyPicker()
-        giphy.delegate = delegate
-
-        giphy.presentPicker(origin: origin, blog: blog)
-    }
-
     private func showTenor(origin: UIViewController, blog: Blog) {
         let picker = TenorPicker()
         // Delegate to the PickerCoordinator so we can release the Tenor instance
diff --git a/WordPress/Classes/ViewRelated/Media/MediaLibraryViewController.swift b/WordPress/Classes/ViewRelated/Media/MediaLibraryViewController.swift
index a1f32e6caf37..01ca906d91a2 100644
--- a/WordPress/Classes/ViewRelated/Media/MediaLibraryViewController.swift
+++ b/WordPress/Classes/ViewRelated/Media/MediaLibraryViewController.swift
@@ -664,23 +664,6 @@ extension MediaLibraryViewController: StockPhotosPickerDelegate {
     }
 }
 
-// MARK: Giphy Picker Delegate
-
-extension MediaLibraryViewController: GiphyPickerDelegate {
-    func giphyPicker(_ picker: GiphyPicker, didFinishPicking assets: [GiphyMedia]) {
-        guard assets.count > 0 else {
-            return
-        }
-
-        let mediaCoordinator = MediaCoordinator.shared
-        assets.forEach { giphyMedia in
-            let info = MediaAnalyticsInfo(origin: .mediaLibrary(.giphy), selectionMethod: .fullScreenPicker)
-            mediaCoordinator.addMedia(from: giphyMedia, to: blog, analyticsInfo: info)
-            WPAnalytics.track(.giphyUploaded)
-        }
-    }
-}
-
 // MARK: Tenor Picker Delegate
 
 extension MediaLibraryViewController: TenorPickerDelegate {
diff --git a/WordPress/Classes/ViewRelated/Media/StockPhotos/AztecMediaPickingCoordinator.swift b/WordPress/Classes/ViewRelated/Media/StockPhotos/AztecMediaPickingCoordinator.swift
index 884100623fa2..edea3876973d 100644
--- a/WordPress/Classes/ViewRelated/Media/StockPhotos/AztecMediaPickingCoordinator.swift
+++ b/WordPress/Classes/ViewRelated/Media/StockPhotos/AztecMediaPickingCoordinator.swift
@@ -3,16 +3,13 @@ import WPMediaPicker
 
 /// Prepares the alert controller that will be presented when tapping the "more" button in Aztec's Format Bar
 final class AztecMediaPickingCoordinator {
-    typealias PickersDelegate = StockPhotosPickerDelegate & GiphyPickerDelegate & TenorPickerDelegate
+    typealias PickersDelegate = StockPhotosPickerDelegate & TenorPickerDelegate
     private weak var delegate: PickersDelegate?
     private var tenor: TenorPicker?
-
-    private let giphy = GiphyPicker()
     private let stockPhotos = StockPhotosPicker()
 
     init(delegate: PickersDelegate) {
         self.delegate = delegate
-        giphy.delegate = delegate
         stockPhotos.delegate = delegate
     }
 
@@ -49,12 +46,6 @@ final class AztecMediaPickingCoordinator {
         })
     }
 
-    private func giphyAction(origin: UIViewController, blog: Blog) -> UIAlertAction {
-        return UIAlertAction(title: .giphy, style: .default, handler: { [weak self] action in
-            self?.showGiphy(origin: origin, blog: blog)
-        })
-    }
-
     private func tenorAction(origin: UIViewController, blog: Blog) -> UIAlertAction {
         return UIAlertAction(title: .tenor, style: .default, handler: { [weak self] action in
             self?.showTenor(origin: origin, blog: blog)
@@ -75,10 +66,6 @@ final class AztecMediaPickingCoordinator {
         stockPhotos.presentPicker(origin: origin, blog: blog)
     }
 
-    private func showGiphy(origin: UIViewController, blog: Blog) {
-        giphy.presentPicker(origin: origin, blog: blog)
-    }
-
     private func showTenor(origin: UIViewController, blog: Blog) {
         let picker = TenorPicker()
         picker.delegate = self
diff --git a/WordPress/Resources/AppImages.xcassets/giphy-attribution.imageset/Contents.json b/WordPress/Resources/AppImages.xcassets/giphy-attribution.imageset/Contents.json
deleted file mode 100644
index 74617fcec35b..000000000000
--- a/WordPress/Resources/AppImages.xcassets/giphy-attribution.imageset/Contents.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "giphy-attribution.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "giphy-attribution@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "giphy-attribution@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  },
-  "properties" : {
-    "template-rendering-intent" : "template"
-  }
-}
\ No newline at end of file
diff --git a/WordPress/Resources/AppImages.xcassets/giphy-attribution.imageset/giphy-attribution.png b/WordPress/Resources/AppImages.xcassets/giphy-attribution.imageset/giphy-attribution.png
deleted file mode 100644
index 543c63a78f65dce1a03360cb0028df567f389096..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 824
zcmeAS@N?(olHy`uVBq!ia0vp^DL|~k!3-olQu09(-T^)#uK)l42QsMwuCLiv3^Yix
zB*-tAp}|2RLBN2+L_@;Hg2kgEgQp-sL`Ek<rS|wTZ3YIWW=|K#kczmwQ+n6UHsEpF
z|9j?y76#p=_3!^L*}XA*XNlylUBRZg?yFL!+*rPm`G<Fl!2RIqQ%l&EtqF8UW1Jw-
zXwALiivaIB!A7tCeQb*zUglQ5id1trk*XZ1BxHGQi|T}QmrqP0&%`+|yCpSxSM;`)
z>nur7W;D`l4(nB}?%DImsn23E<JWM(Z@Y{$x~_`)h=0nN)S$W1;lzX)AG9L5o}S`a
zaIJNMhstzo_l7e{LOx1r6aAaK8e9xLr>!}3WYO6olf@InPcwMridufM3u4e>N_;6C
zxy-@Uhbhsl(}<y4FHhBL)*ltqg$BGjDK&PUsWBgRPmVdXa|6Q;<HY9FIgO1nIcieH
zGq_4OpI5mW=YQjzOU~W2OOv~O-%FmqaC>ToX6u{@q1;lltVHALcgEiA3E}#t@^2o)
zi8HruXKG)3`+e{CCGjzvJ|Fx4*+sCkLVc5*omRVPME&kl3_MaAuPq!dE|)yDhJV9f
zbBQnN>Lv1hX~E8nPae<oGZk~%=)>~6-z9ZJi{N>l_S~h*j#%*Ia=Jxdvy-W9=69Ao
zcWc59RWntw8MEFM=c!qoozwp+!(+}y)sJ#d-JfsbuG#AD>ZdI=Dby}<ZH4zE&E*-l
zrmsA&ADrdcamw@YvLo(=H6>pg*U$ZP+xeSsr}&n4L57BFRQ-;Ly>7p1uxr~9y%Q%@
zqW}Cj)-$c;_oQ?GzpT~#xa>y4KE+D6GL=WwQIp=So+MqSG9&uzr$V;ycb<746)n4p
z?szOI71&-LKT)RIWM6Fj#FqK2OOEAuhplAz(RQRi=}mm%pH7vi__;rMCxxFj+~>@6
zVgEOFruP#Sp6y(HM$&777t10x#`7Mj4MsWZT(+3}nf`}CPhX;J`J#7oK#AYe)z4*}
HQ$iB}S7=A2

diff --git a/WordPress/Resources/AppImages.xcassets/giphy-attribution.imageset/giphy-attribution@2x.png b/WordPress/Resources/AppImages.xcassets/giphy-attribution.imageset/giphy-attribution@2x.png
deleted file mode 100644
index 6040148d17b45b99e3e461ab402be3821c5e77ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5921
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
Dl*Jd9

diff --git a/WordPress/Resources/AppImages.xcassets/giphy-attribution.imageset/giphy-attribution@3x.png b/WordPress/Resources/AppImages.xcassets/giphy-attribution.imageset/giphy-attribution@3x.png
deleted file mode 100644
index 511624e60de121b56cf4a83c7a335e2dc4f60578..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8537
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
THo&8M00000NkvXXu0mjfPVi#s

diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj
index c752a7959b65..acc4ba872671 100644
--- a/WordPress/WordPress.xcodeproj/project.pbxproj
+++ b/WordPress/WordPress.xcodeproj/project.pbxproj
@@ -153,8 +153,6 @@
 		173BCE751CEB369900AE8817 /* Domains.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 173BCE741CEB369900AE8817 /* Domains.storyboard */; };
 		173BCE791CEB780800AE8817 /* Domain.swift in Sources */ = {isa = PBXBuildFile; fileRef = 173BCE781CEB780800AE8817 /* Domain.swift */; };
 		173D82E7238EE2A7008432DA /* FeatureFlagTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 173D82E6238EE2A7008432DA /* FeatureFlagTests.swift */; };
-		173F6DFC21232F2A00A4C8E2 /* NoResultsGiphyConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 173F6DFB21232F2A00A4C8E2 /* NoResultsGiphyConfiguration.swift */; };
-		173F6DFE212352D000A4C8E2 /* GiphyService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 173F6DFD212352D000A4C8E2 /* GiphyService.swift */; };
 		1746D7771D2165AE00B11D77 /* ForcePopoverPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1746D7761D2165AE00B11D77 /* ForcePopoverPresenter.swift */; };
 		1749965F2271BF08007021BD /* WordPressAppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1749965E2271BF08007021BD /* WordPressAppDelegate.swift */; };
 		174C9697205A846E00CEEF6E /* PostNoticeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 174C9696205A846E00CEEF6E /* PostNoticeViewModel.swift */; };
@@ -175,14 +173,6 @@
 		176DEEE91D4615FE00331F30 /* WPSplitViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 176DEEE81D4615FE00331F30 /* WPSplitViewController.swift */; };
 		177074851FB209F100951A4A /* CircularProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 177074841FB209F100951A4A /* CircularProgressView.swift */; };
 		177076211EA206C000705A4A /* PlayIconView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 177076201EA206C000705A4A /* PlayIconView.swift */; };
-		177B4C252123161900CF8084 /* GiphyPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 177B4C242123161900CF8084 /* GiphyPicker.swift */; };
-		177B4C27212316DC00CF8084 /* GiphyStrings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 177B4C26212316DC00CF8084 /* GiphyStrings.swift */; };
-		177B4C292123181400CF8084 /* GiphyDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 177B4C282123181400CF8084 /* GiphyDataSource.swift */; };
-		177B4C2B2123185300CF8084 /* GiphyMediaGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 177B4C2A2123185300CF8084 /* GiphyMediaGroup.swift */; };
-		177B4C2D2123192200CF8084 /* GiphyMedia.swift in Sources */ = {isa = PBXBuildFile; fileRef = 177B4C2C2123192200CF8084 /* GiphyMedia.swift */; };
-		177B4C3121236F0F00CF8084 /* GiphyDataLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 177B4C3021236F0F00CF8084 /* GiphyDataLoader.swift */; };
-		177B4C3321236F5C00CF8084 /* GiphyPageable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 177B4C3221236F5C00CF8084 /* GiphyPageable.swift */; };
-		177B4C352123706400CF8084 /* GiphyResultsPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 177B4C342123706400CF8084 /* GiphyResultsPage.swift */; };
 		177CBE501DA3A3AC009F951E /* CollectionType+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 177CBE4F1DA3A3AC009F951E /* CollectionType+Helpers.swift */; };
 		177E7DAD1DD0D1E600890467 /* UINavigationController+SplitViewFullscreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 177E7DAC1DD0D1E600890467 /* UINavigationController+SplitViewFullscreen.swift */; };
 		1782BE841E70063100A91E7D /* MediaItemViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1782BE831E70063100A91E7D /* MediaItemViewController.swift */; };
@@ -2541,8 +2531,6 @@
 		173BCE741CEB369900AE8817 /* Domains.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Domains.storyboard; sourceTree = "<group>"; };
 		173BCE781CEB780800AE8817 /* Domain.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Domain.swift; sourceTree = "<group>"; };
 		173D82E6238EE2A7008432DA /* FeatureFlagTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureFlagTests.swift; sourceTree = "<group>"; };
-		173F6DFB21232F2A00A4C8E2 /* NoResultsGiphyConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoResultsGiphyConfiguration.swift; sourceTree = "<group>"; };
-		173F6DFD212352D000A4C8E2 /* GiphyService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GiphyService.swift; sourceTree = "<group>"; };
 		1746D7761D2165AE00B11D77 /* ForcePopoverPresenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ForcePopoverPresenter.swift; sourceTree = "<group>"; };
 		1749965E2271BF08007021BD /* WordPressAppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WordPressAppDelegate.swift; sourceTree = "<group>"; };
 		174C9696205A846E00CEEF6E /* PostNoticeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostNoticeViewModel.swift; sourceTree = "<group>"; };
@@ -2559,14 +2547,6 @@
 		176DEEE81D4615FE00331F30 /* WPSplitViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WPSplitViewController.swift; sourceTree = "<group>"; };
 		177074841FB209F100951A4A /* CircularProgressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CircularProgressView.swift; sourceTree = "<group>"; };
 		177076201EA206C000705A4A /* PlayIconView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PlayIconView.swift; sourceTree = "<group>"; };
-		177B4C242123161900CF8084 /* GiphyPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GiphyPicker.swift; sourceTree = "<group>"; };
-		177B4C26212316DC00CF8084 /* GiphyStrings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GiphyStrings.swift; sourceTree = "<group>"; };
-		177B4C282123181400CF8084 /* GiphyDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GiphyDataSource.swift; sourceTree = "<group>"; };
-		177B4C2A2123185300CF8084 /* GiphyMediaGroup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GiphyMediaGroup.swift; sourceTree = "<group>"; };
-		177B4C2C2123192200CF8084 /* GiphyMedia.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GiphyMedia.swift; sourceTree = "<group>"; };
-		177B4C3021236F0F00CF8084 /* GiphyDataLoader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GiphyDataLoader.swift; sourceTree = "<group>"; };
-		177B4C3221236F5C00CF8084 /* GiphyPageable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GiphyPageable.swift; sourceTree = "<group>"; };
-		177B4C342123706400CF8084 /* GiphyResultsPage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GiphyResultsPage.swift; sourceTree = "<group>"; };
 		177CBE4F1DA3A3AC009F951E /* CollectionType+Helpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CollectionType+Helpers.swift"; sourceTree = "<group>"; };
 		177E7DAC1DD0D1E600890467 /* UINavigationController+SplitViewFullscreen.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UINavigationController+SplitViewFullscreen.swift"; sourceTree = "<group>"; };
 		1782BE831E70063100A91E7D /* MediaItemViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MediaItemViewController.swift; sourceTree = "<group>"; };
@@ -5342,23 +5322,6 @@
 			path = Notices;
 			sourceTree = "<group>";
 		};
-		177B4C232123152D00CF8084 /* Giphy */ = {
-			isa = PBXGroup;
-			children = (
-				177B4C242123161900CF8084 /* GiphyPicker.swift */,
-				173F6DFD212352D000A4C8E2 /* GiphyService.swift */,
-				177B4C3021236F0F00CF8084 /* GiphyDataLoader.swift */,
-				177B4C3221236F5C00CF8084 /* GiphyPageable.swift */,
-				177B4C342123706400CF8084 /* GiphyResultsPage.swift */,
-				177B4C26212316DC00CF8084 /* GiphyStrings.swift */,
-				177B4C282123181400CF8084 /* GiphyDataSource.swift */,
-				177B4C2A2123185300CF8084 /* GiphyMediaGroup.swift */,
-				177B4C2C2123192200CF8084 /* GiphyMedia.swift */,
-				173F6DFB21232F2A00A4C8E2 /* NoResultsGiphyConfiguration.swift */,
-			);
-			path = Giphy;
-			sourceTree = "<group>";
-		};
 		1797373920EBDA1100377B4E /* Universal Links */ = {
 			isa = PBXGroup;
 			children = (
@@ -6713,7 +6676,6 @@
 			isa = PBXGroup;
 			children = (
 				C87501EF243AEC290002CD60 /* Tenor */,
-				177B4C232123152D00CF8084 /* Giphy */,
 				D8A3A5AD206A059100992576 /* StockPhotos */,
 				FF8A04DF1D9BFE7400523BC4 /* CachedAnimatedImageView.swift */,
 				7435CE7220A4B9170075A1B9 /* AnimatedImageCache.swift */,
@@ -12024,7 +11986,6 @@
 				B50C0C621EF42AF200372C65 /* TextList+WordPress.swift in Sources */,
 				B5722E421D51A28100F40C5E /* Notification.swift in Sources */,
 				1759F1801FE1460C0003EC81 /* NoticeView.swift in Sources */,
-				177B4C3321236F5C00CF8084 /* GiphyPageable.swift in Sources */,
 				40C403F42215D66A00E8C894 /* TopViewedAuthorStatsRecordValue+CoreDataProperties.swift in Sources */,
 				7E4A773920F80417001C706D /* ActivityPluginRange.swift in Sources */,
 				7462BFD02028C49800B552D8 /* ShareNoticeViewModel.swift in Sources */,
@@ -12105,7 +12066,6 @@
 				E6D170371EF9D8D10046D433 /* SiteInfo.swift in Sources */,
 				822D60B11F4C747E0016C46D /* JetpackSecuritySettingsViewController.swift in Sources */,
 				E16A76F31FC4766900A661E3 /* CredentialsService.swift in Sources */,
-				177B4C292123181400CF8084 /* GiphyDataSource.swift in Sources */,
 				4070D75E20E6B4E4007CEBDA /* ActivityDateFormatting.swift in Sources */,
 				E2AA87A518523E5300886693 /* UIView+Subviews.m in Sources */,
 				5D51ADAF19A832AF00539C0B /* WordPress-20-21.xcmappingmodel in Sources */,
@@ -12204,7 +12164,6 @@
 				405BFB20223B37A000CD5BEA /* FollowersCountStatsRecordValue+CoreDataClass.swift in Sources */,
 				F126FE0220A33BDB0010EB6E /* DocumentUploadProcessor.swift in Sources */,
 				9A2D0B36225E2511009E585F /* JetpackService.swift in Sources */,
-				177B4C3121236F0F00CF8084 /* GiphyDataLoader.swift in Sources */,
 				8236EB4B20248FF1007C7CF9 /* JetpackSpeedUpSiteSettingsViewController.swift in Sources */,
 				40F50B7E22130E6C00CBBB73 /* FollowersStatsRecordValue+CoreDataProperties.swift in Sources */,
 				E66969DC1B9E55C300EC9C00 /* ReaderTopicToReaderListTopic37to38.swift in Sources */,
@@ -12339,7 +12298,6 @@
 				73CB13972289BEFB00265F49 /* Charts+LargeValueFormatter.swift in Sources */,
 				ADF544C2195A0F620092213D /* CustomHighlightButton.m in Sources */,
 				17B7C89E20EC1D0D0042E260 /* UniversalLinkRouter.swift in Sources */,
-				177B4C352123706400CF8084 /* GiphyResultsPage.swift in Sources */,
 				F59AAC16235EA46D00385EE6 /* LightNavigationController.swift in Sources */,
 				40A2777F20191AA500D078D5 /* PluginDirectoryCollectionViewCell.swift in Sources */,
 				7E40716223741376003627FA /* GutenbergNetworking.swift in Sources */,
@@ -12505,7 +12463,6 @@
 				08D978571CD2AF7D0054F19A /* MenuItemCheckButtonView.m in Sources */,
 				08216FCC1CDBF96000304BA7 /* MenuItemLinkViewController.m in Sources */,
 				F5D0A64E23CC159400B20D27 /* PreviewWebKitViewController.swift in Sources */,
-				173F6DFE212352D000A4C8E2 /* GiphyService.swift in Sources */,
 				733195832284FE9F0007D904 /* PeriodChart.swift in Sources */,
 				F1450CF52437E1A600A28BFE /* MediaHost.swift in Sources */,
 				08216FC81CDBF96000304BA7 /* MenuItemAbstractPostsViewController.m in Sources */,
@@ -12834,7 +12791,6 @@
 				9872CB30203B8A730066A293 /* SignupEpilogueTableViewController.swift in Sources */,
 				E1B23B081BFB3B370006559B /* MyProfileViewController.swift in Sources */,
 				B5CC05F61962150600975CAC /* Constants.m in Sources */,
-				177B4C27212316DC00CF8084 /* GiphyStrings.swift in Sources */,
 				4326191522FCB9DC003C7642 /* MurielColor.swift in Sources */,
 				436D562B2117312700CEAA33 /* RegisterDomainDetailsErrorSectionFooter.swift in Sources */,
 				7E729C28209A087300F76599 /* ImageLoader.swift in Sources */,
@@ -12999,7 +12955,6 @@
 				73C8F06421BEEF3400DDDF7E /* SiteAssemblyService.swift in Sources */,
 				B5176CC11CDCE1B90083CF2D /* ManagedPerson.swift in Sources */,
 				F59AAC10235E430F00385EE6 /* ChosenValueRow.swift in Sources */,
-				177B4C2B2123185300CF8084 /* GiphyMediaGroup.swift in Sources */,
 				B54E1DF11A0A7BAA00807537 /* ReplyTextView.swift in Sources */,
 				40EE94802213213F00CD264F /* PublicizeConnectionStatsRecordValue+CoreDataProperties.swift in Sources */,
 				08216FCA1CDBF96000304BA7 /* MenuItemEditingFooterView.m in Sources */,
@@ -13088,7 +13043,6 @@
 				98AE3DF5219A1789003C0E24 /* StatsInsightsStore.swift in Sources */,
 				08216FCD1CDBF96000304BA7 /* MenuItemPagesViewController.m in Sources */,
 				40A71C6B220E1952002E3D25 /* StatsRecordValue+CoreDataProperties.swift in Sources */,
-				177B4C2D2123192200CF8084 /* GiphyMedia.swift in Sources */,
 				57D6C840229498C5003DDC7E /* InteractivePostView.swift in Sources */,
 				D865721221869C590023A99C /* WizardStep.swift in Sources */,
 				43D54D131DCAA070007F575F /* PostPostViewController.swift in Sources */,
@@ -13114,7 +13068,6 @@
 				98F0297C2405C9E500FFD862 /* LoginEpilogueConnectSiteCell.swift in Sources */,
 				E100C6BB1741473000AE48D8 /* WordPress-11-12.xcmappingmodel in Sources */,
 				9A38DC6D218899FB006A409B /* DiffAbstractValue.swift in Sources */,
-				177B4C252123161900CF8084 /* GiphyPicker.swift in Sources */,
 				17B7C8C120EE2A870042E260 /* Routes+Notifications.swift in Sources */,
 				7E92A1FB233CB1B7006D281B /* Autosaver.swift in Sources */,
 				9A341E5621997A340036662E /* BlogAuthor.swift in Sources */,
@@ -13149,7 +13102,6 @@
 				73FF7032221F469100541798 /* Charts+Support.swift in Sources */,
 				F16601C423E9E783007950AE /* SharingAuthorizationWebViewController.swift in Sources */,
 				171963401D378D5100898E8B /* SearchWrapperView.swift in Sources */,
-				173F6DFC21232F2A00A4C8E2 /* NoResultsGiphyConfiguration.swift in Sources */,
 				0815CF461E96F22600069916 /* MediaImportService.swift in Sources */,
 				B56F25881FBDE502005C33E4 /* NSAttributedStringKey+Conversion.swift in Sources */,
 				FFABD80821370496003C65B6 /* SelectPostViewController.swift in Sources */,

From 525acaf06463f1849de8a5b744521104a3bc5aad Mon Sep 17 00:00:00 2001
From: Stephenie Harris <scoutharris@gmail.com>
Date: Thu, 11 Jun 2020 14:33:39 -0600
Subject: [PATCH 2/5] Remove Giphy creds.

---
 .configure                                      |   2 +-
 .../wpcom_alpha_app_credentials.enc             | Bin 880 -> 832 bytes
 .configure-files/wpcom_app_credentials.enc      | Bin 880 -> 832 bytes
 .../wpcom_internal_app_credentials.enc          | Bin 880 -> 832 bytes
 WordPress/Credentials/ApiCredentials.h          |   1 -
 WordPress/Credentials/gencredentials.rb         |  16 ++--------------
 6 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/.configure b/.configure
index b014cb7bd600..b783d41906f5 100644
--- a/.configure
+++ b/.configure
@@ -1,7 +1,7 @@
 {
   "project_name": "WordPress-iOS",
   "branch": "master",
-  "pinned_hash": "c99db21d6160bee2218e2fd3a18f5de9b2a92eb3",
+  "pinned_hash": "43e751540dcdcc86bde9db7b0d08a4acdbc1472c",
   "files_to_copy": [
     {
       "file": "iOS/WPiOS/wpcom_app_credentials",
diff --git a/.configure-files/wpcom_alpha_app_credentials.enc b/.configure-files/wpcom_alpha_app_credentials.enc
index 923b0833afbfd35f42efd95229d46b5eb0ea9270..2ea270ff13d7799af078a269c8a5a1f46eb9e021 100644
GIT binary patch
delta 748
zcmV<I0u%l42EYc8V1I&LfQSHGh<kXV_ZrsmsM|R!zoDTfS;*)##~YWn?lD)_WMT*>
zHP$xG2EPEuqG_Vziq9RC5#qE3Z!Yg2_n3(^J1O#gNvww^u{{O0(^!oPP$JBRPz)Ph
zTi19i0n}hZX1ROxs37#+=5-{jAq>O4XTt^>>=?}Bd2}q3{(tm>lTPh6sHi$4!GDj7
zwn$EKn&wK@?}AR)sjp5@cYPEJ>%bZ;PHc^OD77RiMAyMef;~aKYP}Ng1FYdO;S>a?
zw!1Kf`^{p1h_0dbbuF@O=r8{4y;9!r{pEPj0Q#h2b>*9vTLBhW<}5ACdixdntP@vk
zi7Jl0-jM=<zkiWnGZG}~wUt)zMnj7)U=af=l9)ZLhiAbbit%lnkAeUX{S@fL3A6#W
zPfUJ2n~w+z4lBcC9?swFW+ZnSreas3es!m874Fqclf}37-~^|Y4S>s_w@Z81r9^Zg
zkJ^v}j4QbYAr{$Ka#)(?E9W>Lq-7Hj1F3y{=T(j5pnvDU!PUhO&K<_wQoYr>-cjAf
zJN!*{=AM-xx1<OLdI%2fyp(W=ll3!iEGP||qhl(kQ$oaXrkGiQ(4R?|`{Qz(v)!&W
zA#d0LBN#W3{CtQl8eyBE{0958$oVZzX#wOTy(}+-e0!C4$PoGb?-Rp-0r&Ojv?<zL
zIa0=ISARs2P}Qzc2rlna6KC#+nC(Vr=MFzNBHRWKfpT+_=N#qcv@VCXrkzZ0?H9dP
z?B#*n!_PN8)rxo~lltrzGLa=66yeD0#Y9a-ucRDuEo5ue1ARERYsg<j-T(O&s1Qz#
z?UkC&d2hbW1T<sl;CTmC*Z2mQ@=|yFIYQ~(*kv9|&9=;Qvj&q{StinMyCAC`SFv>v
zQ0isE-ac}i+tM29@wUW11EHp(E&|^t9t%kuF8Sr0Rl@eS+DW=!7vUq?TKFt|D!sQx
eYi5+jdC8;TlByaMCIrXqLI#?UTZ8WLK@HT9iggJ9

delta 797
zcmV+&1LFL^2Ji-uV1Mu=U%9mfu(FA2IYe0{Im2k_hFEd~f+A<@2j5za;E?+MA{s_q
z-OP(*Hzfm-PJ%V3mg&_D8pB&ArkHtUA|NYv$8p5T&0>$+Y$PAq`Ipo!k%ZxwzCNy0
zs<RB?I+0;4b7ZHx8ESSv{mNndU2B?9!`IJ$9&mNTO^Ks$Gk*&HG%M^gE5vZ5M?JDR
zjS+DU0Y8w+A4TXQ%qc!T?2E*yqvLWv9PTzw?fbv?I4$%ihMkO}u(lawuJ?*f`OxcW
z=3dYs8FXoGy2$?pOvOQmbO|C~9}k;;k+Cp*$;#>MZ@NmRpo0QeJxgv(e<;d&AJ3c&
z=1Y#EtA_$X^ndGoBbu?RlU=<FM=sjB;a3V94nC$wzV?24P0}Z7nVw=pVu3<*@Xjv8
zI%nzlrZ-Mcv1b(oE^Bo;7j}V_{8`#p=*=_6jJTd8l$s9}T_uS*>_6a0cTDNSyjk0t
zYQ{;>x~IP}zP_pJ<?5oGZIp!`lcTZ!n!c8_psPa3y?^nF)9NoAS=X}(L+Aoh6}%LN
zMs)J8XEzt|k~KMQlDw)VqUQYoZn|74Nt}NY#e119p@c0FAbxiRiJVLY8i_Dlmr{s&
z_O{U}$=7_OEWm`($(vE81?;N%L??O@ES4k+O_%{R$;MTL8)H}!CF#WBO6(_OwOcoR
zk?)-<CVwV4#!xA+3x(+IHhzE73C4S_Z2!Zw4gK0KND8t%ul<~Wb`fLmf<f)ufO82;
zw7OGi4IMa_)kl$c1#%XXOz3!XW%pVAJ>c?+49A0=ge4-VgyS6Qq{*`ULH9mBhrXgh
z#{$K%qHmSK)c(*D1GPET<*yXEhPKB!`9eqNpMRI-HaTz_LN#VBC(W_(Rw4N}=-5O2
zbzwkz?VMn7Dgz?MM)z1Ic}Ka8!cG@Y#X;M`dT?N%j+*3be|+5?r&kz$@qHisnox#X
zR!R@&;FDa1h<)ViU?llpeE|A6$GpOsS64hA&bItvHXh*q-~L^GtK2pkJ4$of3<N{T
b>lRnf8c&^@np2&b7qBIg<qtE{mrT|d8XJo~

diff --git a/.configure-files/wpcom_app_credentials.enc b/.configure-files/wpcom_app_credentials.enc
index adbaa4573f6deddd002a8ee2b6fcfda890adcb0e..631e5afaa1691bada8dd60169bc56cdba53dd5fa 100644
GIT binary patch
delta 748
zcmV<I0u%l42EYc8V1I&LfQSHGh<kXV_ZrsmsM|R!zoDTfS;*)##~YWn?lI4D)VzW0
zFSc{d4d#4Ab6w^R)A|n%&Qc`3K5n@-NH?n&OOo&q+4PB;pct$KlcW5s8%>=QJb7@_
zO339Con(O%HI!Dv#BmB$@BNpI@+%@Su?ZkcSW(`B2%b@rTz?B;nIwl6(85d8XDbCs
zR0?F@`buv{q*$P)vdn%KQAbbFQ-(*Ltzm+~>j}gw<#>}&#BP=eIl>`*S=DQg7DC)A
zBg2+YdgYO{^2o!;$K{z@F>SQCy-c~xQxaZ$(uC0dxHl=hxP7t0WU%S|b^IT4?w41@
zSPn53vQ4p5tAFd2hEh8sx~T|W*!Z?8Evq1<U711TP0r_s9hSHaLnMD{takzV{a<1%
ztw^AQOCi%lzHaJ%YN1p{E^u2Uff-r)7+6%P2(joeJ&b={IPMCS-Evy?Z9;qT<eaVU
z&9hJ%r>Ii*-R?(lgjiIYnosXG$<bS4&)XyTfLoiftAFv~547^_GER0}4BN{q=M*--
z@wm=W;0kGBoUaw%yc^asDPYxNt48JH2r4$%{7en0N7d{TOtJf?!4_TYMCvHKFUwQ&
zQxTPe1)OMb*JEaFQO_r)>Se@+2`tP0f~cu@{zbniAU<T-Zoj<nkYwG?#&LF}UV7Ta
z#iz&(>wkhFxVU`+?N!h7y||DArb~f*$^uWsTbw`;h5F^+^&C_i=<w4C_n-d1gdXPQ
z^L_vxpsnxJHqU!^z=gi-(&H6>ABg8>m~PEy2>0lY!!VB;KQ->a%@|<R-0tJ9)@ujA
zkI>p{O83b*#X+G<@@#yRORpI)&7V;&#f-hL&SjLLcb}s*a)Wqk8?|6Kt=2uk4b3w?
zr{lCt=X!I{nqz^;UpuV4RL&Wx2K82M!CHAvc`W^a`|MhG(#ddqKt-JUu`{3PlX>`d
emIrqgV`JKz@lgVLI|)5qA4}BYY*?vVT`aJ~P=j&+

delta 797
zcmV+&1LFL^2Ji-uV1Mu=U%9mfu(FA2IYe0{Im2k_hFEd~f+A<@2j5za;E?+MA{s_q
z-OP(*Hzfm-PJ%V3mg&_D8pB&ArkHtUA|NYv$8p5T&0>$+Y$PAq`IkRC&E(27j9&V1
zV;?WZ)p%QYe@R1MQ5z(^6_wSyt|RVAP!6vz4ZZ%Izy9VQbAN+M@j$OvOic!V)u}#R
zv?yP_%#U0Vxt<m>C!7Y{w<RE(U5O8KMxIg0e_arbx(C$khl>y%lmmU=n&BLhLE(TK
z9eiTBJ!EFfLjF6{ASKmuUG1ATB^Xgw?*T36Q00VScU(G2N~O5=gW!CO6Tn+%8?~%<
zYG5u>t$dv}dw&|?2Mvh?{L=DQm6*WOEn4_R;RV~q=AV^Tvff=!O3$L0%XX!A^82}7
z>mZ*!TbC$qBbH0gPN`*+y&)~u2-+=~#BKlB<e~jyOEY_(zc>*zf~-#zu`{@^<O1|y
z`9CZfSO(Zn%y3I6{An@WDT=ic%xF`%2EqB0$0bYgtABgunPbPU=uE7wW&A9>i?rzf
zhJsCeIhwdQ;egU=k?`w**zxYrJ6SlKM<nL0P~D=W3ft(qb*)kg(4iG9<GBDbS<<lQ
zT6Wklx>m{0IZ6>q{9Cr)j6JR7l1E0Ok9DMVyg8_p@{|eVp|5!nIJJ!%9&zN=z*Ty2
z$)3b(QGW+P7TF)26k&~Y3U%l35h4l3-t9YuR!Bm^>*!2>r|qDhq&vOdfq2X@cAtk6
zm$MxKGLdC{vZ`Sa?ZHgzKJ~Jh{y25>l0Y^%<8W2xBt2Rg^7_WTA9&F+P5TVAWG<Xg
z4vR5+H}D!Ls|2{561W3A(=!(GD$=*=&j<Uke1CcBqL0tha(nSq&!Zxw2A(;=_QsHQ
z+nF2mt7#h>2y>er;+<ytjFrEcs1|M7-()W=D!7kcG9pT=2+#-Twm?J#dKlyLd<`*M
z*XCHBeRiPXrqvvmzt86R?WW`>RdM%yp?x<u+Abv=-*)iKGcwqgu?$vOE@c7Ht=4Z>
bToxn$WjPBerL%y9xsdlYfqrv*jBRVFpxcgm

diff --git a/.configure-files/wpcom_internal_app_credentials.enc b/.configure-files/wpcom_internal_app_credentials.enc
index 81f13d266a3a77b56c1088c7f6985b5bef966893..f476fbf1388bfe6b549653f0f7ed9e3d3cd0f2ee 100644
GIT binary patch
delta 748
zcmV<I0u%l42EYc8V1LhZA@ug=o!I$Hb1s37htc!9+Me%=WPEVe{kszry!;c`*H;M9
z5+&CTjdpOuU*P1|>TU=0Ylx1BZ5qRj`9%!X;8^86c~9)ybXz5p$Y=Chqt0rSy+pk`
z*2316c*UMiQ3AhWNmc&_QA<{ent+Dys%p6l@dVRLbXko${D1F|nvXvXgNIPLQ}AEr
zftu9Nw5S(G-TnUH`kCC|AM~TYqLLk0(DB0stPX7saOYfWvUV}j#Szb&;rJ|gg8jFO
zT+xl9P45}i+O8bzWhc>A|JuB5z$PYwfAoNpY90DDkE2{Q&hm7y4pkxP>o6OgV+GAI
zHy&2YD-Z2Z`+s!(Q(;505(Bquca_bn2IA%z&7S<flP#&%;qm-fbu@eS11B7x2}y-e
zsGjh<r831sT}znw;I(;d+;tvlzjPY-V#y6pXh@cwA;Q0Z0|%a4izUKOKLm|rOG!}~
z&rQn_B*r`%T)0EIqN{WLNjn)BLMaQ9_|HeFW|^0eB7fg2w^8bd3Fja<;H_r0%`E0m
zG5t<Sv8Yu|G1GNsF_uQ>2sM0EjuqMyzuv9qm^7oOz2+LK_AT*ro~9+sqW`894?M)Z
z$Ui4;fz02j+LZ#BqknD**vRT%xttgozzV3~Oh1P_hAwl7^+s)+?qLQ*v05!f3PPrK
z)-i{uRDa8v2i9fK>K%9hQGD~d7$e72cUlQ%`YDfQgJlFlPRuCVj4(E+P=zy_4??x?
ze10}YPy&j!(&-)a?Vo7QjvMEmolcG?Fu|ssq8AWwHVnf@6hD?Y#7SJ{1vuB~;Y|Y5
zWNq4aVRb|9W8~N>+?pMJofSh%x&FI~^V!IO8fCO>{8-(63t~9egR4FMCztA|c2i6_
zUpZv`LTavE)hsx^C^t+PLry{+97r=xPprxg!Bn&tOR06;HSoRChIZizTqf`r7J};5
eOT}djq>)H@A(@$Ps_fL<NJ&w)p#<r#v&Kpal6n*X

delta 797
zcmV+&1LFL^2Ji-uV1ML}`-127s7G&A#;rHrEd}<(q_uwBKy0$v2%|Jueyz~$Z6Cu8
zLcdL#b~qISv<>^N9uvt0D09nZ^U91*8DGUzC^&Yn!u!t$(E}>ugMk&4!xpd9;CGV8
zk`FWTt?E>B@ZmWD?IG)u#-iXPeL8*F>c<NG0{!jd%PSmi>3^4bAYj?9G*=JvMc`an
zE_2j1;2v~qu;>x^y$&5wzKlGVq~`{D%`!Y{Lya8g?z!XNfGqQHJU!ijI$373-z%en
zv#NAjTw?OBlkb5iuyA6L(P)0w-xK4QHg%9ht~WT*=3~Dl<0r~gW4tZRdF_Wtlm9BK
z0@JwoMoiVxCw~idz8W*0CAZ!{O_H!~v9^|bW0$;;+<6qoa-KT^vkJ32^=gdE`8(tq
z8SI+s0lFO>c{7<&$WG3OY@&chf7(lBJK^-xGdizoVU*`~qwE%@`aMu^udjl&f^KOk
zB}5BSIU;`H?z&h<Q(lk40QwHF!podu&(37plEPKsReuTXefNMA|6}e&eqt^kBaa|8
zYTAE}_Q2Ov<WfWQl*t`WNd_m$PzR4!rLcLG7lbP`tY*$@UZIF~XLU6qTWW&Qke!gz
ztuiA`-2&`Li$we$8jL{W!7dt^!E&4`Q1=9BVhS$v@v-HUc^Z!&joo|+`tWe7gg6g8
z`itMEp?~AtZ!0UW{d$OC!5Qx~?2!tuY-S}*a5ElVDEib|Khbb6A4V!BxJgo5L^FG8
z+4`R^r}tlYxq^Qbn|NO_Jp&}J_QYg8rMp_C?x3w!g{Elu%#Lclq%FS;P-!onqxKiq
z=ahPPIkd?2iIsEKFqwm+R<!8!K5O%-m~NqQ`G3c%X~E!ppjy3xc636MojlQAb^W*g
zEMcgXrzF;m*SHprs%r<7@#3S%$R}bHVKb$CQVq1-&Hbepyh(-(E_QF{4K0#Ptb^JU
zU`bNA)+drQ@vvcT;jk#+(lH0?W%xvuTw*(I#<}?Kjvx}7hTKy?yW2Rg{rjclBxcCn
b<rWR4S^JG8fFw%%0b8jw5rr*CO<oa(jRBRq

diff --git a/WordPress/Credentials/ApiCredentials.h b/WordPress/Credentials/ApiCredentials.h
index f7e40e7da52d..31af3d01bb74 100644
--- a/WordPress/Credentials/ApiCredentials.h
+++ b/WordPress/Credentials/ApiCredentials.h
@@ -5,7 +5,6 @@
 + (NSString *)secret;
 + (NSString *)sentryDSN;
 + (NSString *)appCenterAppId;
-+ (NSString *)giphyAppId;
 + (NSString *)googleLoginClientId;
 + (NSString *)googleLoginSchemeId;
 + (NSString *)googleLoginServerClientId;
diff --git a/WordPress/Credentials/gencredentials.rb b/WordPress/Credentials/gencredentials.rb
index 77130f34bcd3..6b55f3e50cad 100755
--- a/WordPress/Credentials/gencredentials.rb
+++ b/WordPress/Credentials/gencredentials.rb
@@ -69,14 +69,6 @@ def print_appcenter(appcenter)
 EOF
 end
 
-def print_giphy(giphy)
-print <<-EOF
-+ (NSString *)giphyAppId {
-    return @"#{giphy}";
-}
-EOF
-end
-
 def print_google_login_server(google_login_server)
 print <<-EOF
 + (NSString *)googleLoginServerClientId {
@@ -141,7 +133,7 @@ def print_tenor(tenor_key)
 EOF
 end
 
-def print_class(client, secret, sentry, appcenter, giphy, google_client, google_scheme, google_login_server, debugging_key, zendesk_app_id, zendesk_url, zendesk_client_id, tenor_key)
+def print_class(client, secret, sentry, appcenter, google_client, google_scheme, google_login_server, debugging_key, zendesk_app_id, zendesk_url, zendesk_client_id, tenor_key)
   print <<-EOF
 #import "ApiCredentials.h"
 @implementation ApiCredentials
@@ -150,7 +142,6 @@ def print_class(client, secret, sentry, appcenter, giphy, google_client, google_
   print_secret(secret)
   print_sentry(sentry)
   print_appcenter(appcenter)
-  print_giphy(giphy)
   print_google_login_client(google_client)
   print_google_login_scheme(google_scheme)
   print_google_login_server(google_login_server)
@@ -178,7 +169,6 @@ def print_class(client, secret, sentry, appcenter, giphy, google_client, google_
 secret = nil
 sentry = nil
 appcenter = nil
-giphy = nil
 google_client = nil
 google_scheme = nil
 google_login_server = nil
@@ -200,8 +190,6 @@ def print_class(client, secret, sentry, appcenter, giphy, google_client, google_
       sentry = value
     elsif k == "APPCENTER_APP_ID"
       appcenter = value
-    elsif k == "GIPHY_APP_ID"
-      giphy = value
     elsif k == "GOOGLE_LOGIN_CLIENT_ID"
       google_client = value
     elsif k == "GOOGLE_LOGIN_SCHEME_ID"
@@ -258,4 +246,4 @@ def print_class(client, secret, sentry, appcenter, giphy, google_client, google_
   end
 end
 
-print_class(client, secret, sentry, appcenter, giphy, google_client, google_scheme, google_login_server, debugging_key, zendesk_app_id, zendesk_url, zendesk_client_id, tenor_key)
+print_class(client, secret, sentry, appcenter, google_client, google_scheme, google_login_server, debugging_key, zendesk_app_id, zendesk_url, zendesk_client_id, tenor_key)

From fc040d50d1f7f308f01748c6618d2e768d91ea32 Mon Sep 17 00:00:00 2001
From: Stephenie Harris <scoutharris@gmail.com>
Date: Thu, 11 Jun 2020 15:07:38 -0600
Subject: [PATCH 3/5] Updating pod versions.

---
 Podfile      | 12 ++++++------
 Podfile.lock | 47 +++++++++++++++++++++++++++++++----------------
 2 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/Podfile b/Podfile
index 0e7a7f73a5bf..68ae4546ef74 100644
--- a/Podfile
+++ b/Podfile
@@ -11,13 +11,13 @@ workspace 'WordPress.xcworkspace'
 ##
 def wordpress_shared
     ## for production:
-    pod 'WordPressShared', '~> 1.8.16'
+    # pod 'WordPressShared', '~> 1.9.0-beta.1'
 
     ## for development:
     # pod 'WordPressShared', :path => '../WordPress-iOS-Shared'
 
     ## while PR is in review:
-    # pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :branch => ''
+    pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :branch => 'issue/remove_giphy_tracks'
     # pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :commit  => 'efe5a065f3ace331353595ef85eef502baa23497'
 end
 
@@ -43,9 +43,9 @@ def wordpress_ui
 end
 
 def wordpress_kit
-    pod 'WordPressKit', '~> 4.9.0'
+    #pod 'WordPressKit', '~> 5.0.0-beta.1'
     #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :tag => ''
-    #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => 'feature/homepage-settings'
+    pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => 'issue/update_shared_pod'
     #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => ''
     #pod 'WordPressKit', :path => '../WordPressKit-iOS'
 end
@@ -184,9 +184,9 @@ target 'WordPress' do
 
     pod 'Gridicons', '~> 1.0.1'
 
-    pod 'WordPressAuthenticator', '~> 1.18.0-beta.8'
+    # pod 'WordPressAuthenticator', '~> 1.18.0-beta.9'
     # While in PR
-    # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
+    pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => 'issue/update_shared_pod'
     # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => ''
     # pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS'
 
diff --git a/Podfile.lock b/Podfile.lock
index bb7eb0ac3d49..ab77418301a1 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -380,7 +380,7 @@ PODS:
   - WordPress-Aztec-iOS (1.19.2)
   - WordPress-Editor-iOS (1.19.2):
     - WordPress-Aztec-iOS (= 1.19.2)
-  - WordPressAuthenticator (1.18.0-beta.8):
+  - WordPressAuthenticator (1.18.0-beta.9):
     - 1PasswordExtension (= 1.8.6)
     - Alamofire (= 4.8)
     - CocoaLumberjack (~> 3.5)
@@ -389,18 +389,18 @@ PODS:
     - lottie-ios (= 3.1.6)
     - "NSURL+IDN (= 0.4)"
     - SVProgressHUD (= 2.2.5)
-    - WordPressKit (~> 4.9.0)
-    - WordPressShared (~> 1.8.16)
+    - WordPressKit (~> 5.0.0-beta.1)
+    - WordPressShared (~> 1.9.0-beta.1)
     - WordPressUI (~> 1.7.0)
-  - WordPressKit (4.9.0):
+  - WordPressKit (5.0.0-beta.1):
     - Alamofire (~> 4.8.0)
     - CocoaLumberjack (~> 3.4)
     - NSObject-SafeExpectations (= 0.0.4)
     - UIDeviceIdentifier (~> 1)
-    - WordPressShared (~> 1.8.16)
+    - WordPressShared (~> 1.9.0-beta.1)
     - wpxmlrpc (= 0.8.5)
   - WordPressMocks (0.0.8)
-  - WordPressShared (1.8.16):
+  - WordPressShared (1.9.0-beta.1):
     - CocoaLumberjack (~> 3.4)
     - FormatterKit/TimeIntervalFormatter (= 1.8.2)
   - WordPressUI (1.7.0)
@@ -483,10 +483,10 @@ DEPENDENCIES:
   - Starscream (= 3.0.6)
   - SVProgressHUD (= 2.2.5)
   - WordPress-Editor-iOS (~> 1.19.2)
-  - WordPressAuthenticator (~> 1.18.0-beta.8)
-  - WordPressKit (~> 4.9.0)
+  - WordPressAuthenticator (from `https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git`, branch `issue/update_shared_pod`)
+  - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, branch `issue/update_shared_pod`)
   - WordPressMocks (~> 0.0.8)
-  - WordPressShared (~> 1.8.16)
+  - WordPressShared (from `https://github.com/wordpress-mobile/WordPress-iOS-Shared.git`, branch `issue/remove_giphy_tracks`)
   - WordPressUI (~> 1.7.0)
   - WPMediaPicker (~> 1.7.0)
   - Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/3d10d026ea0175ba6ffc94345546704056662365/react-native-gutenberg-bridge/third-party-podspecs/Yoga.podspec.json`)
@@ -532,10 +532,7 @@ SPEC REPOS:
     - UIDeviceIdentifier
     - WordPress-Aztec-iOS
     - WordPress-Editor-iOS
-    - WordPressAuthenticator
-    - WordPressKit
     - WordPressMocks
-    - WordPressShared
     - WordPressUI
     - WPMediaPicker
     - wpxmlrpc
@@ -618,6 +615,15 @@ EXTERNAL SOURCES:
   RNTAztecView:
     :commit: 3d10d026ea0175ba6ffc94345546704056662365
     :git: http://github.com/wordpress-mobile/gutenberg-mobile/
+  WordPressAuthenticator:
+    :branch: issue/update_shared_pod
+    :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git
+  WordPressKit:
+    :branch: issue/update_shared_pod
+    :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git
+  WordPressShared:
+    :branch: issue/remove_giphy_tracks
+    :git: https://github.com/wordpress-mobile/WordPress-iOS-Shared.git
   Yoga:
     :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/3d10d026ea0175ba6ffc94345546704056662365/react-native-gutenberg-bridge/third-party-podspecs/Yoga.podspec.json
 
@@ -631,6 +637,15 @@ CHECKOUT OPTIONS:
   RNTAztecView:
     :commit: 3d10d026ea0175ba6ffc94345546704056662365
     :git: http://github.com/wordpress-mobile/gutenberg-mobile/
+  WordPressAuthenticator:
+    :commit: e50154d9d1e84e7168777925c118400d17dd9040
+    :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git
+  WordPressKit:
+    :commit: 6ac31e3d3533baaec9ff1dbf5a240ca76c1dfd23
+    :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git
+  WordPressShared:
+    :commit: d67ca763c83e561f7058db626c0d99779c1f18fc
+    :git: https://github.com/wordpress-mobile/WordPress-iOS-Shared.git
 
 SPEC CHECKSUMS:
   1PasswordExtension: f97cc80ae58053c331b2b6dc8843ba7103b33794
@@ -703,10 +718,10 @@ SPEC CHECKSUMS:
   UIDeviceIdentifier: 44f805037d21b94394821828f4fcaba34b38c2d0
   WordPress-Aztec-iOS: d01bf0c5e150ae6a046f06ba63b7cc2762061c0b
   WordPress-Editor-iOS: 5b726489e5ae07b7281a2862d69aba2d5c83f140
-  WordPressAuthenticator: aa122f955529beecdb49bf7932ed9431c2ea5c97
-  WordPressKit: 2e707edd1b28e8dd0f74a40469ca6e7be7b20a70
+  WordPressAuthenticator: 8567813769caf5e570d3370c907422a17c174c2b
+  WordPressKit: 48ef1d76727cde146db44097cfb89852b171aa72
   WordPressMocks: b4064b99a073117bbc304abe82df78f2fbe60992
-  WordPressShared: 1bc316ed162f42af4e0fa2869437e9e28b532b01
+  WordPressShared: bc1a056b5d4da040e3addf4f510c0de67651ab1b
   WordPressUI: 1cf47a3b78154faf69caa18569ee7ece1e510fa0
   WPMediaPicker: 754bc043ea42abc2eae8a07e5680c777c112666a
   wpxmlrpc: 6a9bdd6ab9d1b159b384b0df0f3f39de9af4fecf
@@ -720,6 +735,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: a87ab1e4badace92c75eb11dc77ede1e995b2adc
   ZIPFoundation: 249fa8890597086cd536bb2df5c9804d84e122b0
 
-PODFILE CHECKSUM: 4971991bc25c9b578af1ba513466e8e5ec25408c
+PODFILE CHECKSUM: 8f76ed4065d534296035210422deb491b228bc72
 
 COCOAPODS: 1.8.4

From b7b5efdece6232abbfd1c503483358c097dd6829 Mon Sep 17 00:00:00 2001
From: Stephenie Harris <scoutharris@gmail.com>
Date: Thu, 11 Jun 2020 17:04:23 -0600
Subject: [PATCH 4/5] Updating pod versions.

---
 Podfile      | 12 +++++-----
 Podfile.lock | 65 ++++++++++++++++------------------------------------
 2 files changed, 26 insertions(+), 51 deletions(-)

diff --git a/Podfile b/Podfile
index 6a7a767e5122..2315b4a58220 100644
--- a/Podfile
+++ b/Podfile
@@ -11,13 +11,13 @@ workspace 'WordPress.xcworkspace'
 ##
 def wordpress_shared
     ## for production:
-    # pod 'WordPressShared', '~> 1.9.0-beta.1'
+    pod 'WordPressShared', '~> 1.9.0-beta.1'
 
     ## for development:
     # pod 'WordPressShared', :path => '../WordPress-iOS-Shared'
 
     ## while PR is in review:
-    pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :branch => 'issue/remove_giphy_tracks'
+    # pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :branch => ''
     # pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :commit  => 'efe5a065f3ace331353595ef85eef502baa23497'
 end
 
@@ -43,9 +43,9 @@ def wordpress_ui
 end
 
 def wordpress_kit
-    #pod 'WordPressKit', '~> 5.0.0-beta.1'
+    pod 'WordPressKit', '~> 5.0.0-beta.1'
     #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :tag => ''
-    pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => 'issue/update_shared_pod'
+    #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => ''
     #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => ''
     #pod 'WordPressKit', :path => '../WordPressKit-iOS'
 end
@@ -184,9 +184,9 @@ target 'WordPress' do
 
     pod 'Gridicons', '~> 1.0.1'
 
-    # pod 'WordPressAuthenticator', '~> 1.18.0-beta.9'
+    pod 'WordPressAuthenticator', '~> 1.18.0-beta.9'
     # While in PR
-    pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => 'issue/update_shared_pod'
+    # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
     # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => ''
     # pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS'
 
diff --git a/Podfile.lock b/Podfile.lock
index 525c36aa3d83..a3019694ab10 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -375,7 +375,7 @@ PODS:
   - Sodium (0.8.0)
   - Starscream (3.0.6)
   - SVProgressHUD (2.2.5)
-  - TOCropViewController (2.5.2)
+  - TOCropViewController (2.5.3)
   - UIDeviceIdentifier (1.4.0)
   - WordPress-Aztec-iOS (1.19.2)
   - WordPress-Editor-iOS (1.19.2):
@@ -403,25 +403,25 @@ PODS:
   - WordPressShared (1.9.0-beta.1):
     - CocoaLumberjack (~> 3.4)
     - FormatterKit/TimeIntervalFormatter (= 1.8.2)
-  - WordPressUI (1.7.0)
+  - WordPressUI (1.7.1)
   - WPMediaPicker (1.7.0)
   - wpxmlrpc (0.8.5)
   - Yoga (1.14.0)
   - ZendeskCommonUISDK (4.0.0):
     - ZendeskSDKConfigurationsSDK (~> 1.1.2)
-  - ZendeskCoreSDK (2.2.2)
+  - ZendeskCoreSDK (2.4.0)
   - ZendeskMessagingAPISDK (3.0.0):
     - ZendeskSDKConfigurationsSDK (~> 1.1.2)
   - ZendeskMessagingSDK (3.0.0):
     - ZendeskCommonUISDK (~> 4.0.0)
     - ZendeskMessagingAPISDK (~> 3.0.0)
-  - ZendeskSDKConfigurationsSDK (1.1.3)
-  - ZendeskSupportProvidersSDK (5.0.1):
-    - ZendeskCoreSDK (~> 2.2.1)
+  - ZendeskSDKConfigurationsSDK (1.1.5)
+  - ZendeskSupportProvidersSDK (5.0.5):
+    - ZendeskCoreSDK (~> 2.4.0)
   - ZendeskSupportSDK (5.0.0):
     - ZendeskMessagingSDK (~> 3.0.0)
     - ZendeskSupportProvidersSDK (~> 5.0.0)
-  - ZIPFoundation (0.9.10)
+  - ZIPFoundation (0.9.11)
 
 DEPENDENCIES:
   - Alamofire (= 4.8.0)
@@ -483,10 +483,10 @@ DEPENDENCIES:
   - Starscream (= 3.0.6)
   - SVProgressHUD (= 2.2.5)
   - WordPress-Editor-iOS (~> 1.19.2)
-  - WordPressAuthenticator (from `https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git`, branch `issue/update_shared_pod`)
-  - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, branch `issue/update_shared_pod`)
+  - WordPressAuthenticator (~> 1.18.0-beta.9)
+  - WordPressKit (~> 5.0.0-beta.1)
   - WordPressMocks (~> 0.0.8)
-  - WordPressShared (from `https://github.com/wordpress-mobile/WordPress-iOS-Shared.git`, branch `issue/remove_giphy_tracks`)
+  - WordPressShared (~> 1.9.0-beta.1)
   - WordPressUI (~> 1.7.0)
   - WPMediaPicker (~> 1.7.0)
   - Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.30.0/react-native-gutenberg-bridge/third-party-podspecs/Yoga.podspec.json`)
@@ -532,7 +532,10 @@ SPEC REPOS:
     - UIDeviceIdentifier
     - WordPress-Aztec-iOS
     - WordPress-Editor-iOS
+    - WordPressAuthenticator
+    - WordPressKit
     - WordPressMocks
+    - WordPressShared
     - WordPressUI
     - WPMediaPicker
     - wpxmlrpc
@@ -614,19 +617,7 @@ EXTERNAL SOURCES:
     :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.30.0/react-native-gutenberg-bridge/third-party-podspecs/RNSVG.podspec.json
   RNTAztecView:
     :git: http://github.com/wordpress-mobile/gutenberg-mobile/
-<<<<<<< HEAD
-  WordPressAuthenticator:
-    :branch: issue/update_shared_pod
-    :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git
-  WordPressKit:
-    :branch: issue/update_shared_pod
-    :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git
-  WordPressShared:
-    :branch: issue/remove_giphy_tracks
-    :git: https://github.com/wordpress-mobile/WordPress-iOS-Shared.git
-=======
     :tag: v1.30.0
->>>>>>> develop
   Yoga:
     :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.30.0/react-native-gutenberg-bridge/third-party-podspecs/Yoga.podspec.json
 
@@ -639,19 +630,7 @@ CHECKOUT OPTIONS:
     :tag: v1.30.0
   RNTAztecView:
     :git: http://github.com/wordpress-mobile/gutenberg-mobile/
-<<<<<<< HEAD
-  WordPressAuthenticator:
-    :commit: e50154d9d1e84e7168777925c118400d17dd9040
-    :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git
-  WordPressKit:
-    :commit: 6ac31e3d3533baaec9ff1dbf5a240ca76c1dfd23
-    :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git
-  WordPressShared:
-    :commit: d67ca763c83e561f7058db626c0d99779c1f18fc
-    :git: https://github.com/wordpress-mobile/WordPress-iOS-Shared.git
-=======
     :tag: v1.30.0
->>>>>>> develop
 
 SPEC CHECKSUMS:
   1PasswordExtension: f97cc80ae58053c331b2b6dc8843ba7103b33794
@@ -720,7 +699,7 @@ SPEC CHECKSUMS:
   Sodium: 63c0ca312a932e6da481689537d4b35568841bdc
   Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
-  TOCropViewController: e9da34f484aedd4e5d5a8ab230ba217cfe16c729
+  TOCropViewController: 20a14b6a7a098308bf369e7c8d700dc983a974e6
   UIDeviceIdentifier: 44f805037d21b94394821828f4fcaba34b38c2d0
   WordPress-Aztec-iOS: d01bf0c5e150ae6a046f06ba63b7cc2762061c0b
   WordPress-Editor-iOS: 5b726489e5ae07b7281a2862d69aba2d5c83f140
@@ -728,23 +707,19 @@ SPEC CHECKSUMS:
   WordPressKit: 48ef1d76727cde146db44097cfb89852b171aa72
   WordPressMocks: b4064b99a073117bbc304abe82df78f2fbe60992
   WordPressShared: bc1a056b5d4da040e3addf4f510c0de67651ab1b
-  WordPressUI: 1cf47a3b78154faf69caa18569ee7ece1e510fa0
+  WordPressUI: 9da5d966b8beb091950cd96880db398d7f30e246
   WPMediaPicker: 754bc043ea42abc2eae8a07e5680c777c112666a
   wpxmlrpc: 6a9bdd6ab9d1b159b384b0df0f3f39de9af4fecf
   Yoga: c920bf12bf8146aa5cd118063378c2cf5682d16c
   ZendeskCommonUISDK: 3c432801e31abff97d6e30441ea102eaef6b99e2
-  ZendeskCoreSDK: 86513e62c1ab68913416c9044463d9b687ca944f
+  ZendeskCoreSDK: 804aff5229ae9500b8057b65fe53ad869856f427
   ZendeskMessagingAPISDK: 7c0cbd1d2c941f05b36f73e7db5faee5863fe8b0
   ZendeskMessagingSDK: 6f168161d834dd66668344f645f7a6b6b121b58a
-  ZendeskSDKConfigurationsSDK: 918241bc7ec30e0af9e1b16333d54a584ee8ab9e
-  ZendeskSupportProvidersSDK: e183d32abac888c448469e2005c4a5a8c3ed73f0
+  ZendeskSDKConfigurationsSDK: 0c610c22c9e3cafcd31591344b8cc3b4398e49b2
+  ZendeskSupportProvidersSDK: d21ce8eb3df1066338c7d3875bb818b32c3f124e
   ZendeskSupportSDK: a87ab1e4badace92c75eb11dc77ede1e995b2adc
-  ZIPFoundation: 249fa8890597086cd536bb2df5c9804d84e122b0
+  ZIPFoundation: b1f0de4eed33e74a676f76e12559ab6b75990197
 
-<<<<<<< HEAD
-PODFILE CHECKSUM: 8f76ed4065d534296035210422deb491b228bc72
-=======
-PODFILE CHECKSUM: 408866eedca9df799cf2bd29fe537a9e3c5bbd8a
->>>>>>> develop
+PODFILE CHECKSUM: f0b1fb4b6308ca3d34ea36afd78ce9e587f5e747
 
 COCOAPODS: 1.8.4

From 8bbd606f3d5166fb9e0be2d1e2d5236d8cdd6dd0 Mon Sep 17 00:00:00 2001
From: Stephenie Harris <scoutharris@gmail.com>
Date: Thu, 11 Jun 2020 17:51:47 -0600
Subject: [PATCH 5/5] Updating lock file.

---
 Podfile.lock | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Podfile.lock b/Podfile.lock
index a3019694ab10..172af2e8b427 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -375,7 +375,7 @@ PODS:
   - Sodium (0.8.0)
   - Starscream (3.0.6)
   - SVProgressHUD (2.2.5)
-  - TOCropViewController (2.5.3)
+  - TOCropViewController (2.5.2)
   - UIDeviceIdentifier (1.4.0)
   - WordPress-Aztec-iOS (1.19.2)
   - WordPress-Editor-iOS (1.19.2):
@@ -403,25 +403,25 @@ PODS:
   - WordPressShared (1.9.0-beta.1):
     - CocoaLumberjack (~> 3.4)
     - FormatterKit/TimeIntervalFormatter (= 1.8.2)
-  - WordPressUI (1.7.1)
+  - WordPressUI (1.7.0)
   - WPMediaPicker (1.7.0)
   - wpxmlrpc (0.8.5)
   - Yoga (1.14.0)
   - ZendeskCommonUISDK (4.0.0):
     - ZendeskSDKConfigurationsSDK (~> 1.1.2)
-  - ZendeskCoreSDK (2.4.0)
+  - ZendeskCoreSDK (2.2.2)
   - ZendeskMessagingAPISDK (3.0.0):
     - ZendeskSDKConfigurationsSDK (~> 1.1.2)
   - ZendeskMessagingSDK (3.0.0):
     - ZendeskCommonUISDK (~> 4.0.0)
     - ZendeskMessagingAPISDK (~> 3.0.0)
-  - ZendeskSDKConfigurationsSDK (1.1.5)
-  - ZendeskSupportProvidersSDK (5.0.5):
-    - ZendeskCoreSDK (~> 2.4.0)
+  - ZendeskSDKConfigurationsSDK (1.1.3)
+  - ZendeskSupportProvidersSDK (5.0.1):
+    - ZendeskCoreSDK (~> 2.2.1)
   - ZendeskSupportSDK (5.0.0):
     - ZendeskMessagingSDK (~> 3.0.0)
     - ZendeskSupportProvidersSDK (~> 5.0.0)
-  - ZIPFoundation (0.9.11)
+  - ZIPFoundation (0.9.10)
 
 DEPENDENCIES:
   - Alamofire (= 4.8.0)
@@ -699,7 +699,7 @@ SPEC CHECKSUMS:
   Sodium: 63c0ca312a932e6da481689537d4b35568841bdc
   Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
-  TOCropViewController: 20a14b6a7a098308bf369e7c8d700dc983a974e6
+  TOCropViewController: e9da34f484aedd4e5d5a8ab230ba217cfe16c729
   UIDeviceIdentifier: 44f805037d21b94394821828f4fcaba34b38c2d0
   WordPress-Aztec-iOS: d01bf0c5e150ae6a046f06ba63b7cc2762061c0b
   WordPress-Editor-iOS: 5b726489e5ae07b7281a2862d69aba2d5c83f140
@@ -707,18 +707,18 @@ SPEC CHECKSUMS:
   WordPressKit: 48ef1d76727cde146db44097cfb89852b171aa72
   WordPressMocks: b4064b99a073117bbc304abe82df78f2fbe60992
   WordPressShared: bc1a056b5d4da040e3addf4f510c0de67651ab1b
-  WordPressUI: 9da5d966b8beb091950cd96880db398d7f30e246
+  WordPressUI: 1cf47a3b78154faf69caa18569ee7ece1e510fa0
   WPMediaPicker: 754bc043ea42abc2eae8a07e5680c777c112666a
   wpxmlrpc: 6a9bdd6ab9d1b159b384b0df0f3f39de9af4fecf
   Yoga: c920bf12bf8146aa5cd118063378c2cf5682d16c
   ZendeskCommonUISDK: 3c432801e31abff97d6e30441ea102eaef6b99e2
-  ZendeskCoreSDK: 804aff5229ae9500b8057b65fe53ad869856f427
+  ZendeskCoreSDK: 86513e62c1ab68913416c9044463d9b687ca944f
   ZendeskMessagingAPISDK: 7c0cbd1d2c941f05b36f73e7db5faee5863fe8b0
   ZendeskMessagingSDK: 6f168161d834dd66668344f645f7a6b6b121b58a
-  ZendeskSDKConfigurationsSDK: 0c610c22c9e3cafcd31591344b8cc3b4398e49b2
-  ZendeskSupportProvidersSDK: d21ce8eb3df1066338c7d3875bb818b32c3f124e
+  ZendeskSDKConfigurationsSDK: 918241bc7ec30e0af9e1b16333d54a584ee8ab9e
+  ZendeskSupportProvidersSDK: e183d32abac888c448469e2005c4a5a8c3ed73f0
   ZendeskSupportSDK: a87ab1e4badace92c75eb11dc77ede1e995b2adc
-  ZIPFoundation: b1f0de4eed33e74a676f76e12559ab6b75990197
+  ZIPFoundation: 249fa8890597086cd536bb2df5c9804d84e122b0
 
 PODFILE CHECKSUM: f0b1fb4b6308ca3d34ea36afd78ce9e587f5e747