merge

1 year ago · 1131480a26
27 changed files with 370 additions and 17 deletions
--- a/Interface/View/BeneficiaryDetailHeaderView.swift
+++ b/Interface/View/BeneficiaryDetailHeaderView.swift
@ -29,10 +29,13 @@ class BeneficiaryDetailHeaderView: UITableViewHeaderFooterView {
    */
    
    func commonSetup() {
+        
        let imagePath = GMEDB.shared.user.string(.profileImage)
        let url = URL(string: imagePath ?? "")
        profileImage.sd_setImage(with: url, placeholderImage: UIImage(named: "profile-1"))
+        profileImage.rounded()
        updateButton.set(cornerRadius: 10)
+        
        updateButton.set(borderWidth: 2, of: .init(hex: "#2E89FF"))
        updateButton.setTitleColor(.init(hex: "#2E89FF"), for: .normal)
    }
--- a/Interface/View/BeneficiaryDetailHeaderView.xib
+++ b/Interface/View/BeneficiaryDetailHeaderView.xib
@ -30,7 +30,7 @@
                                <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="dRH-kU-ofV">
                                    <rect key="frame" x="0.0" y="0.0" width="96" height="147"/>
                                    <subviews>
-                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_image" translatesAutoresizingMaskIntoConstraints="NO" id="LrN-sh-VUv">
+                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_image" translatesAutoresizingMaskIntoConstraints="NO" id="LrN-sh-VUv">
                                            <rect key="frame" x="0.0" y="0.0" width="96" height="96"/>
                                            <constraints>
                                                <constraint firstAttribute="width" constant="96" id="Eoq-tq-ChW"/>
@ -58,13 +58,13 @@
                                            <rect key="frame" x="0.0" y="0.0" width="455" height="28"/>
                                            <subviews>
                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="h3i-Ff-cvM">
-                                                    <rect key="frame" x="0.0" y="1.9999999999999982" width="24" height="20.666666666666664"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="24" height="24"/>
                                                    <color key="tintColor" systemColor="systemBlueColor"/>
                                                    <constraints>
                                                        <constraint firstAttribute="width" constant="24" id="4GE-0k-q3Q"/>
                                                        <constraint firstAttribute="height" constant="24" id="8xJ-lv-h86"/>
                                                    </constraints>
-                                                    <imageReference key="image" image="person.fill" catalog="system" symbolScale="medium"/>
+                                                    <imageReference key="image" image="icons8-male-user-94" symbolScale="medium"/>
                                                </imageView>
                                                <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="lVO-cb-12f">
                                                    <rect key="frame" x="32" y="0.0" width="423" height="28"/>
@ -88,8 +88,8 @@
                                        <stackView opaque="NO" contentMode="scaleToFill" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="nLI-6r-icB">
                                            <rect key="frame" x="0.0" y="36" width="455" height="28"/>
                                            <subviews>
-                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="phone.fill" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="dgU-AV-hy1">
-                                                    <rect key="frame" x="0.0" y="1.6666666666666661" width="24" height="21.333333333333336"/>
+                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icons8-smartphone-94" translatesAutoresizingMaskIntoConstraints="NO" id="dgU-AV-hy1">
+                                                    <rect key="frame" x="0.0" y="0.0" width="24" height="24"/>
                                                    <color key="tintColor" systemColor="systemBlueColor"/>
                                                    <constraints>
                                                        <constraint firstAttribute="width" constant="24" id="8px-TN-DFx"/>
@ -118,8 +118,8 @@
                                        <stackView opaque="NO" contentMode="scaleToFill" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="WAL-nn-fmB">
                                            <rect key="frame" x="0.0" y="72" width="455" height="28"/>
                                            <subviews>
-                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="person.2.fill" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="0e3-j0-Rkg">
-                                                    <rect key="frame" x="0.0" y="1.9999999999999982" width="24" height="20.666666666666664"/>
+                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icons8-people-94" translatesAutoresizingMaskIntoConstraints="NO" id="0e3-j0-Rkg">
+                                                    <rect key="frame" x="0.0" y="0.0" width="24" height="24"/>
                                                    <color key="tintColor" systemColor="systemBlueColor"/>
                                                    <constraints>
                                                        <constraint firstAttribute="height" constant="24" id="4rG-wR-cHd"/>
@ -148,8 +148,8 @@
                                        <stackView opaque="NO" contentMode="scaleToFill" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="NUo-GK-jR6">
                                            <rect key="frame" x="0.0" y="108" width="455" height="28"/>
                                            <subviews>
-                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="location.circle.fill" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="sMg-xb-OHS">
-                                                    <rect key="frame" x="0.0" y="0.99999999999999822" width="24" height="22.666666666666664"/>
+                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icons8-location-94" translatesAutoresizingMaskIntoConstraints="NO" id="sMg-xb-OHS">
+                                                    <rect key="frame" x="0.0" y="0.0" width="24" height="24"/>
                                                    <color key="tintColor" systemColor="systemBlueColor"/>
                                                    <constraints>
                                                        <constraint firstAttribute="width" constant="24" id="Ggd-4P-fj4"/>
@ -214,10 +214,10 @@
        </view>
    </objects>
    <resources>
-        <image name="location.circle.fill" catalog="system" width="128" height="123"/>
-        <image name="person.2.fill" catalog="system" width="128" height="81"/>
-        <image name="person.fill" catalog="system" width="128" height="120"/>
-        <image name="phone.fill" catalog="system" width="128" height="114"/>
+        <image name="icons8-location-94" width="24" height="24"/>
+        <image name="icons8-male-user-94" width="24" height="24"/>
+        <image name="icons8-people-94" width="24" height="24"/>
+        <image name="icons8-smartphone-94" width="24" height="24"/>
        <image name="user_image" width="96" height="96"/>
        <systemColor name="systemBackgroundColor">
            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
--- a/Interface/View/Home.storyboard
+++ b/Interface/View/Home.storyboard
@ -37,7 +37,7 @@
                                            <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="frG-CG-zlO">
                                                <rect key="frame" x="0.0" y="0.0" width="304" height="32"/>
                                                <subviews>
-                                                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_image" translatesAutoresizingMaskIntoConstraints="NO" id="uWJ-LO-XOz">
+                                                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_image" translatesAutoresizingMaskIntoConstraints="NO" id="uWJ-LO-XOz">
                                                        <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
                                                        <constraints>
                                                            <constraint firstAttribute="height" constant="32" id="ObI-hY-fPi"/>
@ -62,7 +62,7 @@
                                                            <constraint firstAttribute="height" constant="28" id="uek-nj-eHS"/>
                                                        </constraints>
                                                        <state key="normal" title="Button"/>
-                                                        <buttonConfiguration key="configuration" style="plain" image="notification_bell_new"/>
+                                                        <buttonConfiguration key="configuration" style="plain" image="notification"/>
                                                        <connections>
                                                            <action selector="notificationItemClicked:" destination="HSb-ou-7T5" eventType="touchUpInside" id="cGA-hZ-DXO"/>
                                                        </connections>
@ -168,8 +168,15 @@
                                                        </constraints>
                                                        <color key="tintColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                        <inset key="contentEdgeInsets" minX="16" minY="3" maxX="16" maxY="5"/>
+<<<<<<< HEAD
                                                        <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                                        <state key="normal" image="copy_paste"/>
+=======
+                                                        <state key="normal" title="Button"/>
+                                                        <buttonConfiguration key="configuration" style="plain" image="copy">
+                                                            <directionalEdgeInsets key="contentInsets" top="0.0" leading="0.0" bottom="0.0" trailing="0.0"/>
+                                                        </buttonConfiguration>
+>>>>>>> origin/dev-swift-d-4-19
                                                        <connections>
                                                            <action selector="didPressCopyButton:" destination="HSb-ou-7T5" eventType="touchUpInside" id="4dp-Sp-d93"/>
                                                        </connections>
@ -305,9 +312,15 @@
    <resources>
        <image name="Documents" width="201" height="216"/>
        <image name="branch" width="22" height="26"/>
+<<<<<<< HEAD
        <image name="copy_paste" width="16" height="20"/>
        <image name="customer_support_new" width="24" height="24"/>
        <image name="notification_bell_new" width="24" height="24"/>
+=======
+        <image name="copy" width="16" height="20"/>
+        <image name="customer_support_new" width="24" height="24"/>
+        <image name="notification" width="24" height="24"/>
+>>>>>>> origin/dev-swift-d-4-19
        <image name="upload slip" width="16" height="16"/>
        <image name="user_image" width="96" height="96"/>
        <namedColor name="ThemeMainBackground">
--- a/Interface/View/HomeViewController.swift
+++ b/Interface/View/HomeViewController.swift
@ -337,6 +337,7 @@ class HomeViewController: UIViewController {
    
    private func setupHierachy() {
        
+        copyButton.setTitle("", for: .normal)
        notificationItem.setTitle("", for: .normal)
        supportBarButton.setTitle("", for: .normal)
        
@ -475,6 +476,7 @@ class HomeViewController: UIViewController {
        mainContainerView.setupCornerRadius(20,maskedCorners: [.layerMinXMaxYCorner, .layerMaxXMaxYCorner])
            userName.text = "HI" + " " + (GMEDB.shared.user.string(.firstName) ?? "")
        let url = URL(string: GMEDB.shared.user.string(.profileImage) ?? "")
+        profileImage.rounded()
        profileImage.sd_setImage(with: url, placeholderImage: UIImage(named: "profile-1"))
        
        self.homeCarouselView.update(bannerImage)
@ -910,8 +912,8 @@ extension HomeViewController: UITableViewDelegate {
            return UITableView.automaticDimension
        case .collection:
            let totalHeight = view.frame.height
-            let ramainingBalanceCellHeight: CGFloat = 0//100
-            let finalHeight = totalHeight - ramainingBalanceCellHeight
+            let remainingBalanceCellHeight: CGFloat = 0 //100
+            let finalHeight = totalHeight - remainingBalanceCellHeight
            return finalHeight
        }
    }
--- a/Files/Assets.xcassets/updated_feedback/Contents.json
+++ b/Files/Assets.xcassets/updated_feedback/Contents.json
@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/Files/Assets.xcassets/updated_feedback/about
+++ b/Files/Assets.xcassets/updated_feedback/about
@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "about us.svg",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/Files/Assets.xcassets/updated_feedback/about
+++ b/Files/Assets.xcassets/updated_feedback/about
@ -0,0 +1,8 @@
+<svg id="round-info-24px" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <path id="Path_28037" data-name="Path 28037" d="M0,0H24V24H0Z" fill="none"/>
+  <g id="icons8-about">
+    <path id="Path_47022" data-name="Path 47022" d="M12,2A9.984,9.984,0,0,0,3.043,16.427l-1,4.019a1.25,1.25,0,0,0,1.516,1.516l4.019-1A10,10,0,1,0,12,2Z" fill="#2e89ff" opacity="0.35"/>
+    <path id="Path_47023" data-name="Path 47023" d="M11,17V12a1,1,0,0,1,1-1h0a1,1,0,0,1,1,1v5a1,1,0,0,1-1,1h0A1,1,0,0,1,11,17Z" fill="#2e89ff"/>
+    <circle id="Ellipse_1935" data-name="Ellipse 1935" cx="1.5" cy="1.5" r="1.5" transform="translate(10.5 6)" fill="#2e89ff"/>
+  </g>
+</svg>
--- a/Files/Assets.xcassets/updated_feedback/add
+++ b/Files/Assets.xcassets/updated_feedback/add
@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "add new.svg",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/Files/Assets.xcassets/updated_feedback/add
+++ b/Files/Assets.xcassets/updated_feedback/add
@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="22" height="21" viewBox="0 0 22 21">
+  <g id="icons8-add-male-user-group" transform="translate(-2 -3)">
+    <circle id="Ellipse_2035" data-name="Ellipse 2035" cx="5" cy="5" r="5" transform="translate(14 14)" fill="#2e89ff" opacity="0.35"/>
+    <circle id="Ellipse_2036" data-name="Ellipse 2036" cx="3.5" cy="3.5" r="3.5" transform="translate(4 3)" fill="#2e89ff" opacity="0.35"/>
+    <circle id="Ellipse_2037" data-name="Ellipse 2037" cx="3.5" cy="3.5" r="3.5" transform="translate(13 3)" fill="#2e89ff" opacity="0.35"/>
+    <path id="Path_47196" data-name="Path 47196" d="M18,21.5v-5a1,1,0,0,1,1-1h0a1,1,0,0,1,1,1v5a1,1,0,0,1-1,1h0A1,1,0,0,1,18,21.5Z" fill="#2e89ff"/>
+    <path id="Path_47197" data-name="Path 47197" d="M16.5,18h5a1,1,0,0,1,1,1h0a1,1,0,0,1-1,1h-5a1,1,0,0,1-1-1h0A1,1,0,0,1,16.5,18Z" fill="#2e89ff"/>
+    <path id="Path_47198" data-name="Path 47198" d="M14,19a4.988,4.988,0,0,1,4.75-4.975c-.084-.006-.164-.025-.25-.025H5.5a3.5,3.5,0,0,0,0,7h8.922A4.979,4.979,0,0,1,14,19Z" fill="#2e89ff"/>
+  </g>
+</svg>
--- a/Files/Assets.xcassets/updated_feedback/copy.imageset/Contents.json
+++ b/Files/Assets.xcassets/updated_feedback/copy.imageset/Contents.json
@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "copy.svg",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/Files/Assets.xcassets/updated_feedback/copy.imageset/copy.svg
+++ b/Files/Assets.xcassets/updated_feedback/copy.imageset/copy.svg
@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="20" viewBox="0 0 16 20">
+  <g id="icons8-copy" transform="translate(-4 -2)">
+    <path id="Path_47164" data-name="Path 47164" d="M6,17V5A3,3,0,0,1,9,2h5l6,6v9a3,3,0,0,1-3,3H9A3,3,0,0,1,6,17Z" transform="translate(0)" opacity="0.35"/>
+    <path id="Path_47165" data-name="Path 47165" d="M14,6V2l6,6H16A2,2,0,0,1,14,6Z" transform="translate(0)"/>
+    <path id="Path_47166" data-name="Path 47166" d="M9,20a3,3,0,0,1-3-3V5A2,2,0,0,0,4,7V19a3,3,0,0,0,3,3h8a2,2,0,0,0,2-2Z" transform="translate(0 0)"/>
+  </g>
+</svg>
--- a/Files/Assets.xcassets/updated_feedback/icons8-location-94.imageset/Contents.json
+++ b/Files/Assets.xcassets/updated_feedback/icons8-location-94.imageset/Contents.json
@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icons8-location-94.svg",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/Files/Assets.xcassets/updated_feedback/icons8-location-94.imageset/icons8-location-94.svg
+++ b/Files/Assets.xcassets/updated_feedback/icons8-location-94.imageset/icons8-location-94.svg
--- a/Files/Assets.xcassets/updated_feedback/icons8-male-user-94.imageset/Contents.json
+++ b/Files/Assets.xcassets/updated_feedback/icons8-male-user-94.imageset/Contents.json
@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icons8-male-user-94.svg",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/Files/Assets.xcassets/updated_feedback/icons8-male-user-94.imageset/icons8-male-user-94.svg
+++ b/Files/Assets.xcassets/updated_feedback/icons8-male-user-94.imageset/icons8-male-user-94.svg
--- a/Files/Assets.xcassets/updated_feedback/icons8-people-94.imageset/Contents.json
+++ b/Files/Assets.xcassets/updated_feedback/icons8-people-94.imageset/Contents.json
@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icons8-people-94.svg",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/Files/Assets.xcassets/updated_feedback/icons8-people-94.imageset/icons8-people-94.svg
+++ b/Files/Assets.xcassets/updated_feedback/icons8-people-94.imageset/icons8-people-94.svg
--- a/Files/Assets.xcassets/updated_feedback/icons8-smartphone-94.imageset/Contents.json
+++ b/Files/Assets.xcassets/updated_feedback/icons8-smartphone-94.imageset/Contents.json
@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icons8-smartphone-94.svg",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/Files/Assets.xcassets/updated_feedback/icons8-smartphone-94.imageset/icons8-smartphone-94.svg
+++ b/Files/Assets.xcassets/updated_feedback/icons8-smartphone-94.imageset/icons8-smartphone-94.svg
--- a/Files/Assets.xcassets/updated_feedback/not
+++ b/Files/Assets.xcassets/updated_feedback/not
@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "not uploaded.svg",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/Files/Assets.xcassets/updated_feedback/not
+++ b/Files/Assets.xcassets/updated_feedback/not
@ -0,0 +1,16 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="83" height="24" viewBox="0 0 83 24">
+  <g id="Group_10871" data-name="Group 10871" transform="translate(-13694 -7981)">
+    <rect id="Rectangle_2743" data-name="Rectangle 2743" width="83" height="24" rx="12" transform="translate(13694 7981)" fill="#f35"/>
+    <g id="Group_10868" data-name="Group 10868" transform="translate(13428 7883)">
+      <text id="Not_uploaded" data-name="Not uploaded" transform="translate(290 112)" fill="#fff" font-size="8" font-family="MazzardH-Bold, Mazzard" font-weight="700"><tspan x="0" y="0">Not uploaded</tspan></text>
+      <g id="icons8-renew_1_" data-name="icons8-renew (1)" transform="translate(273 101)">
+        <path id="Path_47131" data-name="Path 47131" d="M20.667,8.333V13.24a2.656,2.656,0,0,0-2-.907A2.438,2.438,0,0,0,18,12.42V7h1.333A1.337,1.337,0,0,1,20.667,8.333Z" transform="translate(-5 -1.333)" fill="#fff"/>
+        <path id="Path_47132" data-name="Path 47132" d="M13.667,11a2.651,2.651,0,0,0-.667.094V5a2,2,0,0,0-2-2H5A2,2,0,0,0,3,5v8a2,2,0,0,0,2,2h6.37a2.662,2.662,0,1,0,2.3-4Z" fill="#fff" opacity="0.35"/>
+        <path id="Path_47133" data-name="Path 47133" d="M10.453,16a4.3,4.3,0,0,0-.4,1.333H6.667a.667.667,0,1,1,0-1.333Z" transform="translate(-1 -4.333)" fill="#fff"/>
+        <path id="Path_47134" data-name="Path 47134" d="M11,7H7A1,1,0,0,0,7,9h4a1,1,0,0,0,0-2Z" transform="translate(-1 -1.333)" fill="#fff"/>
+        <path id="Path_47135" data-name="Path 47135" d="M12,12.667a.662.662,0,0,1-.033.2,3.619,3.619,0,0,0-.553.46.325.325,0,0,1-.08.007H6.667a.667.667,0,1,1,0-1.333h4.667A.669.669,0,0,1,12,12.667Z" transform="translate(-1 -3)" fill="#fff"/>
+        <path id="Path_47136" data-name="Path 47136" d="M17.333,14a3.333,3.333,0,1,0,3.333,3.333A3.335,3.335,0,0,0,17.333,14Zm2.1,3.82a2.162,2.162,0,0,1-3.18,1.38,2.163,2.163,0,0,1-.787-2.947,2.157,2.157,0,0,1,2.373-1.007l.08-.167a.334.334,0,0,1,.6.007l.473.967a.336.336,0,0,1-.24.473l-1.053.207a.33.33,0,0,1-.36-.473l.033-.073a1.142,1.142,0,0,0-1.153,1.447,1.132,1.132,0,0,0,.533.7,1.161,1.161,0,0,0,1.58-.42,1.106,1.106,0,0,0,.127-.32.5.5,0,0,1,.973.227Z" transform="translate(-3.667 -3.667)" fill="#fff"/>
+      </g>
+    </g>
+  </g>
+</svg>
--- a/Files/Assets.xcassets/updated_feedback/notification.imageset/Contents.json
+++ b/Files/Assets.xcassets/updated_feedback/notification.imageset/Contents.json
@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "notification.svg",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/Files/Assets.xcassets/updated_feedback/notification.imageset/notification.svg
+++ b/Files/Assets.xcassets/updated_feedback/notification.imageset/notification.svg
@ -0,0 +1,15 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <g id="Group_10556" data-name="Group 10556" transform="translate(-320 -39)">
+    <g id="Group_10401" data-name="Group 10401" transform="translate(152 5)">
+      <rect id="Rectangle_2575" data-name="Rectangle 2575" width="24" height="24" transform="translate(168 34)" fill="none"/>
+      <g id="icons8-notification" transform="translate(168 33.999)">
+        <path id="Path_46976" data-name="Path 46976" d="M9,20a3,3,0,0,0,6,0Z"/>
+        <path id="Path_46977" data-name="Path 46977" d="M19,10.667V9.294A7.194,7.194,0,0,0,12.215,2,7,7,0,0,0,5,9v1.667a7,7,0,0,1-1.4,4.2L2.45,16.4A2.249,2.249,0,0,0,2,17.75H2A2.25,2.25,0,0,0,4.25,20h15.5A2.25,2.25,0,0,0,22,17.75h0a2.249,2.249,0,0,0-.45-1.35L20.4,14.867A7,7,0,0,1,19,10.667Z" opacity="0.35"/>
+      </g>
+    </g>
+    <g id="Group_10402" data-name="Group 10402" transform="translate(318 40)">
+      <circle id="Ellipse_1811" data-name="Ellipse 1811" cx="8" cy="8" r="8" transform="translate(10 -1)"/>
+      <text id="_12" data-name="12" transform="translate(13 10)" font-size="10" font-family="Volte-SemiBold, Volte" font-weight="600" letter-spacing="0.013em"><tspan x="0" y="0">12</tspan></text>
+    </g>
+  </g>
+</svg>
--- a/Files/Assets.xcassets/updated_feedback/successful.imageset/Contents.json
+++ b/Files/Assets.xcassets/updated_feedback/successful.imageset/Contents.json
@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "successful.svg",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/Files/Assets.xcassets/updated_feedback/successful.imageset/successful.svg
+++ b/Files/Assets.xcassets/updated_feedback/successful.imageset/successful.svg
@ -0,0 +1,18 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="72" height="24" viewBox="0 0 72 24">
+  <g id="Group_10866" data-name="Group 10866" transform="translate(-13694 -7981)">
+    <rect id="Rectangle_2743" data-name="Rectangle 2743" width="72" height="24" rx="12" transform="translate(13694 7981)" fill="#00873c"/>
+    <g id="Group_10865" data-name="Group 10865" transform="translate(13428 7883)">
+      <text id="Successful" transform="translate(290 112)" fill="#fff" font-size="8" font-family="MazzardH-Bold, Mazzard" font-weight="700"><tspan x="0" y="0">Successful</tspan></text>
+      <g id="verified_black_24dp_1_" data-name="verified_black_24dp (1)" transform="translate(274 102)">
+        <g id="Group_8903" data-name="Group 8903">
+          <rect id="Rectangle_2480" data-name="Rectangle 2480" width="16" height="16" fill="none"/>
+          <rect id="Rectangle_2481" data-name="Rectangle 2481" width="16" height="16" fill="none"/>
+        </g>
+        <g id="icons8-verified-account" transform="translate(-1.342 -0.988)">
+          <path id="Path_47129" data-name="Path 47129" d="M7,3.324a2.727,2.727,0,0,1,4.691,0,2.728,2.728,0,0,1,3.318,3.318,2.727,2.727,0,0,1,0,4.691,2.728,2.728,0,0,1-3.318,3.318,2.727,2.727,0,0,1-4.691,0,2.728,2.728,0,0,1-3.318-3.318,2.727,2.727,0,0,1,0-4.691A2.728,2.728,0,0,1,7,3.324Z" fill="#fff" fill-rule="evenodd"/>
+          <path id="Path_47130" data-name="Path 47130" d="M9.8,13.9a.7.7,0,0,1-.495-.205l-2.1-2.1a.7.7,0,0,1,.99-.99L9.8,12.21l3.005-3.005a.7.7,0,1,1,.99.99l-3.5,3.5A.7.7,0,0,1,9.8,13.9Z" transform="translate(-1.397 -2.104)" fill="#00873c" fill-rule="evenodd"/>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
--- a/Files/Assets.xcassets/updated_feedback/upload
+++ b/Files/Assets.xcassets/updated_feedback/upload
@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "upload slip.svg",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/Files/Assets.xcassets/updated_feedback/upload
+++ b/Files/Assets.xcassets/updated_feedback/upload
@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g id="Group_8977" data-name="Group 8977" transform="translate(-466 -256)">
+    <rect id="Rectangle_2484" data-name="Rectangle 2484" width="16" height="16" transform="translate(466 256)" fill="#fff" opacity="0"/>
+    <g id="icons8-upload-document" transform="translate(465 256)">
+      <path id="Path_47167" data-name="Path 47167" d="M4,11.273V3.636A1.636,1.636,0,0,1,5.636,2H9.455l3.273,3.273v6a1.636,1.636,0,0,1-1.636,1.636H5.636A1.636,1.636,0,0,1,4,11.273Z" fill="#fff" opacity="0.35"/>
+      <path id="Path_47168" data-name="Path 47168" d="M14,4.182V2l3.273,3.273H15.091A1.091,1.091,0,0,1,14,4.182Z" transform="translate(-4.545)" fill="#fff"/>
+      <path id="Path_47169" data-name="Path 47169" d="M11.818,12.091H8.545a.545.545,0,1,1,0-1.091h3.273a.545.545,0,0,1,0,1.091Z" transform="translate(-1.818 -4.091)" fill="#fff"/>
+      <path id="Path_47170" data-name="Path 47170" d="M10.727,16.091H8.545a.545.545,0,1,1,0-1.091h2.182a.545.545,0,0,1,0,1.091Z" transform="translate(-1.818 -5.909)" fill="#fff"/>
+      <path id="Path_47171" data-name="Path 47171" d="M16.533,16.733h.6v1.909a.818.818,0,0,0,1.636,0V16.733h.6a.436.436,0,0,0,.346-.7L18.3,14.184a.436.436,0,0,0-.692,0l-1.42,1.847A.436.436,0,0,0,16.533,16.733Z" transform="translate(-5.498 -5.461)" fill="#fff"/>
+    </g>
+  </g>
+</svg>