diff --git a/resources/images/ui2/generating-keys-1@2x.png b/resources/images/ui2/generating-keys-1@2x.png index e60ffc7326..544c6cdb49 100644 Binary files a/resources/images/ui2/generating-keys-1@2x.png and b/resources/images/ui2/generating-keys-1@2x.png differ diff --git a/resources/images/ui2/generating-keys-1@3x.png b/resources/images/ui2/generating-keys-1@3x.png index 2bf50d9802..15709ee24b 100644 Binary files a/resources/images/ui2/generating-keys-1@3x.png and b/resources/images/ui2/generating-keys-1@3x.png differ diff --git a/resources/images/ui2/generating-keys-2@2x.png b/resources/images/ui2/generating-keys-2@2x.png deleted file mode 100644 index 544c6cdb49..0000000000 Binary files a/resources/images/ui2/generating-keys-2@2x.png and /dev/null differ diff --git a/resources/images/ui2/generating-keys-2@3x.png b/resources/images/ui2/generating-keys-2@3x.png deleted file mode 100644 index 15709ee24b..0000000000 Binary files a/resources/images/ui2/generating-keys-2@3x.png and /dev/null differ diff --git a/resources/images/ui2/generating-keys-3@2x.png b/resources/images/ui2/generating-keys-3@2x.png deleted file mode 100644 index dada30fbe3..0000000000 Binary files a/resources/images/ui2/generating-keys-3@2x.png and /dev/null differ diff --git a/resources/images/ui2/generating-keys-3@3x.png b/resources/images/ui2/generating-keys-3@3x.png deleted file mode 100644 index 35e3746dd7..0000000000 Binary files a/resources/images/ui2/generating-keys-3@3x.png and /dev/null differ diff --git a/src/status_im/common/resources.cljs b/src/status_im/common/resources.cljs index fbf0469a0c..6d6013f8e6 100644 --- a/src/status_im/common/resources.cljs +++ b/src/status_im/common/resources.cljs @@ -15,8 +15,6 @@ :podcasts (js/require "../resources/images/ui2/podcasts.png") :generate-keys (js/require "../resources/images/ui2/generate-keys.png") :generate-keys1 (js/require "../resources/images/ui2/generating-keys-1.png") - :generate-keys2 (js/require "../resources/images/ui2/generating-keys-2.png") - :generate-keys3 (js/require "../resources/images/ui2/generating-keys-3.png") :ethereum-address (js/require "../resources/images/ui2/ethereum-address.png") :use-keycard (js/require "../resources/images/ui2/keycard.png") :onboarding-illustration (js/require "../resources/images/ui2/onboarding_illustration.png") diff --git a/src/status_im/contexts/onboarding/generating_keys/view.cljs b/src/status_im/contexts/onboarding/generating_keys/view.cljs index d4ecce7e7f..5a27098ac3 100644 --- a/src/status_im/contexts/onboarding/generating_keys/view.cljs +++ b/src/status_im/contexts/onboarding/generating_keys/view.cljs @@ -61,8 +61,12 @@ reanimated/easings)))))) (defn title - [insets generate-keys-opacity saving-keys-opacity keys-saved-opacity] - (let [top-insets (+ (if rn/small-screen? 62 112) (:insets insets))] + [insets] + (let [top-insets (+ (if rn/small-screen? 62 112) (:insets insets)) + generate-keys-opacity (reanimated/use-shared-value 1) + saving-keys-opacity (reanimated/use-shared-value 0) + keys-saved-opacity (reanimated/use-shared-value 0)] + (sequence-animation generate-keys-opacity saving-keys-opacity keys-saved-opacity) [rn/view {:position :absolute :top top-insets} @@ -83,44 +87,20 @@ [keys-saved-title]]])) (defn content - [generate-keys-opacity saving-keys-opacity keys-saved-opacity] + [] (let [width (:width (rn/get-window))] [rn/view - {:margin-top 156} - [reanimated/view - {:style (reanimated/apply-animations-to-style - {:opacity generate-keys-opacity} - {:position :absolute})} - [rn/image - {:resize-mode :contain - :style (style/page-illustration width) - :source (resources/get-image :generate-keys1)}]] - - [reanimated/view - {:style (reanimated/apply-animations-to-style - {:opacity saving-keys-opacity} - {:position :absolute})} - [rn/image - {:resize-mode :contain - :style (style/page-illustration width) - :source (resources/get-image :generate-keys2)}]] - [reanimated/view - {:style (reanimated/apply-animations-to-style - {:opacity keys-saved-opacity} - {:position :absolute})} - [rn/image - {:resize-mode :contain - :style (style/page-illustration width) - :source (resources/get-image :generate-keys3)}]]])) + {:top 156 + :position :absolute} + [rn/image + {:resize-mode :contain + :style (style/page-illustration width) + :source (resources/get-image :generate-keys1)}]])) (defn view [] - (let [insets (safe-area/get-insets) - generate-keys-opacity (reanimated/use-shared-value 1) - saving-keys-opacity (reanimated/use-shared-value 0) - keys-saved-opacity (reanimated/use-shared-value 0)] + (let [insets (safe-area/get-insets)] [rn/view {:style (style/page-container insets)} - (sequence-animation generate-keys-opacity saving-keys-opacity keys-saved-opacity) [:<> - [title insets generate-keys-opacity saving-keys-opacity keys-saved-opacity] - [content generate-keys-opacity saving-keys-opacity keys-saved-opacity]]])) + [title insets] + [content]]]))