Skip to content

Commit

Permalink
[#8629] Fixes to v1 warning
Browse files Browse the repository at this point in the history
  • Loading branch information
@flexsurfer
flexsurfer committed Jul 24, 2019
1 parent fc3d738 commit 0aea1ad
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 45 deletions.
82 changes: 40 additions & 42 deletions src/status_im/ui/screens/announcements/views.cljs
View file
Expand Up @@ -62,33 +62,28 @@
:height 19}]]]]]]))))

(defn public-launch-announcement []
[react/view {:flex-grow 1 :flex-direction :column}
[react/view {:flex 1}
[status-bar/status-bar {:type :modal-white}]
[react/scroll-view {:content-container-style {:align-items :stretch}}
[react/view {:justify-content :space-between
:flex-direction :row}
[react/touchable-highlight
{:on-press #(re-frame/dispatch [:navigate-back])
:style {:width 56
:height 56
:justify-content :center
:align-items :center}
:accessibility-label :done-button}
[react/view
[icons/icon :main-icons/close {}]]]
[react/view {:flex 1
:justify-content :center
:align-items :center
:margin-right 56}
[react/image {:source (:large-badge resources/ui)
:style {:margin-top 4}}]]]
[react/text {:style {:margin-top 12
[react/scroll-view
#_[react/view {:justify-content :space-between
:flex-direction :row}
#_[react/touchable-highlight {:on-press #(re-frame/dispatch [:navigate-back])
:style {:width 56
:height 56
:justify-content :center
:align-items :center}
:accessibility-label :done-button}
[icons/icon :main-icons/close {}]]]
[react/view {:justify-content :center
:align-items :center}
[react/image {:source (:large-badge resources/ui)
:style {:margin-top 4}}]]
[react/text {:style {:margin-top 0
:margin-bottom 8
:typography :header
:text-align :center}}
(i18n/label :t/status-launch-modal-title)]
[react/text {:style {:margin-top 8
:margin-bottom 16
;; :color colors/gray
:line-height 21
:font-size 15
Expand All @@ -97,14 +92,14 @@
(i18n/label :t/status-launch-modal-text)]
[react/text {:style {:color colors/gray
:margin-horizontal 16
:margin-top 14
:margin-top 22
:margin-bottom 6
:font-size 15
:text-align :left}}
(i18n/label :t/status-launch-modal-h2-what-new)]
[react/view {:flex-direction :row
:margin-horizontal 16
:margin-vertical 6
:margin-top 6
:align-items :center}
[react/text {:style {:font-size 20}}
"🔑"]
Expand All @@ -113,7 +108,7 @@
(i18n/label :t/status-launch-modal-new-key)]]
[react/view {:flex-direction :row
:margin-horizontal 16
:margin-vertical 6
:margin-top 8
:align-items :center}
[react/text {:style {:font-size 20}}
"🗂"]
Expand All @@ -122,7 +117,7 @@
(i18n/label :t/status-launch-modal-multi-account)]]
[react/view {:flex-direction :row
:margin-horizontal 16
:margin-vertical 6
:margin-top 8
:align-items :center}
[react/text {:style {:font-size 20}}
"💳"]
Expand All @@ -131,7 +126,7 @@
(i18n/label :t/status-launch-modal-keycard)]]
[react/view {:flex-direction :row
:margin-horizontal 16
:margin-vertical 6
:margin-top 8
:align-items :center}
[react/text {:style {:font-size 20}}
"💬"]
Expand All @@ -140,7 +135,7 @@
(i18n/label :t/status-launch-modal-ens-in-chat)]]
[react/view {:flex-direction :row
:margin-horizontal 16
:margin-vertical 6
:margin-top 8
:align-items :center}
[react/text {:style {:font-size 20}}
"🏇"]
Expand All @@ -150,14 +145,14 @@
[react/text {:style {:color colors/gray
:margin-horizontal 16
:margin-top 6
:margin-bottom 24
:font-size 15
:text-align :left}}
(i18n/label :t/status-launch-modal-much-more)]
[react/view {:background-color colors/red-transparent-10
:border-top-width 1
:padding-horizontal 16
:padding-top 10
:margin-top 12
:padding-bottom 12
:margin-bottom 24
:border-top-color colors/gray-light
Expand All @@ -176,7 +171,9 @@
(i18n/label :t/status-launch-modal-before-you-update-text3)]
[react/text {:style {:padding-top 10
:color colors/blue}
:on-press #(println "TODO link to Learn more")}
:on-press #(do
(re-frame/dispatch [:navigate-back])
(re-frame/dispatch [:browser.ui/open-url "https://v1-changes-explained.status.im"]))}
(i18n/label :t/status-launch-modal-before-you-update-learn-more)]]
[react/text {:style {:color colors/gray
:margin-horizontal 16
Expand All @@ -185,20 +182,21 @@
:text-align :left}}
(i18n/label :t/status-launch-modal-when-title)]
[react/nested-text {:style {:line-height 22
:margin-bottom 16
:padding-bottom 76
:margin-horizontal 16}}
(i18n/label :t/status-launch-modal-when-text1)
[{:style {:color colors/blue}}
[{:style {:color colors/blue} :on-press #(do
(re-frame/dispatch [:navigate-back])
(re-frame/dispatch [:chat.ui/start-public-chat "status"]))}
(i18n/label :t/status-launch-modal-when-text2)]
(i18n/label :t/status-launch-modal-when-text3)
[{:style {:color colors/blue}}
(i18n/label :t/status-launch-modal-when-text4)]]]
[react/view {:align-items :center :background-color colors/white
:position :absolute :left 0 :right 0 :bottom 0}
[components.common/button {:button-style {:margin-vertical 16
:padding-horizontal 32
:justify-content :center
:align-items :center}
:on-press #(re-frame/dispatch [:navigate-back])
:label (i18n/label :t/got-it)}]]])
[{:style {:color colors/blue} :on-press #(do
(re-frame/dispatch [:navigate-back])
(re-frame/dispatch [:browser.ui/open-url "https://twitter.com/ethstatus"]))}
(i18n/label :t/status-launch-modal-when-text4)]]
[react/view {:align-items :center}
[components.common/button {:button-style {:margin-vertical 30
:padding-horizontal 32
:justify-content :center
:align-items :center}
:on-press #(re-frame/dispatch [:navigate-back])
:label (i18n/label :t/got-it)}]]]])
6 changes: 3 additions & 3 deletions translations/en.json
View file
Expand Up @@ -1234,7 +1234,7 @@
"status-launch-banner-title": "Status 1.0 is coming!",
"stauts-launch-banner-text": "Your account will be affected.\nTap to learn more",
"status-launch-modal-title": "Status 1.0 public launch",
"status-launch-modal-text": "Status is taking important steps toward building a more private, secure and censorship resistant network. Thanks for being part of beta; we're sure you'll love what we have in store for v1.0!",
"status-launch-modal-text": "Status is taking important steps toward a more secure, censorship resistant network. Thanks for being part of beta; we're sure you'll love v1.0!",
"status-launch-modal-h2-what-new": "What's new",
"status-launch-modal-new-key": "New key structure for more privacy",
"status-launch-modal-multi-account": "Add and manage multiple accounts",
Expand All @@ -1243,8 +1243,8 @@
"status-launch-modal-perf-improvements": "Performance improvements",
"status-launch-modal-much-more": "...and much more!",
"status-launch-modal-before-you-update-title": "Before you update",
"status-launch-modal-before-you-update-text1": "To use your current wallet 0x8bb5...9e29 in version 1.0, you will need to recover it using your seed phrase.",
"status-launch-modal-before-you-update-text2": "Please make sure you have your seed phrase handy!",
"status-launch-modal-before-you-update-text1": "To use your current wallet 0x8bb5...9e29 in version 1.0, you will need to recover it using your recovery phrase.",
"status-launch-modal-before-you-update-text2": "Please make sure you have your recovery phrase handy!",
"status-launch-modal-before-you-update-text3": "If it's lost, transfer your funds to another secure wallet as soon as possible. Updating to 1.0 will result in a loss of access to this wallet.",
"status-launch-modal-before-you-update-learn-more": "Learn more ↗",
"status-launch-modal-when-title": "When?",
Expand Down

0 comments on commit 0aea1ad

Please sign in to comment.