From bde9da751999b5ae9ecf559ee05f86d8c68ce218 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Jan 2021 08:18:14 +0000 Subject: [PATCH 01/32] Bump axios from 0.18.1 to 0.21.1 Bumps [axios](https://github.com/axios/axios) from 0.18.1 to 0.21.1. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v0.21.1/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v0.18.1...v0.21.1) Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 33 +++++++++------------------------ 2 files changed, 10 insertions(+), 25 deletions(-) diff --git a/package.json b/package.json index efe6fe4fdd..635f6bd635 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "appcenter": "^3.1.0", "appcenter-analytics": "^3.1.0", "appcenter-crashes": "^3.1.0", - "axios": "^0.18.0", + "axios": "^0.21.1", "buffer": "^5.4.3", "bugsnag-react-native": "^2.23.10", "core-js": "3.6.4", diff --git a/yarn.lock b/yarn.lock index 216ab37d70..68d4069ba0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1856,13 +1856,12 @@ axe-core@^3.5.4: resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-3.5.5.tgz#84315073b53fa3c0c51676c588d59da09a192227" integrity sha512-5P0QZ6J5xGikH780pghEdbEKijCTrruK9KxtPZCFWUpef0f6GipO+xEZ5GKCb020mmqgbiNO6TcA55CriL784Q== -axios@^0.18.0: - version "0.18.1" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.1.tgz#ff3f0de2e7b5d180e757ad98000f1081b87bcea3" - integrity sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g== +axios@^0.21.1: + version "0.21.1" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8" + integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA== dependencies: - follow-redirects "1.5.10" - is-buffer "^2.0.2" + follow-redirects "^1.10.0" axobject-query@^2.1.2: version "2.2.0" @@ -2882,13 +2881,6 @@ debug@4.1.1, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: dependencies: ms "^2.1.1" -debug@=3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" - integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== - dependencies: - ms "2.0.0" - debug@^3.1.0: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" @@ -4067,12 +4059,10 @@ flux-standard-action@^2.0.3: dependencies: lodash "^4.17.15" -follow-redirects@1.5.10: - version "1.5.10" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a" - integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ== - dependencies: - debug "=3.1.0" +follow-redirects@^1.10.0: + version "1.13.2" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.2.tgz#dd73c8effc12728ba5cf4259d760ea5fb83e3147" + integrity sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA== for-in@^0.1.3: version "0.1.8" @@ -4765,11 +4755,6 @@ is-buffer@^1.1.5: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== -is-buffer@^2.0.2: - version "2.0.4" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623" - integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A== - is-callable@^1.1.4, is-callable@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz#83336560b54a38e35e3a2df7afd0454d691468bb" From a841248864d571e4b878080a3550c99deabcddf2 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 30 Jan 2021 01:44:17 +0200 Subject: [PATCH 02/32] New translations en-US.json (Bulgarian) --- src/config/locales/bg-BG.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/config/locales/bg-BG.json b/src/config/locales/bg-BG.json index 7dd8e5a40d..db6b41d36f 100644 --- a/src/config/locales/bg-BG.json +++ b/src/config/locales/bg-BG.json @@ -590,9 +590,9 @@ "nothing_here": "Няма нищо тук" }, "beneficiary_modal": { - "percent": "Percent", - "username": "Username", - "addAccount": "Add Account", - "save": "Save" + "percent": "Процент", + "username": "Потребителско име", + "addAccount": "Добави акаунт", + "save": "Запази" } } From d68ff42e26b197e4444f683900eb13bccf14048a Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 30 Jan 2021 01:54:01 +0200 Subject: [PATCH 03/32] New translations en-US.json (Bulgarian) --- src/config/locales/bg-BG.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/config/locales/bg-BG.json b/src/config/locales/bg-BG.json index db6b41d36f..9d47928913 100644 --- a/src/config/locales/bg-BG.json +++ b/src/config/locales/bg-BG.json @@ -15,10 +15,10 @@ "vote": "Глас", "reblog": "Споделяне", "login": "Вход", - "incoming_transfer_title": "Входящи транзакции", - "outgoing_transfer_title": "Изходящи транзакции", + "incoming_transfer_title": "Входяща транзакция", + "outgoing_transfer_title": "Изходяща транзакция", "checkin_extra": "Бонус", - "delegation": "Делегация/отдаване", + "delegation": "Делегиране", "delegations": "Делегация/отдаване", "delegation_title": "Награда за отдаден Hive", "delegation_desc": "Спечели Estm всеки ден за отдаване", @@ -31,7 +31,7 @@ "referral": "Партньор", "referral_title": "Награда за препоръка", "referral_desc": "Покани приятел и спечели Estm", - "checkin_extra_title": "Бонус в употреба", + "checkin_extra_title": "Бонус за използване", "no_activity": "Няма скорошна дейност", "outgoing_transfer_description": "", "incoming_transfer_description": "", @@ -43,18 +43,18 @@ "login_desc": "Когато влезете в приложенението за първи път печелите 100 точки.", "checkin_extra_desc": "Честата употреба на приложението ви дава допълнителни шансове да спечелите повече точки, да бъдете по-активни и да печелите повече.", "dropdown_transfer": "Подарък", - "dropdown_promote": "Реклама", + "dropdown_promote": "Промотирай", "dropdown_boost": "Подсилване", "from": "От", "to": "До", "estimated_value_desc": "Според стойността при покупка", "estimated_value": "Предполагаема стойност", "estimated_amount": "Стойност на гласа", - "amount_information": "Плъзгащото се меню за промяна на сумата", + "amount_information": "Плъзни лентата за промяна на сумата", "amount": "Сума", - "memo": "Бележка/съобщение", + "memo": "Бележка", "information": "Сигурни ли сте за превода на сумата?", - "amount_desc": "Баланс/сума", + "amount_desc": "Баланс", "memo_desc": "Това съобщение е публично", "to_placeholder": "Потребителско име", "memo_placeholder": "Добави бележки тук", @@ -65,8 +65,8 @@ "powerUp": "Повишаване на енергията", "withdraw_to_saving": "Изтегли спестяванията", "steemconnect_title": "Hivesigner транзакция", - "next": "следващ", - "delegate": "Делегация/отдаване", + "next": "СЛЕДВАЩ", + "delegate": "Делегирай", "power_down": "Намаляване на енергията", "withdraw_steem": "Изтегли Hive", "withdraw_sbd": "Изтегли HBD", @@ -77,7 +77,7 @@ "escrow_release": "Escrow пускане", "escrow_approve": "Escrow одобрение", "cancel_transfer_from_savings": "Спиране от спестявания", - "delegate_vesting_shares": "Делегация/отдаване", + "delegate_vesting_shares": "Делегиране", "fill_convert_request": "Преобразуване на изпълненото", "fill_transfer_from_savings": "Спестяване изпълнено", "fill_vesting_withdraw": "Намаляване на стойността изпълнено", From 38f434bbe7a17ff8fd53be5180f73b2b683a3bd9 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sat, 30 Jan 2021 02:09:11 +0200 Subject: [PATCH 04/32] New translations en-US.json (Bulgarian) --- src/config/locales/bg-BG.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config/locales/bg-BG.json b/src/config/locales/bg-BG.json index 9d47928913..1a6dab735f 100644 --- a/src/config/locales/bg-BG.json +++ b/src/config/locales/bg-BG.json @@ -115,14 +115,14 @@ "mention": "споменато в", "follow": "те последва", "unfollow": "не те следва вече", - "ignore": "игнорира те", + "ignore": "те игнорира", "reblog": "споделено от", "transfer": "прехвърлено", "spin": "Време да спечелите още Estm", "inactive": "Бъди активен! Напишете публикация, продължете да печелите", "referral": "се присъедини чрез вашата покана, приветствайте го", "notification": "Известия", - "leaderboard": "Класация", + "leaderboard": "Лидерство", "epoint": "Точки", "leaderboard_title": "Първи потребители", "recent": "Скорошен", From 81170e05b6476f09a3aef1fde128585fe6c0fe5b Mon Sep 17 00:00:00 2001 From: feruz Date: Sun, 31 Jan 2021 20:59:12 +0200 Subject: [PATCH 05/32] start next version --- android/app/build.gradle | 2 +- ios/Ecency-tvOS/Info.plist | 4 ++-- ios/Ecency-tvOSTests/Info.plist | 4 ++-- ios/Ecency.xcodeproj/project.pbxproj | 4 ++-- ios/Ecency/Info.plist | 2 +- ios/EcencyTests/Info.plist | 4 ++-- ios/eshare/Info.plist | 4 ++-- package.json | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 02d9790fde..4c54ee200b 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -143,7 +143,7 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode versionMajor * 10000 + versionMinor * 100 + versionPatch - versionName "3.0.13" + versionName "3.0.14" resValue "string", "build_config_package", "app.esteem.mobile.android" multiDexEnabled true // react-native-image-crop-picker diff --git a/ios/Ecency-tvOS/Info.plist b/ios/Ecency-tvOS/Info.plist index 61669a1c0d..4905515240 100644 --- a/ios/Ecency-tvOS/Info.plist +++ b/ios/Ecency-tvOS/Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.0.13 + 3.0.14 CFBundleSignature ???? CFBundleVersion - 2563 + 2793 LSRequiresIPhoneOS NSAppTransportSecurity diff --git a/ios/Ecency-tvOSTests/Info.plist b/ios/Ecency-tvOSTests/Info.plist index 944288e902..ac4bcdcc12 100644 --- a/ios/Ecency-tvOSTests/Info.plist +++ b/ios/Ecency-tvOSTests/Info.plist @@ -15,10 +15,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 3.0.13 + 3.0.14 CFBundleSignature ???? CFBundleVersion - 2563 + 2793 diff --git a/ios/Ecency.xcodeproj/project.pbxproj b/ios/Ecency.xcodeproj/project.pbxproj index f54548ab37..f1ccdd07ec 100644 --- a/ios/Ecency.xcodeproj/project.pbxproj +++ b/ios/Ecency.xcodeproj/project.pbxproj @@ -1122,7 +1122,7 @@ CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 2792; + CURRENT_PROJECT_VERSION = 2793; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = 75B6RXTKGT; HEADER_SEARCH_PATHS = ( @@ -1198,7 +1198,7 @@ CODE_SIGN_ENTITLEMENTS = Ecency/Ecency.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 2792; + CURRENT_PROJECT_VERSION = 2793; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = 75B6RXTKGT; HEADER_SEARCH_PATHS = ( diff --git a/ios/Ecency/Info.plist b/ios/Ecency/Info.plist index c55bf7b108..974596d5b1 100644 --- a/ios/Ecency/Info.plist +++ b/ios/Ecency/Info.plist @@ -19,7 +19,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.0.13 + 3.0.14 CFBundleSignature ???? CFBundleURLTypes diff --git a/ios/EcencyTests/Info.plist b/ios/EcencyTests/Info.plist index a64983ad73..467bd42665 100644 --- a/ios/EcencyTests/Info.plist +++ b/ios/EcencyTests/Info.plist @@ -15,10 +15,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 3.0.13 + 3.0.14 CFBundleSignature ???? CFBundleVersion - 2563 + 2793 diff --git a/ios/eshare/Info.plist b/ios/eshare/Info.plist index becba9595a..816b4431c3 100644 --- a/ios/eshare/Info.plist +++ b/ios/eshare/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 3.0.13 + 3.0.14 CFBundleVersion - 2563 + 2793 NSExtension NSExtensionAttributes diff --git a/package.json b/package.json index efe6fe4fdd..7f8bd7c1c3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ecency", - "version": "3.0.13", + "version": "3.0.14", "displayName": "Ecency", "private": true, "rnpm": { From 3b38d3976902491b449b8ad115b234e23b524728 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 1 Feb 2021 12:11:07 +0200 Subject: [PATCH 06/32] New translations en-US.json (Estonian) --- src/config/locales/et-EE.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/config/locales/et-EE.json b/src/config/locales/et-EE.json index ce85a6012c..062a43d3fd 100644 --- a/src/config/locales/et-EE.json +++ b/src/config/locales/et-EE.json @@ -147,7 +147,7 @@ "profile": { "following": "Jälgid", "follower": "Jälgija", - "post": "Post", + "post": "Postitused", "details": "Profiili Detailid", "comments": "Kommentaarid", "replies": "Vastused", @@ -188,7 +188,7 @@ "vote": "Hääleta", "comment": "Kommenteeri", "mention": "Maini", - "reblog": "Jaha", + "reblog": "Jaga", "transfers": "Ülekanded" }, "pincode": "Pincode", @@ -240,7 +240,7 @@ "hot": "Kuum", "new": "Uus", "blog": "Blogi", - "posts": "Post", + "posts": "Postitused", "friends": "Sõbrad", "communities": "Kogukonnad" }, @@ -555,13 +555,13 @@ "unsubscribe": "Lahku", "subscribers": "Liikmed", "posters": "Postitajad", - "posts": "Post" + "posts": "Postitused" }, "communities_filter": { "my": "Minu Kogukonnad", "rank": "Tase", "subs": "Liikmed", - "new": "Uus" + "new": "Värske" }, "post_result_filter": { "popularity": "Populaarsus", From 1e501e67350405dbcb9f73714932e2bf7d5d3039 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 1 Feb 2021 12:34:53 +0200 Subject: [PATCH 07/32] New translations en-US.json (Estonian) --- src/config/locales/et-EE.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/config/locales/et-EE.json b/src/config/locales/et-EE.json index 062a43d3fd..8def427631 100644 --- a/src/config/locales/et-EE.json +++ b/src/config/locales/et-EE.json @@ -3,7 +3,7 @@ "curation_reward": "Kuraatori tasu", "author_reward": "Autoritasu", "comment_benefactor_reward": "Kasusaaja tasu", - "claim_reward_balance": "Lunasta tasu ", + "claim_reward_balance": "Tasu lunastatud ", "transfer": "Ülekanne", "transfer_to_vesting": "Teenimisse", "transfer_from_savings": "Hoiusest", @@ -15,8 +15,8 @@ "vote": "Hääleta", "reblog": "Jaga", "login": "Sisselogimine", - "incoming_transfer_title": "Saabuv ülekanne", - "outgoing_transfer_title": "Väljuv ülekanne", + "incoming_transfer_title": "Sissekanne", + "outgoing_transfer_title": "Väljakanne", "checkin_extra": "Boonus", "delegation": "Volitus", "delegations": "Volitused", @@ -63,13 +63,13 @@ "points": "Kingi kellelegi punkte", "transfer_to_saving": "Hoiusesse", "powerUp": "Lisa võimsust", - "withdraw_to_saving": "Võta hoius välja", + "withdraw_to_saving": "Hoiuse väljakanne", "steemconnect_title": "Hivesigneri ülekanne", "next": "EDASI", "delegate": "Volita", "power_down": "Väljaluülitus", - "withdraw_steem": "Võta välja HIVE", - "withdraw_sbd": "Võta välja HBD", + "withdraw_steem": "HIVE väljakanne", + "withdraw_sbd": "HBD väljakanne", "transfer_to_savings": "Hoiusesse", "convert": "Konverteeri", "escrow_transfer": "Deposiidi ülekanne", @@ -131,7 +131,7 @@ "this_month": "Sel kuul", "older_then": "Vanem kui kuu", "activities": "Kõik", - "replies": "Vastused", + "replies": "Kommentaarid", "mentions": "Mainimised", "reblogs": "Jagatud", "noactivity": "Hiljutised tegevused puuduvad" @@ -150,7 +150,7 @@ "post": "Postitused", "details": "Profiili Detailid", "comments": "Kommentaarid", - "replies": "Vastused", + "replies": "Kommentaarid", "wallet": "Rahakott", "wallet_details": "Rahakoti Detailid", "unclaimed_rewards": "Nõudmata Tasu", @@ -484,8 +484,8 @@ "next": "EDASI", "delegate": "Volita", "power_down": "Power Down", - "withdraw_steem": "Võta HIVE välja", - "withdraw_sbd": "Võta HIVE Dollar välja", + "withdraw_steem": "HIVE väljakanne", + "withdraw_sbd": "HIVE Dollari väljakanne", "incoming_funds": "Sissetulevad varad", "stop": "Peata", "address_view": "Näita aadressi" @@ -565,7 +565,7 @@ }, "post_result_filter": { "popularity": "Populaarsus", - "newest": "Uusim", + "newest": "Värskeim", "relevance": "Asjakohasus" }, "other_result_filter": { From 6a924a10f2df06c4684c122aab4f13316ecbd44e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 1 Feb 2021 12:52:15 +0200 Subject: [PATCH 08/32] New translations en-US.json (Estonian) --- src/config/locales/et-EE.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config/locales/et-EE.json b/src/config/locales/et-EE.json index 8def427631..2a5ccd2338 100644 --- a/src/config/locales/et-EE.json +++ b/src/config/locales/et-EE.json @@ -62,7 +62,7 @@ "purchase_estm": "OSTA PUNKTE", "points": "Kingi kellelegi punkte", "transfer_to_saving": "Hoiusesse", - "powerUp": "Lisa võimsust", + "powerUp": "Suurenda Hive Powerit", "withdraw_to_saving": "Hoiuse väljakanne", "steemconnect_title": "Hivesigneri ülekanne", "next": "EDASI", @@ -292,7 +292,7 @@ "setting_reward": "Tasu", "setting_beneficiary": "Kasusaaja", "reward_default": "Vaikimisi 50% / 50%", - "reward_power_up": "Lisa võimsust 100%", + "reward_power_up": "Tasu Hive Power 100%", "reward_decline": "Keeldu väljamaksest", "beneficiaries": "Kasusaajad", "options": "Valikud", From 81441845c5723e06267a75e5106191c297df786d Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 1 Feb 2021 13:01:11 +0200 Subject: [PATCH 09/32] New translations en-US.json (Estonian) --- src/config/locales/et-EE.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config/locales/et-EE.json b/src/config/locales/et-EE.json index 2a5ccd2338..472cd9e213 100644 --- a/src/config/locales/et-EE.json +++ b/src/config/locales/et-EE.json @@ -80,7 +80,7 @@ "delegate_vesting_shares": "Volitus", "fill_convert_request": "Vahetamine alustatud", "fill_transfer_from_savings": "Hoius alustatud", - "fill_vesting_withdraw": "PowerDown alustatud", + "fill_vesting_withdraw": "Hive Poweri vähendamist alustatud", "estm": { "title": "Punktid", "buy": "OSTA PUNKTE" @@ -483,7 +483,7 @@ "percent_information": "Protsendi info", "next": "EDASI", "delegate": "Volita", - "power_down": "Power Down", + "power_down": "Vähenda Hive Powerit", "withdraw_steem": "HIVE väljakanne", "withdraw_sbd": "HIVE Dollari väljakanne", "incoming_funds": "Sissetulevad varad", From 037ba2b76560f7c5dfdca988a7ac5640f484d20a Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 1 Feb 2021 13:17:54 +0200 Subject: [PATCH 10/32] New translations en-US.json (Estonian) --- src/config/locales/et-EE.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/config/locales/et-EE.json b/src/config/locales/et-EE.json index 472cd9e213..e362dea21d 100644 --- a/src/config/locales/et-EE.json +++ b/src/config/locales/et-EE.json @@ -7,7 +7,7 @@ "transfer": "Ülekanne", "transfer_to_vesting": "Teenimisse", "transfer_from_savings": "Hoiusest", - "withdraw_vesting": "Väljaluülitus", + "withdraw_vesting": "Vähenda Hive Powerit", "fill_order": "Täida Tellimus", "post": "Postitus", "comment": "Kommenteeri", @@ -67,7 +67,7 @@ "steemconnect_title": "Hivesigneri ülekanne", "next": "EDASI", "delegate": "Volita", - "power_down": "Väljaluülitus", + "power_down": "Vähenda Hive Powerit", "withdraw_steem": "HIVE väljakanne", "withdraw_sbd": "HBD väljakanne", "transfer_to_savings": "Hoiusesse", @@ -145,8 +145,8 @@ "comingsoon": "Sõnumite funktsionaalus ei ole veel valimis!" }, "profile": { - "following": "Jälgid", - "follower": "Jälgija", + "following": "Jälgitavat", + "follower": "Jälgijat", "post": "Postitused", "details": "Profiili Detailid", "comments": "Kommentaarid", @@ -163,7 +163,7 @@ "havent_commented": "ei ole veel midagi kommenteerinud", "havent_posted": "ei ole veel midagi postitanud", "steem_power": "Hive Power", - "next_power_text": "Järgmise väljaluülitus on", + "next_power_text": "Järgmine Hive Poweri vähendamine toimub", "days": "päeva", "day": "päev", "steem_dollars": "Hive Dollarid", From d15d998f5c4caf15449d557f393f2a8544ac0a62 Mon Sep 17 00:00:00 2001 From: feruz Date: Tue, 2 Feb 2021 13:05:45 +0200 Subject: [PATCH 11/32] fix if link has comment parts --- src/utils/postUrlParser.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/utils/postUrlParser.js b/src/utils/postUrlParser.js index 8d3b1474f5..beec6b6d52 100644 --- a/src/utils/postUrlParser.js +++ b/src/utils/postUrlParser.js @@ -101,6 +101,14 @@ export default (url) => { // For non urls with category like esteem/@good-karma/esteem-london-presentation-e3105ba6637ed match = url.match(/([\w.\d-]+)\/(@[\w.\d-]+)\/(.*)/); if (match && match.length === 4) { + if (match[3].indexOf('#') > -1) { + const commentPart = match[3].split('@')[1]; + return { + category: match[1], + author: commentPart.split('/')[0], + permlink: commentPart.split('/')[1], + }; + } return { category: match[1], author: match[2].replace('@', ''), From 5b3d88d1673e051ccd20d05474050e8583598e9d Mon Sep 17 00:00:00 2001 From: feruz Date: Tue, 2 Feb 2021 13:08:58 +0200 Subject: [PATCH 12/32] fix if link has comment parts --- src/utils/postUrlParser.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/utils/postUrlParser.js b/src/utils/postUrlParser.js index beec6b6d52..720f9ea3b0 100644 --- a/src/utils/postUrlParser.js +++ b/src/utils/postUrlParser.js @@ -103,10 +103,11 @@ export default (url) => { if (match && match.length === 4) { if (match[3].indexOf('#') > -1) { const commentPart = match[3].split('@')[1]; + const splits = commentPart.split('/'); return { category: match[1], - author: commentPart.split('/')[0], - permlink: commentPart.split('/')[1], + author: splits[0], + permlink: splits[1], }; } return { From 6b6e75919981112df32b95617a575612e68fb83d Mon Sep 17 00:00:00 2001 From: feruz Date: Wed, 3 Feb 2021 10:13:22 +0200 Subject: [PATCH 13/32] bug fixes and new accountsheet --- android/.project | 11 ++ android/app/.project | 11 ++ ios/Podfile.lock | 6 +- package.json | 6 +- .../container/accountsBottomSheetContainer.js | 24 ++-- .../view/accountsBottomSheetStyles.js | 8 +- .../view/accountsBottomSheetView.js | 128 +++++++----------- src/components/postCard/view/postCardView.js | 16 ++- src/components/posts/view/postsView.js | 2 + .../sideMenu/container/sideMenuContainer.js | 62 ++++----- src/redux/reducers/uiReducer.js | 2 +- yarn.lock | 91 ++++--------- 12 files changed, 164 insertions(+), 203 deletions(-) diff --git a/android/.project b/android/.project index 0a5efc30ac..21d55be8a2 100644 --- a/android/.project +++ b/android/.project @@ -14,4 +14,15 @@ org.eclipse.buildship.core.gradleprojectnature + + + 1612291976720 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/android/app/.project b/android/app/.project index ac485d7c3e..6ae696b6f7 100644 --- a/android/app/.project +++ b/android/app/.project @@ -20,4 +20,15 @@ org.eclipse.jdt.core.javanature org.eclipse.buildship.core.gradleprojectnature + + + 1612291976724 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 486726254e..e8b37a40d3 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -397,8 +397,8 @@ PODS: - Firebase/Messaging (~> 6.28.1) - React - RNFBApp - - RNGestureHandler (1.7.0): - - React + - RNGestureHandler (1.9.0): + - React-Core - RNIap (3.4.15): - React - RNImageCropPicker (0.35.2): @@ -712,7 +712,7 @@ SPEC CHECKSUMS: RNFBApp: d55b3a69d199cff25ecf4f3bf41a86c47aa37d57 RNFBDynamicLinks: 25fd455b8f47be4fc7e92bd80db17d448196e9ba RNFBMessaging: 3bb7dcf398789ce359a9f6b97b83472a3090f65a - RNGestureHandler: b6b359bb800ae399a9c8b27032bdbf7c18f08a08 + RNGestureHandler: 9b7e605a741412e20e13c512738a31bd1611759b RNIap: b4c77c8bc4501203f4b743126a05da23f10f40b4 RNImageCropPicker: 9e0bf18cf4184a846fed55747c8e622208b39947 RNReanimated: e03f7425cb7a38dcf1b644d680d1bfc91c3337ad diff --git a/package.json b/package.json index ecd1eda3aa..4461169521 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,6 @@ "@esteemapp/react-native-multi-slider": "^1.1.0", "@esteemapp/react-native-render-html": "^4.1.5", "@esteemapp/react-native-slider": "^0.12.0", - "@gorhom/bottom-sheet": "^2", "@hiveio/dhive": "^0.14.12", "@react-native-community/async-storage": "^1.11.0", "@react-native-community/cameraroll": "^1.3.0", @@ -66,6 +65,7 @@ "react": "16.9.0", "react-intl": "^3.9.2", "react-native": "0.61.5", + "react-native-actions-sheet": "^0.4.2", "react-native-actionsheet": "ecency/react-native-actionsheet", "react-native-autoheight-webview": "^1.5.2", "react-native-config": "luggit/react-native-config#master", @@ -73,7 +73,7 @@ "react-native-date-picker": "^3.2.7", "react-native-extended-stylesheet": "^0.10.0", "react-native-fast-image": "^8.3.2", - "react-native-gesture-handler": "^1.4.1", + "react-native-gesture-handler": "^1.9.0", "react-native-highlight-words": "^1.0.1", "react-native-iap": "3.4.15", "react-native-image-crop-picker": "^0.35.2", @@ -88,7 +88,7 @@ "react-native-navigation-bar-color": "^1.0.0", "react-native-push-notification": "^3.5.1", "react-native-qrcode-svg": "^6.0.3", - "react-native-reanimated": "^1.3.0", + "react-native-reanimated": "^1", "react-native-receive-sharing-intent": "ecency/react-native-receive-sharing-intent", "react-native-restart": "0.0.17", "react-native-safe-area-context": "^3.1.9", diff --git a/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js b/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js index 65ddf8b4aa..3e89eec1db 100644 --- a/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js +++ b/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js @@ -29,29 +29,26 @@ const AccountsBottomSheetContainer = ({ navigation }) => { }, [isVisibleAccountsBottomSheet]); const _navigateToRoute = (routeName = null) => { + dispatch(toggleAccountsBottomSheet(false)); + accountsBottomSheetViewRef.current?.closeAccountsBottomSheet(); if (routeName) { - accountsBottomSheetViewRef.current?.closeAccountsBottomSheet(); - setTimeout(() => { - navigate({ routeName }); - }, 500); + navigate({ routeName }); } }; + const _onClose = () => { + dispatch(toggleAccountsBottomSheet(false)); + }; + const _switchAccount = async (account = {}) => { - if (account.username !== currentAccount.name) { + dispatch(toggleAccountsBottomSheet(false)); + accountsBottomSheetViewRef.current?.closeAccountsBottomSheet(); + if (currentAccount && account && account.username !== currentAccount.name) { _handleSwitch(account); - } else { - accountsBottomSheetViewRef.current?.closeAccountsBottomSheet(); } }; const _handleSwitch = async (switchingAccount = {}) => { - // Call this dispatch because when we make request, onDismiss is not working - // ========================================================================= - accountsBottomSheetViewRef.current?.closeAccountsBottomSheet(); - dispatch(toggleAccountsBottomSheet()); - // ========================================================================= - const accountData = accounts.filter( (account) => account.username === switchingAccount.username, )[0]; @@ -89,6 +86,7 @@ const AccountsBottomSheetContainer = ({ navigation }) => { currentAccount={currentAccount} navigateToRoute={_navigateToRoute} switchAccount={_switchAccount} + onClose={_onClose} /> ); }; diff --git a/src/components/accountsBottomSheet/view/accountsBottomSheetStyles.js b/src/components/accountsBottomSheet/view/accountsBottomSheetStyles.js index 2bba44d4fe..ae9257b9c4 100644 --- a/src/components/accountsBottomSheet/view/accountsBottomSheetStyles.js +++ b/src/components/accountsBottomSheet/view/accountsBottomSheetStyles.js @@ -8,8 +8,9 @@ export default EStyleSheet.create({ backgroundColor: 'grey', }, contentContainer: { - flex: 1, - alignItems: 'center', + //flex: 1, + //alignItems: 'center', + paddingVertical: 10, }, backdrop: { position: 'absolute', @@ -90,7 +91,7 @@ export default EStyleSheet.create({ flexDirection: 'row', paddingHorizontal: 16, alignItems: 'center', - flex: 1, + //flex: 1, justifyContent: 'space-between', }, nameContainer: { @@ -106,7 +107,6 @@ export default EStyleSheet.create({ }, accountsModal: { backgroundColor: '$primaryBackgroundColor', - flex: 1, }, handleComponent: { backgroundColor: '$primaryBackgroundColor', diff --git a/src/components/accountsBottomSheet/view/accountsBottomSheetView.js b/src/components/accountsBottomSheet/view/accountsBottomSheetView.js index c42dd99754..6d68bc2550 100644 --- a/src/components/accountsBottomSheet/view/accountsBottomSheetView.js +++ b/src/components/accountsBottomSheet/view/accountsBottomSheetView.js @@ -1,16 +1,12 @@ import React, { useCallback, useMemo, useRef, forwardRef, useImperativeHandle } from 'react'; -import { View, Text } from 'react-native'; +import { View, Text, Dimensions, TouchableWithoutFeedback, TouchableOpacity } from 'react-native'; import { useDispatch } from 'react-redux'; import { useIntl } from 'react-intl'; -import { - BottomSheetModal, - TouchableOpacity, - TouchableWithoutFeedback, - BottomSheetModalProvider, - BottomSheetFlatList, -} from '@gorhom/bottom-sheet'; +import ActionSheet from 'react-native-actions-sheet'; + import { useSafeAreaInsets } from 'react-native-safe-area-context'; +import { FlatList } from 'react-native-gesture-handler'; import { toggleAccountsBottomSheet } from '../../../redux/actions/uiAction'; import { UserAvatar, Icon, TextButton, Separator } from '../../index'; @@ -20,34 +16,27 @@ import { default as ROUTES } from '../../../constants/routeNames'; import styles from './accountsBottomSheetStyles'; import { switchAccount } from '../../../providers/hive/auth'; +const windowHeight = Dimensions.get('window').height; + const AccountsBottomSheet = forwardRef( - ({ accounts, currentAccount, navigateToRoute, switchAccount }, ref) => { + ({ accounts, currentAccount, navigateToRoute, switchAccount, onClose }, ref) => { const dispatch = useDispatch(); const bottomSheetModalRef = useRef(); + const userList = useRef(); const insets = useSafeAreaInsets(); const intl = useIntl(); - const snapPoints = [accounts.length <= 4 ? accounts.length * 60 + 150 : 405]; - useImperativeHandle(ref, () => ({ showAccountsBottomSheet() { - bottomSheetModalRef.current?.present(); + bottomSheetModalRef.current?.setModalVisible(true); }, closeAccountsBottomSheet() { - _handleCloseBottomSheet(); + bottomSheetModalRef.current?.setModalVisible(false); }, })); - const _handleCloseBottomSheet = () => { - bottomSheetModalRef.current?.dismiss(); - }; - - const _handleDispatchDismissBottomSheet = () => { - dispatch(toggleAccountsBottomSheet()); - }; - //_handlePressAccountTile(item) - const _renderAccountTile = (item) => ( + const _renderAccountTile = ({ item }) => ( switchAccount(item)}> @@ -61,65 +50,48 @@ const AccountsBottomSheet = forwardRef( ); - const renderHandleComponent = () => ( - - - - ); - return ( - - ( - - )} - ref={bottomSheetModalRef} - index={0} - snapPoints={snapPoints} - onDismiss={_handleDispatchDismissBottomSheet} - shouldMeasureContentHeight={true} - handleComponent={renderHandleComponent} - > - - `${item.name}${item.username}${index}`} - renderItem={({ item }) => _renderAccountTile(item)} - //contentContainerStyle={styles.contentContainer} - /> + + + `${item.name || item.username}${index}`} + renderItem={_renderAccountTile} + contentContainerStyle={styles.contentContainer} + nestedScrollEnabled={true} + onScrollEndDrag={() => bottomSheetModalRef.current?.handleChildScrollEnd()} + onScrollAnimationEnd={() => bottomSheetModalRef.current?.handleChildScrollEnd()} + onMomentumScrollEnd={() => bottomSheetModalRef.current?.handleChildScrollEnd()} + /> + + + navigateToRoute(ROUTES.SCREENS.REGISTER)} + > + + + {intl.formatMessage({ id: 'side_menu.create_a_new_account' })} + + + + + navigateToRoute(ROUTES.SCREENS.LOGIN)} + > + + + {intl.formatMessage({ id: 'side_menu.add_an_existing_account' })} + + + - - navigateToRoute(ROUTES.SCREENS.REGISTER)} - > - - - {intl.formatMessage({ id: 'side_menu.create_a_new_account' })} - - - - - navigateToRoute(ROUTES.SCREENS.LOGIN)} - > - - - {intl.formatMessage({ id: 'side_menu.add_an_existing_account' })} - - - - - - - + + ); }, ); diff --git a/src/components/postCard/view/postCardView.js b/src/components/postCard/view/postCardView.js index bb336762c2..1593fba165 100644 --- a/src/components/postCard/view/postCardView.js +++ b/src/components/postCard/view/postCardView.js @@ -6,6 +6,7 @@ import ImageSize from 'react-native-image-size'; // Utils import { getTimeFromNow } from '../../../utils/time'; +import bugsnag from '../../../config/bugsnag'; // Components import { PostHeaderDescription } from '../../postElements'; @@ -71,9 +72,18 @@ const PostCardView = ({ return { image: NSFW_IMAGE, thumbnail: NSFW_IMAGE }; } //console.log(content) - ImageSize.getSize(content.thumbnail).then((size) => { - setCalcImgHeight(Math.floor((size.height / size.width) * dim.width)); - }); + ImageSize.getSize(content.thumbnail) + .then((size) => { + setCalcImgHeight(Math.floor((size.height / size.width) * dim.width)); + }) + .catch((er) => { + setCalcImgHeight(Math.floor((10 / 7) * dim.width)); + bugsnag.notify(er, (report) => { + report.metadata = { + content, + }; + }); + }); return { image: content.image, thumbnail: content.thumbnail }; } else { return { image: DEFAULT_IMAGE, thumbnail: DEFAULT_IMAGE }; diff --git a/src/components/posts/view/postsView.js b/src/components/posts/view/postsView.js index cd4bc6dce1..05c5835800 100644 --- a/src/components/posts/view/postsView.js +++ b/src/components/posts/view/postsView.js @@ -143,6 +143,7 @@ const PostsView = ({ `${item._id || item.id}${index}`} renderItem={({ item, index }) => ( `${item.id || item.title}${index}`} renderItem={({ item, index }) => ( props name navigation coming from react-navigation * */ - -class SideMenuContainer extends Component { +const SideMenuContainer = ({ navigation }) => { // Component Functions + const dispatch = useDispatch(); + + const isLoggedIn = useSelector((state) => state.application.isLoggedIn); + const currentAccount = useSelector((state) => state.account.currentAccount); + const otherAccounts = useSelector((state) => state.account.otherAccounts); + const isVisibleAccountsBottomSheet = useSelector( + (state) => state.ui.isVisibleAccountsBottomSheet, + ); - _navigateToRoute = (route = null) => { - const { navigation } = this.props; + const _navigateToRoute = (route = null) => { if (route) { navigation.navigate(route); } }; - _handleLogout = () => { - const { logout, navigation } = this.props; - + const _handleLogout = () => { navigation.closeDrawer(); - logout(); + dispatch(logout()); }; - _handlePressOptions = () => { - const { toggleAccountsBottomSheet } = this.props; - - toggleAccountsBottomSheet(); + const _handlePressOptions = () => { + dispatch(toggleAccountsBottomSheet(!isVisibleAccountsBottomSheet)); }; - render() { - const { currentAccount, isLoggedIn } = this.props; - - return ( - - ); - } -} + return ( + + ); +}; -const mapStateToProps = (state) => ({ +/*const mapStateToProps = (state) => ({ isLoggedIn: state.application.isLoggedIn, currentAccount: state.account.currentAccount, otherAccounts: state.account.otherAccounts, @@ -63,6 +61,6 @@ const mapStateToProps = (state) => ({ const mapDispatchToProps = { toggleAccountsBottomSheet, logout, -}; +};*/ -export default connect(mapStateToProps, mapDispatchToProps)(SideMenuContainer); +export default SideMenuContainer; diff --git a/src/redux/reducers/uiReducer.js b/src/redux/reducers/uiReducer.js index 0f2a9f2ce9..cda88257aa 100644 --- a/src/redux/reducers/uiReducer.js +++ b/src/redux/reducers/uiReducer.js @@ -43,7 +43,7 @@ export default function (state = initialState, action) { case TOGGLE_ACCOUNTS_BOTTOM_SHEET: return { ...state, - isVisibleAccountsBottomSheet: !state.isVisibleAccountsBottomSheet, + isVisibleAccountsBottomSheet: action.payload, }; default: return state; diff --git a/yarn.lock b/yarn.lock index 68d4069ba0..09a7e733c8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -805,25 +805,6 @@ resolved "https://registry.yarnpkg.com/@formatjs/intl-utils/-/intl-utils-2.3.0.tgz#2dc8c57044de0340eb53a7ba602e59abf80dc799" integrity sha512-KWk80UPIzPmUg+P0rKh6TqspRw0G6eux1PuJr+zz47ftMaZ9QDwbGzHZbtzWkl5hgayM/qrKRutllRC7D/vVXQ== -"@gorhom/bottom-sheet@^2": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@gorhom/bottom-sheet/-/bottom-sheet-2.0.3.tgz#af72d3c934b0d397729f59c9108c5e2664cf0585" - integrity sha512-yTyefTzaXy4D/7td3rcSf0MAzmcZmwakYuhs+OeB+OwPJ+OwOZXm4t1TtDp5K/R9VZvLvFWHgKlQR8dlDxxENA== - dependencies: - "@gorhom/portal" "^0.1.4" - invariant "^2.2.4" - lodash.isequal "^4.5.0" - nanoid "^3.1.20" - react-native-redash "^14.2.4" - -"@gorhom/portal@^0.1.4": - version "0.1.4" - resolved "https://registry.yarnpkg.com/@gorhom/portal/-/portal-0.1.4.tgz#ef9e50d4b6c98ebe606a16d22d6cb58d661421b4" - integrity sha512-iU3D0i9NureT5ULTvD8moF2FWyFvVGcr/ahcRMDzBblUO1AwwixZRZ+Lf3d6uk0w4ujOQZ7+Az+uUnI+AsXXBw== - dependencies: - lodash.isequal "^4.5.0" - nanoid "^3.1.20" - "@hapi/address@2.x.x": version "2.1.4" resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5" @@ -1449,11 +1430,6 @@ abort-controller@^3.0.0: dependencies: event-target-shim "^5.0.0" -abs-svg-path@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/abs-svg-path/-/abs-svg-path-0.1.1.tgz#df601c8e8d2ba10d4a76d625e236a9a39c2723bf" - integrity sha1-32Acjo0roQ1KdtYl4japo5wnI78= - absolute-path@^0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/absolute-path/-/absolute-path-0.0.0.tgz#a78762fbdadfb5297be99b15d35a785b2f095bf7" @@ -3945,6 +3921,19 @@ fbjs@^1.0.0: setimmediate "^1.0.5" ua-parser-js "^0.7.18" +fbjs@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-3.0.0.tgz#0907067fb3f57a78f45d95f1eacffcacd623c165" + integrity sha512-dJd4PiDOFuhe7vk4F80Mba83Vr2QuK86FoxtgPmzBqEJahncp+13YCmfoa53KHCo6OnlXLG7eeMWPfB5CrpVKg== + dependencies: + cross-fetch "^3.0.4" + fbjs-css-vars "^1.0.0" + loose-envify "^1.0.0" + object-assign "^4.1.0" + promise "^7.1.1" + setimmediate "^1.0.5" + ua-parser-js "^0.7.18" + fd-slicer@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" @@ -5821,11 +5810,6 @@ lodash.flattendeep@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2" integrity sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI= -lodash.isequal@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" - integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= - lodash.merge@^4.6.0: version "4.6.2" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" @@ -6508,11 +6492,6 @@ nan@^2.12.1, nan@^2.14.0: resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01" integrity sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw== -nanoid@^3.1.20: - version "3.1.20" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788" - integrity sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw== - nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" @@ -6626,13 +6605,6 @@ normalize-path@^2.1.1: dependencies: remove-trailing-separator "^1.0.1" -normalize-svg-path@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/normalize-svg-path/-/normalize-svg-path-1.1.0.tgz#0e614eca23c39f0cffe821d6be6cd17e569a766c" - integrity sha512-r9KHKG2UUeB5LoTouwDzBy2VxXlHsiM6fyLQvnJa0S5hrhzqElH/CH7TUGhT1fVvIYBIKf3OpY4YJ4CK+iaqHg== - dependencies: - svg-arc-to-cubic-bezier "^3.0.0" - npm-path@^2.0.2: version "2.0.4" resolved "https://registry.yarnpkg.com/npm-path/-/npm-path-2.0.4.tgz#c641347a5ff9d6a09e4d9bce5580c4f505278e64" @@ -7034,11 +7006,6 @@ parse-node-version@^1.0.0: resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b" integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA== -parse-svg-path@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/parse-svg-path/-/parse-svg-path-0.1.2.tgz#7a7ec0d1eb06fa5325c7d3e009b859a09b5d49eb" - integrity sha1-en7A0esG+lMlx9PgCbhZoJtdSes= - parse5@4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608" @@ -7496,6 +7463,11 @@ react-lifecycles-compat@^3.0.4: resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== +react-native-actions-sheet@^0.4.2: + version "0.4.2" + resolved "https://registry.yarnpkg.com/react-native-actions-sheet/-/react-native-actions-sheet-0.4.2.tgz#9717f2a72c065db8dadf69577264b8ad32ba91e9" + integrity sha512-yeOOggOSAcj7/+U+TwFBhPLi820a1mKAPZcFyOSgJrkQOTpSKw9vnMpqO+ciBH0ngptQq/30CpAH+P+Di3EJ7g== + react-native-actionsheet@ecency/react-native-actionsheet: version "2.4.2" resolved "https://codeload.github.com/ecency/react-native-actionsheet/tar.gz/c74540db08a4c2049ee9c8a8077b5c476b536e2c" @@ -7547,13 +7519,14 @@ react-native-fast-image@^8.3.2: resolved "https://registry.yarnpkg.com/react-native-fast-image/-/react-native-fast-image-8.3.2.tgz#e9db271b70b9634b7be054760914d80954f9898c" integrity sha512-AJ0b4BEswRwa0bh4SibYUtXszEiaO88Lf4CZ1ib+t5ZfkAgsMk9Liv3L0LYnDblMJmSeGTr1+2ViIM8F2vamjg== -react-native-gesture-handler@^1.4.1: - version "1.7.0" - resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-1.7.0.tgz#0ef74a5ba836832e497dc49eb1ce58baa6c617e5" - integrity sha512-1CrjJf8Z6Iz2XWzfZknYtsm2sud5Lu/pLhhokkgBIKttxqGDtetDEVFDJOTJWJyKCrUPk0X5tnWi/diSF4q++w== +react-native-gesture-handler@^1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-1.9.0.tgz#e441b1c0277c3fd4ca3e5c58fdd681e2f0ceddf0" + integrity sha512-fkkNeWDBzDdwDxDcxtYbrb9T1g0PLgT1AxBs2iO/p7uEbDbC6mIoL/NzuOnKNEBHcd0lpLoJuNmIfdmucEON5g== dependencies: "@egjs/hammerjs" "^2.0.17" - hoist-non-react-statics "^2.3.1" + fbjs "^3.0.0" + hoist-non-react-statics "^3.3.0" invariant "^2.2.4" prop-types "^15.7.2" @@ -7662,7 +7635,7 @@ react-native-qrcode-svg@^6.0.3: prop-types "^15.5.10" qrcode "^1.3.2" -react-native-reanimated@^1.3.0: +react-native-reanimated@^1: version "1.13.2" resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-1.13.2.tgz#1ae5457b24b4913d173a5a064bb28eae7783d293" integrity sha512-O+WhgxSjOIzcVdAAvx+h2DY331Ek1knKlaq+jsNLpC1fhRy9XTdOObovgob/aF2ve9uJfPEawCx8381g/tUJZQ== @@ -7673,15 +7646,6 @@ react-native-receive-sharing-intent@ecency/react-native-receive-sharing-intent: version "1.0.4" resolved "https://codeload.github.com/ecency/react-native-receive-sharing-intent/tar.gz/02d179b5eed6e18bd887248b8d9d2cb2cad0cb18" -react-native-redash@^14.2.4: - version "14.2.4" - resolved "https://registry.yarnpkg.com/react-native-redash/-/react-native-redash-14.2.4.tgz#5dbb4b2f1a7441bb304fe3494b89e0dc9010c8ef" - integrity sha512-/1R9UxXv3ffKcrbxolqa2B247Cgd3ikyEm2q1VlBng77Es6PAD4LAOXQ83pBavvwNfOsbhF3ebkbMpJcLaVt3Q== - dependencies: - abs-svg-path "^0.1.1" - normalize-svg-path "^1.0.1" - parse-svg-path "^0.1.2" - react-native-restart@0.0.17: version "0.0.17" resolved "https://registry.yarnpkg.com/react-native-restart/-/react-native-restart-0.0.17.tgz#c1f38e019d1a2114248d496698e7951e9435ba91" @@ -9008,11 +8972,6 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" -svg-arc-to-cubic-bezier@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/svg-arc-to-cubic-bezier/-/svg-arc-to-cubic-bezier-3.2.0.tgz#390c450035ae1c4a0104d90650304c3bc814abe6" - integrity sha512-djbJ/vZKZO+gPoSDThGNpKDO+o+bAeA4XQKovvkNCqnIS2t+S4qnLAGQhyyrulhCFRl1WWzAp0wUDV8PpTVU3g== - symbol-observable@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4" From 4990b66234d07b1132016128ba8b875e0807df1c Mon Sep 17 00:00:00 2001 From: feruz Date: Wed, 3 Feb 2021 10:27:43 +0200 Subject: [PATCH 14/32] cleanup --- .vscode/settings.json | 3 + .../view/accountsBottomSheetStyles.js | 102 ------------------ .../view/accountsBottomSheetView.js | 6 +- .../sideMenu/container/sideMenuContainer.js | 18 ---- 4 files changed, 5 insertions(+), 124 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 5e095a299f..d4f78b4505 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -9,5 +9,8 @@ "**/.project": true, "**/.settings": true, "**/.factorypath": true + }, + "workbench.colorCustomizations": { + "editorUnnecessaryCode.border": "#dd7aab" } } \ No newline at end of file diff --git a/src/components/accountsBottomSheet/view/accountsBottomSheetStyles.js b/src/components/accountsBottomSheet/view/accountsBottomSheetStyles.js index ae9257b9c4..98239c4c82 100644 --- a/src/components/accountsBottomSheet/view/accountsBottomSheetStyles.js +++ b/src/components/accountsBottomSheet/view/accountsBottomSheetStyles.js @@ -1,127 +1,25 @@ import EStyleSheet from 'react-native-extended-stylesheet'; export default EStyleSheet.create({ - container: { - flex: 1, - padding: 24, - justifyContent: 'center', - backgroundColor: 'grey', - }, contentContainer: { - //flex: 1, - //alignItems: 'center', paddingVertical: 10, }, - backdrop: { - position: 'absolute', - height: '$deviceHeight', - width: '$deviceWidth', - backgroundColor: 'rgba(0, 0, 0, 0.5)', - }, - otherUserAvatar: { - borderWidth: 0.1, - borderColor: '$borderColor', - marginLeft: -7, - marginRight: 10, - }, - userInfoWrapper: { - alignSelf: 'center', - marginLeft: 15, - width: 120, - }, - listItem: { - marginVertical: 15, - }, - listItemIcon: { - color: '$iconColor', - fontSize: 20, - marginRight: 5, - width: 20, - }, - listItemText: { - color: '$primaryDarkGray', - marginLeft: 12, - alignSelf: 'center', - fontWeight: '500', - fontSize: 14, - flex: 1, - }, - buttonText: { - fontSize: 18, - fontFamily: '$primaryFont', - textAlign: 'center', - margin: 10, - color: '$white', - backgroundColor: 'transparent', - }, - addAccountWrapper: { - alignSelf: 'flex-end', - justifyContent: 'center', - flex: 1, - flexDirection: 'row', - }, - itemWrapper: { - flexDirection: 'row', - marginLeft: 55, - }, - versionText: { - textAlign: 'center', - color: '$iconColor', - }, - imageBackground: { - width: '100%', - height: '100%', - flexDirection: 'row', - }, - iconWrapper: { - width: 32, - height: 32, - borderRadius: 16, - borderColor: 'white', - borderWidth: 1, - alignItems: 'center', - justifyContent: 'center', - }, - optionIcon: { - height: 16, - width: 16, - }, accountTile: { height: 60, flexDirection: 'row', paddingHorizontal: 16, alignItems: 'center', - //flex: 1, justifyContent: 'space-between', }, nameContainer: { marginLeft: 8, }, - displayName: { - fontWeight: '600', - fontSize: 16, - color: '$primaryBlack', - }, name: { color: '$primaryDarkGray', }, accountsModal: { backgroundColor: '$primaryBackgroundColor', }, - handleComponent: { - backgroundColor: '$primaryBackgroundColor', - height: 20, - borderTopLeftRadius: 10, - borderTopRightRadius: 10, - alignItems: 'center', - justifyContent: 'center', - }, - handle: { - height: 3, - width: 24, - backgroundColor: '$darkIconColor', - borderRadius: 12, - }, textButton: { color: '$primaryBlue', fontSize: 16, diff --git a/src/components/accountsBottomSheet/view/accountsBottomSheetView.js b/src/components/accountsBottomSheet/view/accountsBottomSheetView.js index 6d68bc2550..d069e75f64 100644 --- a/src/components/accountsBottomSheet/view/accountsBottomSheetView.js +++ b/src/components/accountsBottomSheet/view/accountsBottomSheetView.js @@ -1,5 +1,5 @@ import React, { useCallback, useMemo, useRef, forwardRef, useImperativeHandle } from 'react'; -import { View, Text, Dimensions, TouchableWithoutFeedback, TouchableOpacity } from 'react-native'; +import { View, Text, TouchableWithoutFeedback, TouchableOpacity } from 'react-native'; import { useDispatch } from 'react-redux'; import { useIntl } from 'react-intl'; import ActionSheet from 'react-native-actions-sheet'; @@ -16,8 +16,6 @@ import { default as ROUTES } from '../../../constants/routeNames'; import styles from './accountsBottomSheetStyles'; import { switchAccount } from '../../../providers/hive/auth'; -const windowHeight = Dimensions.get('window').height; - const AccountsBottomSheet = forwardRef( ({ accounts, currentAccount, navigateToRoute, switchAccount, onClose }, ref) => { const dispatch = useDispatch(); @@ -51,7 +49,7 @@ const AccountsBottomSheet = forwardRef( ); return ( - + props name navigation coming from react-navigation - * - */ const SideMenuContainer = ({ navigation }) => { - // Component Functions const dispatch = useDispatch(); const isLoggedIn = useSelector((state) => state.application.isLoggedIn); @@ -52,15 +45,4 @@ const SideMenuContainer = ({ navigation }) => { ); }; -/*const mapStateToProps = (state) => ({ - isLoggedIn: state.application.isLoggedIn, - currentAccount: state.account.currentAccount, - otherAccounts: state.account.otherAccounts, -}); - -const mapDispatchToProps = { - toggleAccountsBottomSheet, - logout, -};*/ - export default SideMenuContainer; From 14bcddebf26fa451122a34bd50ee2f6c6713bb45 Mon Sep 17 00:00:00 2001 From: feruz Date: Wed, 3 Feb 2021 10:29:25 +0200 Subject: [PATCH 15/32] render helper fix --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 4461169521..0093bacec8 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ }, "dependencies": { "@babel/runtime": "^7.5.5", - "@ecency/render-helper": "^2.0.15", + "@ecency/render-helper": "^2.0.16", "@esteemapp/dhive": "0.15.0", "@esteemapp/react-native-autocomplete-input": "^4.2.1", "@esteemapp/react-native-modal-popover": "^0.0.15", diff --git a/yarn.lock b/yarn.lock index 09a7e733c8..787fd2fa4f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -698,10 +698,10 @@ exec-sh "^0.3.2" minimist "^1.2.0" -"@ecency/render-helper@^2.0.15": - version "2.0.15" - resolved "https://registry.yarnpkg.com/@ecency/render-helper/-/render-helper-2.0.15.tgz#8e78a2d771d44dc6e77bf63bbf786589cf11a772" - integrity sha512-II3TAdSy3pCqcuWgL81ZJ8N8jVrQR5rosxA8kGc40/vHeoDPhgLmUUxmykJVZUubejOTtowyIpjSu8g7sJkXRg== +"@ecency/render-helper@^2.0.16": + version "2.0.16" + resolved "https://registry.yarnpkg.com/@ecency/render-helper/-/render-helper-2.0.16.tgz#f67a6ffde8557e2b21d5bebf887570052376f42b" + integrity sha512-Km+KhjVSLV10Ogql3Xv8VCKQQmbZwIE54LW2dtn3MezrqZmrGTB4Dcf/8JJAN0CKvKqd17EXsfm/ybHwE+DSZA== dependencies: he "^1.2.0" lru-cache "^5.1.1" From 7e8f56d8ff81ecc6da91b65242cb283bbeb9c48c Mon Sep 17 00:00:00 2001 From: feruz Date: Wed, 3 Feb 2021 11:49:00 +0200 Subject: [PATCH 16/32] deeplinking improved --- .../upvote/container/upvoteContainer.js | 2 +- .../container/applicationContainer.js | 25 ++++++++-- src/utils/postUrlParser.js | 50 ++++++++++++------- 3 files changed, 56 insertions(+), 21 deletions(-) diff --git a/src/components/upvote/container/upvoteContainer.js b/src/components/upvote/container/upvoteContainer.js index d8ffaeaa3b..499992177d 100644 --- a/src/components/upvote/container/upvoteContainer.js +++ b/src/components/upvote/container/upvoteContainer.js @@ -71,7 +71,7 @@ class UpvoteContainer extends PureComponent { const payoutDate = getTimeFromNow(get(content, 'payout_at')); const beneficiaries = []; const beneficiary = get(content, 'beneficiaries'); - if (beneficiaries) { + if (beneficiary) { beneficiary.forEach((key) => { beneficiaries.push( `\n ${get(key, 'account')}: ${(parseFloat(get(key, 'weight')) / 100).toFixed(2)}%`, diff --git a/src/screens/application/container/applicationContainer.js b/src/screens/application/container/applicationContainer.js index 888155e97e..ff16f63003 100644 --- a/src/screens/application/container/applicationContainer.js +++ b/src/screens/application/container/applicationContainer.js @@ -256,10 +256,11 @@ class ApplicationContainer extends Component { let params; let content; let profile; + let keey; const { currentAccount } = this.props; const postUrl = postUrlParser(url); - const { author, permlink } = postUrl || {}; + const { author, permlink, feedType, tag } = postUrl || {}; try { if (author) { @@ -269,6 +270,7 @@ class ApplicationContainer extends Component { params = { content, }; + keey = `${author}/${permlink}`; } else { profile = await getUser(author); routeName = ROUTES.SCREENS.PROFILE; @@ -276,17 +278,34 @@ class ApplicationContainer extends Component { username: get(profile, 'name'), reputation: get(profile, 'reputation'), }; + keey = get(profile, 'name'); } } + if (feedType) { + routeName = ROUTES.SCREENS.SEARCH_RESULT; + keey = 'search'; + } + if (feedType && tag) { + if (/hive-[1-3]\d{4,6}$/.test(tag)) { + routeName = ROUTES.SCREENS.COMMUNITY; + } else { + routeName = ROUTES.SCREENS.TAG_RESULT; + } + params = { + tag, + filter: feedType, + }; + keey = `${feedType}/${tag}`; + } } catch (error) { this._handleAlert('deep_link.no_existing_user'); } - if (routeName && (profile || content)) { + if (routeName && keey) { navigate({ routeName, params, - key: permlink || author, + key: keey, }); } }; diff --git a/src/utils/postUrlParser.js b/src/utils/postUrlParser.js index 720f9ea3b0..cc72b700b7 100644 --- a/src/utils/postUrlParser.js +++ b/src/utils/postUrlParser.js @@ -72,23 +72,6 @@ export default (url) => { }; } - if ( - [ - 'https://estm.to', - 'https://ecency.com', - 'https://esteem.app', - 'https://hive.blog', - 'https://peakd.com', - 'https://leofinance.io', - ].some((x) => url.startsWith(x)) - ) { - return parseCatAuthorPermlink(url); - } - - if (['https://busy.org', 'https://steemhunt.com'].some((x) => url.startsWith(x))) { - return parseAuthorPermlink(url); - } - // For non urls like @good-karma/esteem-london-presentation-e3105ba6637ed let match = url.match(/^[/]?(@[\w.\d-]+)\/(.*)/); if (match && match.length === 3) { @@ -117,5 +100,38 @@ export default (url) => { }; } + let profile = url.match(/^https?:\/\/(.*)\/(@[\w.\d-]+)$/); + if (profile) { + if (profile && profile.length === 3) { + return { + author: profile[2].replace('@', ''), + permlink: null, + }; + } + } + + if ( + [ + 'https://estm.to', + 'https://ecency.com', + 'https://esteem.app', + 'https://hive.blog', + 'https://peakd.com', + 'https://leofinance.io', + ].some((x) => url.startsWith(x)) + ) { + return parseCatAuthorPermlink(url); + } + + if ( + [ + 'https://ecency.com', + 'https://hive.blog', + 'https://peakd.com', + 'https://leofinance.io', + ].some((x) => url.startsWith(x)) + ) { + return parseAuthorPermlink(url); + } return null; }; From cf3f59cb74506df7802831b7e060c5e138c8b624 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 3 Feb 2021 13:34:20 +0200 Subject: [PATCH 17/32] New translations en-US.json (Bulgarian) --- src/config/locales/bg-BG.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config/locales/bg-BG.json b/src/config/locales/bg-BG.json index 1a6dab735f..15800f870a 100644 --- a/src/config/locales/bg-BG.json +++ b/src/config/locales/bg-BG.json @@ -558,7 +558,7 @@ "posts": "Публикации" }, "communities_filter": { - "my": "Моите общества", + "my": "Моите Групи", "rank": "Ранг", "subs": "Членове", "new": "Нови" @@ -575,7 +575,7 @@ }, "community": { "new_post": "Нова публикация", - "community": "oбщество", + "community": "Група", "details": "Подробности" }, "user": { From 9bf214340d02f3be8f7f1c37512c9bb8c3887ee3 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 3 Feb 2021 13:45:50 +0200 Subject: [PATCH 18/32] New translations en-US.json (Bulgarian) --- src/config/locales/bg-BG.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config/locales/bg-BG.json b/src/config/locales/bg-BG.json index 15800f870a..23c0b02800 100644 --- a/src/config/locales/bg-BG.json +++ b/src/config/locales/bg-BG.json @@ -486,8 +486,8 @@ "power_down": "Намаляване на енергията", "withdraw_steem": "Изтегли Hive", "withdraw_sbd": "Изтегли Hive Долари", - "incoming_funds": "Идващи пари", - "stop": "Стоп", + "incoming_funds": "Идващи средства", + "stop": "спри", "address_view": "Преглед на адрес" }, "boost": { From c14d76195c9801612d8def105937a0d46e3e667b Mon Sep 17 00:00:00 2001 From: feruz Date: Wed, 3 Feb 2021 14:29:13 +0200 Subject: [PATCH 19/32] use pure fastimage --- src/components/postCard/view/postCardView.js | 5 +- src/components/progressiveImage/index.js | 70 ++++++++++---------- 2 files changed, 38 insertions(+), 37 deletions(-) diff --git a/src/components/postCard/view/postCardView.js b/src/components/postCard/view/postCardView.js index 1593fba165..63d33dce55 100644 --- a/src/components/postCard/view/postCardView.js +++ b/src/components/postCard/view/postCardView.js @@ -5,6 +5,7 @@ import { injectIntl } from 'react-intl'; import ImageSize from 'react-native-image-size'; // Utils +import FastImage from 'react-native-fast-image'; import { getTimeFromNow } from '../../../utils/time'; import bugsnag from '../../../config/bugsnag'; @@ -123,9 +124,9 @@ const PostCardView = ({ {!isHideImage && ( - { + //const [calcImgHeight, setCalcImgHeight] = useState(300); + const thumbnailAnimated = new Animated.Value(0); + const imageAnimated = new Animated.Value(0); - handleThumbnailLoad = () => { - Animated.timing(this.thumbnailAnimated, { + const handleThumbnailLoad = (e) => { + /*if (e) { + setCalcImgHeight(Math.floor((e.nativeEvent.height / e.nativeEvent.width) * dim.width)); + console.log(e.nativeEvent.width, e.nativeEvent.height); + }*/ + Animated.timing(thumbnailAnimated, { toValue: 1, }).start(); }; - onImageLoad = () => { - Animated.timing(this.imageAnimated, { + const onImageLoad = () => { + Animated.timing(imageAnimated, { toValue: 1, }).start(); }; - render() { - const { thumbnailSource, source, style, ...props } = this.props; - - return ( - - - - - ); - } -} + return ( + + + + + ); +}; export default ProgressiveImage; From f067a864aa661b5e8b921cd255caf68d4107feaa Mon Sep 17 00:00:00 2001 From: feruz Date: Wed, 3 Feb 2021 15:29:09 +0200 Subject: [PATCH 20/32] update ratio thumbnail --- src/components/postCard/view/postCardView.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/components/postCard/view/postCardView.js b/src/components/postCard/view/postCardView.js index 63d33dce55..c3c8fd9960 100644 --- a/src/components/postCard/view/postCardView.js +++ b/src/components/postCard/view/postCardView.js @@ -73,12 +73,14 @@ const PostCardView = ({ return { image: NSFW_IMAGE, thumbnail: NSFW_IMAGE }; } //console.log(content) + let ratio = 10 / 7; ImageSize.getSize(content.thumbnail) .then((size) => { - setCalcImgHeight(Math.floor((size.height / size.width) * dim.width)); + ratio = size.height / size.width; + setCalcImgHeight(Math.floor(ratio * (dim.width - 18))); }) .catch((er) => { - setCalcImgHeight(Math.floor((10 / 7) * dim.width)); + setCalcImgHeight(Math.floor(ratio * (dim.width - 18))); bugsnag.notify(er, (report) => { report.metadata = { content, @@ -131,6 +133,7 @@ const PostCardView = ({ styles.thumbnail, { width: dim.width - 18, height: Math.min(calcImgHeight, dim.height) }, ]} + resizeMode={FastImage.resizeMode.cover} /> )} From 40c983176b6c4e63c7ca9a14c261540693589253 Mon Sep 17 00:00:00 2001 From: feruz Date: Thu, 4 Feb 2021 07:25:11 +0200 Subject: [PATCH 21/32] thumbnail size stateful --- src/components/postCard/view/postCardView.js | 62 ++++++++++---------- src/components/posts/view/postsView.js | 2 +- src/screens/reblogs/screen/reblogScreen.js | 4 +- 3 files changed, 33 insertions(+), 35 deletions(-) diff --git a/src/components/postCard/view/postCardView.js b/src/components/postCard/view/postCardView.js index c3c8fd9960..3f7c56b441 100644 --- a/src/components/postCard/view/postCardView.js +++ b/src/components/postCard/view/postCardView.js @@ -19,9 +19,6 @@ import { Upvote } from '../../upvote'; // Styles import styles from './postCardStyles'; -// Defaults -import ProgressiveImage from '../../progressiveImage'; - const dim = Dimensions.get('window'); const DEFAULT_IMAGE = 'https://images.ecency.com/DQmT8R33geccEjJfzZEdsRHpP3VE8pu3peRCnQa1qukU4KR/no_image_3x.png'; @@ -44,6 +41,7 @@ const PostCardView = ({ const [rebloggedBy, setRebloggedBy] = useState(get(content, 'reblogged_by[0]', null)); const [activeVot, setActiveVot] = useState(activeVotes); const [calcImgHeight, setCalcImgHeight] = useState(300); + const [images, setImages] = useState({}); //console.log(activeVotes); // Component Functions @@ -67,44 +65,44 @@ const PostCardView = ({ } }; - const _getPostImage = (content, isNsfwPost) => { - if (content && content.thumbnail) { - if (isNsfwPost && content.nsfw) { - return { image: NSFW_IMAGE, thumbnail: NSFW_IMAGE }; - } - //console.log(content) - let ratio = 10 / 7; - ImageSize.getSize(content.thumbnail) - .then((size) => { - ratio = size.height / size.width; - setCalcImgHeight(Math.floor(ratio * (dim.width - 18))); - }) - .catch((er) => { - setCalcImgHeight(Math.floor(ratio * (dim.width - 18))); - bugsnag.notify(er, (report) => { - report.metadata = { - content, - }; - }); - }); - return { image: content.image, thumbnail: content.thumbnail }; - } else { - return { image: DEFAULT_IMAGE, thumbnail: DEFAULT_IMAGE }; - } - }; - useEffect(() => { if (content) { const _rebloggedBy = get(content, 'reblogged_by[0]', null); setRebloggedBy(_rebloggedBy); + + if (content.thumbnail) { + if (isNsfwPost && content.nsfw) { + setImages({ image: NSFW_IMAGE, thumbnail: NSFW_IMAGE }); + } + //console.log(content) + let ratio = 10 / 7; + ImageSize.getSize(content.thumbnail) + .then((size) => { + ratio = size.height / size.width; + setCalcImgHeight(Math.floor(ratio * (dim.width - 18))); + }) + .catch((er) => { + setCalcImgHeight(Math.floor(ratio * (dim.width - 18))); + bugsnag.notify(er, (report) => { + report.metadata = { + content, + }; + }); + }); + setImages({ image: content.image, thumbnail: content.thumbnail }); + } else { + setImages({ image: DEFAULT_IMAGE, thumbnail: DEFAULT_IMAGE }); + } } if (activeVotes) { setActiveVot(get(content, 'active_votes')); } + return () => { + setImages({ image: DEFAULT_IMAGE, thumbnail: DEFAULT_IMAGE }); + setCalcImgHeight(300); + }; }, [content]); - const _image = _getPostImage(content, isNsfwPost); - return ( @@ -127,7 +125,7 @@ const PostCardView = ({ {!isHideImage && ( { id: 'reblog.title', }); - const activeVotes = get(navigation, 'state.params.reblogs'); + const reblogs = get(navigation, 'state.params.reblogs'); return ( - + {({ data, filterResult, handleSearch, handleOnUserPress }) => ( Date: Thu, 4 Feb 2021 11:21:32 +0200 Subject: [PATCH 22/32] reply account switch and other improvements --- src/components/accountsBottomSheet/index.js | 8 +-- .../view/selectCommunityModalView.js | 3 + src/components/index.js | 4 +- .../view/markdownEditorStyles.js | 21 +++++++ .../markdownEditor/view/markdownEditorView.js | 59 ++++++++++++++++--- src/components/posts/view/postsView.js | 3 + .../container/applicationContainer.js | 11 ++++ src/screens/editor/screen/editorScreen.js | 2 + 8 files changed, 98 insertions(+), 13 deletions(-) diff --git a/src/components/accountsBottomSheet/index.js b/src/components/accountsBottomSheet/index.js index 7fbfb28f88..47329b1ccc 100644 --- a/src/components/accountsBottomSheet/index.js +++ b/src/components/accountsBottomSheet/index.js @@ -1,5 +1,5 @@ -import AccountsBottomSheetContainer from './container/accountsBottomSheetContainer'; -import AccountsBottomSheet from './view/accountsBottomSheetView'; +import AccountsBottomSheet from './container/accountsBottomSheetContainer'; +import AccountsBottomSheetView from './view/accountsBottomSheetView'; -export { AccountsBottomSheet, AccountsBottomSheetContainer }; -export default AccountsBottomSheetContainer; +export { AccountsBottomSheetView, AccountsBottomSheet }; +export default AccountsBottomSheet; diff --git a/src/components/editorElements/selectCommunityModal/view/selectCommunityModalView.js b/src/components/editorElements/selectCommunityModal/view/selectCommunityModalView.js index f41d73e2d6..9fe99da4cf 100644 --- a/src/components/editorElements/selectCommunityModal/view/selectCommunityModalView.js +++ b/src/components/editorElements/selectCommunityModal/view/selectCommunityModalView.js @@ -34,6 +34,7 @@ const SelectCommunityModalView = ({ showsVerticalScrollIndicator={false} style={styles.searchedFlatList} data={searchedCommunities} + keyExtractor={(item, index) => index.toString()} renderItem={({ item, index, separators }) => ( } showsVerticalScrollIndicator={false} data={subscribedCommunities.data} + keyExtractor={(item, index) => index.toString()} renderItem={({ item, index, separators }) => { const community = { name: item[0], title: item[1] }; return ( @@ -89,6 +91,7 @@ const SelectCommunityModalView = ({ ItemSeparatorComponent={() => } showsVerticalScrollIndicator={false} data={topCommunities.data} + keyExtractor={(item, index) => index.toString()} renderItem={({ item, index, separators }) => ( { const [text, setText] = useState(draftBody || ''); const [selection, setSelection] = useState({ start: 0, end: 0 }); @@ -50,6 +70,11 @@ const MarkdownEditorView = ({ const galleryRef = useRef(null); const clearRef = useRef(null); + const dispatch = useDispatch(); + const isVisibleAccountsBottomSheet = useSelector( + (state) => state.ui.isVisibleAccountsBottomSheet, + ); + useEffect(() => { if (!isPreviewActive) { _setTextAndSelection({ selection: { start: 0, end: 0 }, text }); @@ -102,6 +127,14 @@ const MarkdownEditorView = ({ } }, [text]); + const changeUser = async () => { + dispatch(toggleAccountsBottomSheet(!isVisibleAccountsBottomSheet)); + await AsyncStorage.setItem( + 'temp-url', + `https://ecency.com/post/@${post.author}/${post.permlink}`, + ); + }; + // eslint-disable-next-line react-hooks/exhaustive-deps const _changeText = useCallback((input) => { setText(input); @@ -255,6 +288,18 @@ const MarkdownEditorView = ({ intl={intl} /> )} + {isReply && ( + + changeUser()}> + + + + {`@${currentAccount.name}`} + + + + + )} {!isPreviewActive ? ( {({ isDarkTheme }) => ( diff --git a/src/components/posts/view/postsView.js b/src/components/posts/view/postsView.js index 379607f970..5225870264 100644 --- a/src/components/posts/view/postsView.js +++ b/src/components/posts/view/postsView.js @@ -226,6 +226,9 @@ const PostsView = ({ + + + ); }; diff --git a/src/screens/application/container/applicationContainer.js b/src/screens/application/container/applicationContainer.js index ff16f63003..47346e4e2e 100644 --- a/src/screens/application/container/applicationContainer.js +++ b/src/screens/application/container/applicationContainer.js @@ -20,6 +20,7 @@ import VersionNumber from 'react-native-version-number'; import ReceiveSharingIntent from 'react-native-receive-sharing-intent'; import Matomo from 'react-native-matomo-sdk'; import uniqueId from 'react-native-unique-id'; +import AsyncStorage from '@react-native-community/async-storage'; // Constants import AUTH_TYPE from '../../../constants/authType'; @@ -204,6 +205,15 @@ class ApplicationContainer extends Component { isRenderRequire: true, }), ); + AsyncStorage.getItem('temp-url') + .then((res) => { + if (res) { + this._handleDeepLink(res); + } + }) + .catch((e) => { + console.log(e); + }); dispatch(isRenderRequired(false)); } } @@ -252,6 +262,7 @@ class ApplicationContainer extends Component { _handleDeepLink = async (url = '') => { if (!url || url.indexOf('ShareMedia://') >= 0) return; + await AsyncStorage.setItem('temp-url', ''); let routeName; let params; let content; diff --git a/src/screens/editor/screen/editorScreen.js b/src/screens/editor/screen/editorScreen.js index 2e1a93aad3..94526e1c57 100644 --- a/src/screens/editor/screen/editorScreen.js +++ b/src/screens/editor/screen/editorScreen.js @@ -18,6 +18,7 @@ import { SelectCommunityAreaView, SelectCommunityModalContainer, Modal, + UserAvatar, } from '../../../components'; // dhive @@ -350,6 +351,7 @@ class EditorScreen extends Component { isEdit={isEdit} post={post} fields={fields} + currentAccount={currentAccount} onTagChanged={this._handleOnTagAdded} onTitleChanged={this._handleChangeTitle} getCommunity={this._getCommunity} From ba642dee6e6da945647ec96c36eb296f4602434f Mon Sep 17 00:00:00 2001 From: feruz Date: Thu, 4 Feb 2021 12:01:19 +0200 Subject: [PATCH 23/32] simplify --- .../container/accountsBottomSheetContainer.js | 4 ++-- .../markdownEditor/view/markdownEditorView.js | 5 ----- src/components/posts/container/postsContainer.js | 1 + src/containers/steemWalletContainer.js | 4 ++-- .../application/container/applicationContainer.js | 11 ----------- src/screens/editor/container/editorContainer.js | 2 +- 6 files changed, 6 insertions(+), 21 deletions(-) diff --git a/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js b/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js index 3e89eec1db..45f7a04ec9 100644 --- a/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js +++ b/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js @@ -58,7 +58,7 @@ const AccountsBottomSheetContainer = ({ navigation }) => { accountData.username = accountData.name; dispatch(updateCurrentAccount(accountData)); - dispatch(isRenderRequired(true)); + //dispatch(isRenderRequired(true)); const upToDateCurrentAccount = await switchAccount(accountData.name); const realmData = await getUserDataWithUsername(accountData.name); @@ -75,7 +75,7 @@ const AccountsBottomSheetContainer = ({ navigation }) => { _currentAccount.local = realmData[0]; dispatch(updateCurrentAccount(_currentAccount)); - dispatch(isRenderRequired(true)); + //dispatch(isRenderRequired(true)); } }; diff --git a/src/components/markdownEditor/view/markdownEditorView.js b/src/components/markdownEditor/view/markdownEditorView.js index b3dfcffa95..4a6e019b47 100644 --- a/src/components/markdownEditor/view/markdownEditorView.js +++ b/src/components/markdownEditor/view/markdownEditorView.js @@ -11,7 +11,6 @@ import { import ActionSheet from 'react-native-actionsheet'; import { renderPostBody } from '@ecency/render-helper'; import { useDispatch, useSelector } from 'react-redux'; -import AsyncStorage from '@react-native-community/async-storage'; // Utils import Formats from './formats/formats'; @@ -129,10 +128,6 @@ const MarkdownEditorView = ({ const changeUser = async () => { dispatch(toggleAccountsBottomSheet(!isVisibleAccountsBottomSheet)); - await AsyncStorage.setItem( - 'temp-url', - `https://ecency.com/post/@${post.author}/${post.permlink}`, - ); }; // eslint-disable-next-line react-hooks/exhaustive-deps diff --git a/src/components/posts/container/postsContainer.js b/src/components/posts/container/postsContainer.js index adb9d8f457..616e4f03d5 100644 --- a/src/components/posts/container/postsContainer.js +++ b/src/components/posts/container/postsContainer.js @@ -93,6 +93,7 @@ const PostsContainer = ({ _loadPosts, changeForceLoadPostState, username, + feedUsername, forceLoadPost, isConnected, pageType, diff --git a/src/containers/steemWalletContainer.js b/src/containers/steemWalletContainer.js index 3714ec5be5..c6e3e37558 100644 --- a/src/containers/steemWalletContainer.js +++ b/src/containers/steemWalletContainer.js @@ -164,8 +164,8 @@ const WalletContainer = ({ isHasUnclaimedRewards = _isHasUnclaimedRewards(account[0]); if (isHasUnclaimedRewards) { const { - reward_steem_balance: steemBal = account[0].reward_hive_balance, - reward_sbd_balance: sbdBal = account[0].reward_hbd_balance, + reward_hive_balance: steemBal, + reward_hbd_balance: sbdBal, reward_vesting_balance: vestingBal, } = account[0]; return claimRewardBalance(currentAccount, pinCode, steemBal, sbdBal, vestingBal); diff --git a/src/screens/application/container/applicationContainer.js b/src/screens/application/container/applicationContainer.js index 47346e4e2e..ff16f63003 100644 --- a/src/screens/application/container/applicationContainer.js +++ b/src/screens/application/container/applicationContainer.js @@ -20,7 +20,6 @@ import VersionNumber from 'react-native-version-number'; import ReceiveSharingIntent from 'react-native-receive-sharing-intent'; import Matomo from 'react-native-matomo-sdk'; import uniqueId from 'react-native-unique-id'; -import AsyncStorage from '@react-native-community/async-storage'; // Constants import AUTH_TYPE from '../../../constants/authType'; @@ -205,15 +204,6 @@ class ApplicationContainer extends Component { isRenderRequire: true, }), ); - AsyncStorage.getItem('temp-url') - .then((res) => { - if (res) { - this._handleDeepLink(res); - } - }) - .catch((e) => { - console.log(e); - }); dispatch(isRenderRequired(false)); } } @@ -262,7 +252,6 @@ class ApplicationContainer extends Component { _handleDeepLink = async (url = '') => { if (!url || url.indexOf('ShareMedia://') >= 0) return; - await AsyncStorage.setItem('temp-url', ''); let routeName; let params; let content; diff --git a/src/screens/editor/container/editorContainer.js b/src/screens/editor/container/editorContainer.js index 777a9909ff..3b1b0991ce 100644 --- a/src/screens/editor/container/editorContainer.js +++ b/src/screens/editor/container/editorContainer.js @@ -515,7 +515,7 @@ class EditorContainer extends Component { intl.formatMessage({ id: 'alert.fail', }), - error.error_description.split(': ')[1] || error.toString(), + error.toString(), ); } From bcc70e50054c22fd0682c1bf58a772d665de5eed Mon Sep 17 00:00:00 2001 From: feruz Date: Thu, 4 Feb 2021 12:05:23 +0200 Subject: [PATCH 24/32] username --- src/components/markdownEditor/view/markdownEditorView.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/markdownEditor/view/markdownEditorView.js b/src/components/markdownEditor/view/markdownEditorView.js index 4a6e019b47..051989a247 100644 --- a/src/components/markdownEditor/view/markdownEditorView.js +++ b/src/components/markdownEditor/view/markdownEditorView.js @@ -287,9 +287,9 @@ const MarkdownEditorView = ({ changeUser()}> - + - {`@${currentAccount.name}`} + {`@${currentAccount.username}`} From b43bad8565a53168e82af20956dd9b40da286b77 Mon Sep 17 00:00:00 2001 From: feruz Date: Thu, 4 Feb 2021 12:28:27 +0200 Subject: [PATCH 25/32] cleanup function --- src/components/basicUIElements/view/tag/tagContainer.js | 4 ++++ src/components/postCard/view/postCardView.js | 1 + 2 files changed, 5 insertions(+) diff --git a/src/components/basicUIElements/view/tag/tagContainer.js b/src/components/basicUIElements/view/tag/tagContainer.js index feb8710417..ebb07b4154 100644 --- a/src/components/basicUIElements/view/tag/tagContainer.js +++ b/src/components/basicUIElements/view/tag/tagContainer.js @@ -55,6 +55,10 @@ const TagContainer = ({ setLabel(value); setIsCommunity(false); } + return () => { + setLabel(value); + setIsCommunity(false); + }; }); // Component Functions diff --git a/src/components/postCard/view/postCardView.js b/src/components/postCard/view/postCardView.js index 3f7c56b441..1e7b93411d 100644 --- a/src/components/postCard/view/postCardView.js +++ b/src/components/postCard/view/postCardView.js @@ -100,6 +100,7 @@ const PostCardView = ({ return () => { setImages({ image: DEFAULT_IMAGE, thumbnail: DEFAULT_IMAGE }); setCalcImgHeight(300); + setActiveVot([]); }; }, [content]); From 04c75c1b70ef38e500d4fed1f667d11eedc6965b Mon Sep 17 00:00:00 2001 From: feruz Date: Thu, 4 Feb 2021 12:40:45 +0200 Subject: [PATCH 26/32] tag container unmounting fix --- .../basicUIElements/view/tag/tagContainer.js | 32 +++++++++++-------- .../posts/container/postsContainer.js | 2 +- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/components/basicUIElements/view/tag/tagContainer.js b/src/components/basicUIElements/view/tag/tagContainer.js index ebb07b4154..6a93c3c353 100644 --- a/src/components/basicUIElements/view/tag/tagContainer.js +++ b/src/components/basicUIElements/view/tag/tagContainer.js @@ -34,30 +34,36 @@ const TagContainer = ({ const [isCommunity, setIsCommunity] = useState(false); useEffect(() => { + let isCancelled = false; + const fetchData = async (val) => { + try { + const dd = await getCommunityTitle(val); + if (!isCancelled) { + setLabel(dd); + setIsCommunity(value !== dd); + return dd; + } + } catch (e) { + if (!isCancelled) { + setLabel(val); + setIsCommunity(/hive-[1-3]\d{4,6}$/.test(val)); + return val; + } + } + }; if (value && /hive-[1-3]\d{4,6}$/.test(value)) { if (communityTitle) { setLabel(communityTitle); setIsCommunity(true); } else { - getCommunityTitle(value) - .then((r) => { - setLabel(r); - setIsCommunity(value !== r); - return r; - }) - .catch((e) => { - setLabel(value); - setIsCommunity(/hive-[1-3]\d{4,6}$/.test(value)); - return value; - }); + fetchData(value); } } else { setLabel(value); setIsCommunity(false); } return () => { - setLabel(value); - setIsCommunity(false); + isCancelled = true; }; }); diff --git a/src/components/posts/container/postsContainer.js b/src/components/posts/container/postsContainer.js index 616e4f03d5..6f8eb6477f 100644 --- a/src/components/posts/container/postsContainer.js +++ b/src/components/posts/container/postsContainer.js @@ -93,7 +93,6 @@ const PostsContainer = ({ _loadPosts, changeForceLoadPostState, username, - feedUsername, forceLoadPost, isConnected, pageType, @@ -120,6 +119,7 @@ const PostsContainer = ({ _loadPosts, changeForceLoadPostState, username, + feedUsername, forceLoadPost, selectedOptionIndex, selectedFeedSubfilterIndex, From 9d218f26db6d8ca35f74a7bd4e783b36331e8308 Mon Sep 17 00:00:00 2001 From: feruz Date: Thu, 4 Feb 2021 12:58:48 +0200 Subject: [PATCH 27/32] auto focus --- src/components/markdownEditor/view/markdownEditorView.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/markdownEditor/view/markdownEditorView.js b/src/components/markdownEditor/view/markdownEditorView.js index 051989a247..9010e18dc3 100644 --- a/src/components/markdownEditor/view/markdownEditorView.js +++ b/src/components/markdownEditor/view/markdownEditorView.js @@ -128,6 +128,9 @@ const MarkdownEditorView = ({ const changeUser = async () => { dispatch(toggleAccountsBottomSheet(!isVisibleAccountsBottomSheet)); + if (inputRef && inputRef.current) { + inputRef.current.focus(); + } }; // eslint-disable-next-line react-hooks/exhaustive-deps From 05ed15760db10107d95428d0efbd7aecb48758a9 Mon Sep 17 00:00:00 2001 From: feruz Date: Thu, 4 Feb 2021 13:38:11 +0200 Subject: [PATCH 28/32] autofocus on reply --- src/components/markdownEditor/view/markdownEditorView.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/components/markdownEditor/view/markdownEditorView.js b/src/components/markdownEditor/view/markdownEditorView.js index 9010e18dc3..c1d77a0a43 100644 --- a/src/components/markdownEditor/view/markdownEditorView.js +++ b/src/components/markdownEditor/view/markdownEditorView.js @@ -114,6 +114,12 @@ const MarkdownEditorView = ({ setText(draftBody); }, [draftBody]); + useEffect(() => { + if (inputRef && inputRef.current) { + inputRef.current.focus(); + } + }, [currentAccount]); + useEffect(() => { const nextText = text.replace(text, ''); @@ -128,9 +134,6 @@ const MarkdownEditorView = ({ const changeUser = async () => { dispatch(toggleAccountsBottomSheet(!isVisibleAccountsBottomSheet)); - if (inputRef && inputRef.current) { - inputRef.current.focus(); - } }; // eslint-disable-next-line react-hooks/exhaustive-deps From 6658b8a860d78c8c2b629dc8f7cd77e75d2eede9 Mon Sep 17 00:00:00 2001 From: feruz Date: Thu, 4 Feb 2021 14:32:21 +0200 Subject: [PATCH 29/32] webview and auto-height-webview update --- package.json | 4 +- yarn.lock | 285 ++++----------------------------------------------- 2 files changed, 21 insertions(+), 268 deletions(-) diff --git a/package.json b/package.json index 0093bacec8..4c62f168ea 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "react-native": "0.61.5", "react-native-actions-sheet": "^0.4.2", "react-native-actionsheet": "ecency/react-native-actionsheet", - "react-native-autoheight-webview": "^1.5.2", + "react-native-autoheight-webview": "^1.5.7", "react-native-config": "luggit/react-native-config#master", "react-native-dark-mode": "^0.2.2", "react-native-date-picker": "^3.2.7", @@ -102,7 +102,7 @@ "react-native-vector-icons": "^6.6.0", "react-native-version": "^4.0.0", "react-native-version-number": "^0.3.5", - "react-native-webview": "^8.0.4", + "react-native-webview": "^11.2.1", "react-navigation": "^4.0.10", "react-navigation-drawer": "^2.3.3", "react-navigation-redux-helpers": "^4.0.1", diff --git a/yarn.lock b/yarn.lock index 787fd2fa4f..14e267f830 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1766,13 +1766,6 @@ assign-symbols@^1.0.0: resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= -assign@>=0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/assign/-/assign-0.1.7.tgz#e63bfe3a887b8630913c27663e4cc9bff1ddd25f" - integrity sha1-5jv+Ooh7hjCRPCdmPkzJv/Hd0l8= - dependencies: - fusing "0.4.x" - ast-types-flow@^0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad" @@ -1788,11 +1781,6 @@ async-limiter@~1.0.0: resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== -async@0.6.x: - version "0.6.2" - resolved "https://registry.yarnpkg.com/async/-/async-0.6.2.tgz#41fd038a3812c0a8bc1842ecf08ba63eb0392bef" - integrity sha1-Qf0DijgSwKi8GELs8IumPrA5K+8= - async@^2.4.0: version "2.6.3" resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" @@ -1959,13 +1947,6 @@ babel-runtime@^6.26.0: core-js "^2.4.0" regenerator-runtime "^0.11.0" -back@1.0.x: - version "1.0.2" - resolved "https://registry.yarnpkg.com/back/-/back-1.0.2.tgz#a93f5e6ce69729984d5901a2bb16e3b01a4d6369" - integrity sha1-qT9ebOaXKZhNWQGiuxbjsBpNY2k= - dependencies: - xtend "^4.0.0" - balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" @@ -2147,7 +2128,7 @@ buffer-alloc@^1.2.0: buffer-alloc-unsafe "^1.1.0" buffer-fill "^1.0.0" -buffer-crc32@^0.2.13, buffer-crc32@~0.2.3: +buffer-crc32@^0.2.13: version "0.2.13" resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= @@ -2426,11 +2407,6 @@ collection-visit@^1.0.0: map-visit "^1.0.0" object-visit "^1.0.0" -color-convert@^0.5.0: - version "0.5.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-0.5.3.tgz#bdb6c69ce660fadffe0b0007cc447e1b9f7282bd" - integrity sha1-vbbGnOZg+t/+CwAHzER+G59ygr0= - color-convert@^1.9.0, color-convert@^1.9.1: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" @@ -2455,13 +2431,6 @@ color-name@^1.0.0, color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -color-string@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991" - integrity sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE= - dependencies: - color-name "^1.0.0" - color-string@^1.5.2, color-string@^1.5.3: version "1.5.3" resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz#c9bbc5f01b58b5492f3d6857459cb6590ce204cc" @@ -2475,14 +2444,6 @@ color-support@^1.1.3: resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== -color@0.8.x: - version "0.8.0" - resolved "https://registry.yarnpkg.com/color/-/color-0.8.0.tgz#890c07c3fd4e649537638911cf691e5458b6fca5" - integrity sha1-iQwHw/1OZJU3Y4kRz2keVFi2/KU= - dependencies: - color-convert "^0.5.0" - color-string "^0.3.0" - color@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/color/-/color-3.1.2.tgz#68148e7f85d41ad7649c5fa8c8106f098d229e10" @@ -2496,24 +2457,11 @@ colorette@^1.0.7: resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b" integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw== -colornames@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/colornames/-/colornames-0.0.2.tgz#d811fd6c84f59029499a8ac4436202935b92be31" - integrity sha1-2BH9bIT1kClJmorEQ2ICk1uSvjE= - colors@^1.3.3: version "1.4.0" resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== -colorspace@1.0.x: - version "1.0.1" - resolved "https://registry.yarnpkg.com/colorspace/-/colorspace-1.0.1.tgz#c99c796ed31128b9876a52e1ee5ee03a4a719749" - integrity sha1-yZx5btMRKLmHalLh7l7gOkpxl0k= - dependencies: - color "0.8.x" - text-hex "0.0.x" - combined-stream@^1.0.6, combined-stream@~1.0.6: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" @@ -2581,7 +2529,7 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= -concat-stream@^1.6.0, concat-stream@^1.6.2: +concat-stream@^1.6.0: version "1.6.2" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== @@ -2833,16 +2781,6 @@ dayjs@^1.8.15: resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.32.tgz#66c48b95c397d9f7907e89bd29f78b3d19d40294" integrity sha512-V91aTRu5btP+uzGHaaOfodckEfBWhmi9foRP7cauAO1PTB8+tZ9o0Jec7q6TIIRY1N4q1IfiKsZunkB/AEWqMQ== -debug@0.7.x: - version "0.7.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39" - integrity sha1-BuHqgILCyxTjmAbiLi9vdX+Srzk= - -debug@0.8.x: - version "0.8.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-0.8.1.tgz#20ff4d26f5e422cb68a1bacbbb61039ad8c1c130" - integrity sha1-IP9NJvXkIstoobrLu2EDmtjBwTA= - debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -3009,15 +2947,6 @@ detect-newline@^2.1.0: resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2" integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I= -diagnostics@1.0.x: - version "1.0.1" - resolved "https://registry.yarnpkg.com/diagnostics/-/diagnostics-1.0.1.tgz#accdb080c82bb25d0dd73430a9e6a87fbb431541" - integrity sha1-rM2wgMgrsl0N1zQwqeaof7tDFUE= - dependencies: - colorspace "1.0.x" - enabled "1.0.x" - kuler "0.0.x" - didyoumean@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/didyoumean/-/didyoumean-1.2.1.tgz#e92edfdada6537d484d73c0172fd1eba0c4976ff" @@ -3165,16 +3094,6 @@ elliptic@^6.5.2: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.0" -emits@1.0.x: - version "1.0.2" - resolved "https://registry.yarnpkg.com/emits/-/emits-1.0.2.tgz#db20ec6668325071c313441e30cfe2a69ea73859" - integrity sha1-2yDsZmgyUHHDE0QeMM/ipp6nOFk= - -emits@3.0.x: - version "3.0.0" - resolved "https://registry.yarnpkg.com/emits/-/emits-3.0.0.tgz#32752bba95e1707b219562384ab9bb8b1fd62f70" - integrity sha1-MnUrupXhcHshlWI4Srm7ix/WL3A= - emitter-component@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/emitter-component/-/emitter-component-1.1.1.tgz#065e2dbed6959bf470679edabeaf7981d1003ab6" @@ -3195,13 +3114,6 @@ emoji-regex@^9.0.0: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.0.0.tgz#48a2309cc8a1d2e9d23bc6a67c39b63032e76ea4" integrity sha512-6p1NII1Vm62wni/VR/cUMauVQoxmLVb9csqQlvLz+hO2gk8U2UYDfXHQSUYIBKmZwAKz867IDqG7B+u0mj+M6w== -enabled@1.0.x: - version "1.0.2" - resolved "https://registry.yarnpkg.com/enabled/-/enabled-1.0.2.tgz#965f6513d2c2d1c5f4652b64a2e3396467fc2f93" - integrity sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M= - dependencies: - env-variable "0.0.x" - encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" @@ -3231,11 +3143,6 @@ entities@^2.0.0: resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz#5c487e5742ab93c15abb5da22759b8590ec03b7f" integrity sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ== -env-variable@0.0.x: - version "0.0.6" - resolved "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.6.tgz#74ab20b3786c545b62b4a4813ab8cf22726c9808" - integrity sha512-bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg== - envinfo@^7.1.0: version "7.7.2" resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.7.2.tgz#098f97a0e902f8141f9150553c92dbb282c4cabe" @@ -3626,11 +3533,6 @@ event-target-shim@^5.0.0, event-target-shim@^5.0.1: resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789" integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ== -eventemitter3@1.2.x: - version "1.2.0" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508" - integrity sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg= - eventemitter3@^3.0.0: version "3.1.2" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7" @@ -3760,11 +3662,6 @@ extend@~3.0.2: resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== -extendible@0.1.x: - version "0.1.1" - resolved "https://registry.yarnpkg.com/extendible/-/extendible-0.1.1.tgz#e2a37ed87129fb4f9533e8a8d7506230a539c905" - integrity sha1-4qN+2HEp+0+VM+io11BiMKU5yQU= - external-editor@^2.0.4: version "2.2.0" resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5" @@ -3797,21 +3694,6 @@ extglob@^2.0.4: snapdragon "^0.8.1" to-regex "^3.0.1" -extract-github@0.0.x: - version "0.0.5" - resolved "https://registry.yarnpkg.com/extract-github/-/extract-github-0.0.5.tgz#f542536db8c19b983a3bec9db96d2ef2a5ff1a86" - integrity sha1-9UJTbbjBm5g6O+yduW0u8qX/GoY= - -extract-zip@^1.6.7: - version "1.7.0" - resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927" - integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA== - dependencies: - concat-stream "^1.6.2" - debug "^2.6.9" - mkdirp "^0.5.4" - yauzl "^2.10.0" - extsprintf@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" @@ -3934,13 +3816,6 @@ fbjs@^3.0.0: setimmediate "^1.0.5" ua-parser-js "^0.7.18" -fd-slicer@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" - integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= - dependencies: - pend "~1.2.0" - figures@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e" @@ -4149,29 +4024,6 @@ functional-red-black-tree@^1.0.1: resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= -fusing@0.2.x: - version "0.2.3" - resolved "https://registry.yarnpkg.com/fusing/-/fusing-0.2.3.tgz#d0eefaf985d2bafded44af8b185316f6e429e1db" - integrity sha1-0O76+YXSuv3tRK+LGFMW9uQp4ds= - dependencies: - predefine "0.1.x" - -fusing@0.4.x: - version "0.4.0" - resolved "https://registry.yarnpkg.com/fusing/-/fusing-0.4.0.tgz#c99068f54ca3e11dc0118902152abf367aba4a4d" - integrity sha1-yZBo9Uyj4R3AEYkCFSq/Nnq6Sk0= - dependencies: - emits "1.0.x" - predefine "0.1.x" - -fusing@1.0.x: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fusing/-/fusing-1.0.0.tgz#550c15d76af9265778aa051ece44d4000a098d45" - integrity sha1-VQwV12r5Jld4qgUezkTUAAoJjUU= - dependencies: - emits "3.0.x" - predefine "0.1.x" - gauge@~2.7.3: version "2.7.4" resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" @@ -4245,15 +4097,6 @@ github-from-package@0.0.0: resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= -githulk@0.0.x: - version "0.0.7" - resolved "https://registry.yarnpkg.com/githulk/-/githulk-0.0.7.tgz#d96ca29f0ec43117c538e521d663566ea84b4eff" - integrity sha1-2Wyinw7EMRfFOOUh1mNWbqhLTv8= - dependencies: - debug "0.7.x" - extract-github "0.0.x" - mana "0.1.x" - glob@5.0.15: version "5.0.15" resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" @@ -5608,13 +5451,6 @@ kleur@^3.0.3: resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== -kuler@0.0.x: - version "0.0.0" - resolved "https://registry.yarnpkg.com/kuler/-/kuler-0.0.0.tgz#b66bb46b934e550f59d818848e0abba4f7f5553c" - integrity sha1-tmu0a5NOVQ9Z2BiEjgq7pPf1VTw= - dependencies: - colornames "0.0.2" - language-subtag-registry@~0.3.2: version "0.3.20" resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.20.tgz#a00a37121894f224f763268e431c55556b0c0755" @@ -5664,17 +5500,6 @@ levn@^0.3.0, levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -licenses@0.0.x: - version "0.0.20" - resolved "https://registry.yarnpkg.com/licenses/-/licenses-0.0.20.tgz#f18a57b26a78eaf28a873e2a378a33e81f59d136" - integrity sha1-8YpXsmp46vKKhz4qN4oz6B9Z0TY= - dependencies: - async "0.6.x" - debug "0.8.x" - fusing "0.2.x" - githulk "0.0.x" - npm-registry "0.1.x" - lines-and-columns@^1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" @@ -5957,19 +5782,6 @@ makeerror@1.0.x: dependencies: tmpl "1.0.x" -mana@0.1.x: - version "0.1.41" - resolved "https://registry.yarnpkg.com/mana/-/mana-0.1.41.tgz#7cb13f73218668654229635c4fc5b17e26f93b7d" - integrity sha1-fLE/cyGGaGVCKWNcT8Wxfib5O30= - dependencies: - assign ">=0.1.7" - back "1.0.x" - diagnostics "1.0.x" - eventemitter3 "1.2.x" - fusing "1.0.x" - millisecond "0.1.x" - request "2.x.x" - map-age-cleaner@^0.1.1: version "0.1.3" resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" @@ -6312,11 +6124,6 @@ micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8: snapdragon "^0.8.1" to-regex "^3.0.2" -millisecond@0.1.x: - version "0.1.2" - resolved "https://registry.yarnpkg.com/millisecond/-/millisecond-0.1.2.tgz#6cc5ad386241cab8e78aff964f87028eec92dac5" - integrity sha1-bMWtOGJByrjniv+WT4cCjuyS2sU= - mime-db@1.44.0, "mime-db@>= 1.43.0 < 2": version "1.44.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92" @@ -6431,7 +6238,7 @@ mkdirp@0.5.3: dependencies: minimist "^1.2.5" -mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.4: +mkdirp@^0.5.0, mkdirp@^0.5.1: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -6612,17 +6419,6 @@ npm-path@^2.0.2: dependencies: which "^1.2.10" -npm-registry@0.1.x, npm-registry@^0.1.13: - version "0.1.13" - resolved "https://registry.yarnpkg.com/npm-registry/-/npm-registry-0.1.13.tgz#9e5d8b2fdfc1ab5990d47f7debbe231d79a9e822" - integrity sha1-nl2LL9/Bq1mQ1H99674jHXmp6CI= - dependencies: - debug "0.8.x" - extract-github "0.0.x" - licenses "0.0.x" - mana "0.1.x" - semver "2.2.x" - npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" @@ -7085,11 +6881,6 @@ pbxproj-dom@^1.0.11: resolved "https://registry.yarnpkg.com/pbxproj-dom/-/pbxproj-dom-1.2.0.tgz#1cf4101163bd666eba9eb92a5b8f616ce824ea85" integrity sha512-K2czrWqA68AR0q1UXz5EBi/zoxcljrkO4RSJX0jPnVn3iyE0HYnYOzaEEDYMpueczkT/Vtdm3SCc3NM+12kMaQ== -pend@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" - integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= - performance-now@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" @@ -7206,13 +6997,6 @@ prebuild-install@^5.3.3: tunnel-agent "^0.6.0" which-pm-runs "^1.0.0" -predefine@0.1.x: - version "0.1.2" - resolved "https://registry.yarnpkg.com/predefine/-/predefine-0.1.2.tgz#2aa92b4496bc1f8554e43a45f76bfbe50d33d37f" - integrity sha1-KqkrRJa8H4VU5DpF92v75Q0z038= - dependencies: - extendible "0.1.x" - prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" @@ -7309,7 +7093,7 @@ promise@^7, promise@^7.1.1: dependencies: asap "~2.0.3" -prompts@^2.0.1, prompts@^2.3.0: +prompts@^2.0.1: version "2.3.2" resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.3.2.tgz#480572d89ecf39566d2bd3fe2c9fccb7c4c0b068" integrity sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA== @@ -7479,13 +7263,20 @@ react-native-animatable@1.3.3: dependencies: prop-types "^15.7.2" -react-native-autoheight-webview@^1.3.4, react-native-autoheight-webview@^1.5.2: +react-native-autoheight-webview@^1.3.4: version "1.5.2" resolved "https://registry.yarnpkg.com/react-native-autoheight-webview/-/react-native-autoheight-webview-1.5.2.tgz#ea70cad056a2ce46e9de18cba90624aa49668632" integrity sha512-pgaLQ67wNE0VZOpvtCw7kbxJ4Cx38jgCjIOk3LfMf8uBxz+TP35QWGtSpf0NZ9sJifahU15t0Vd/8y/SGEUTCA== dependencies: prop-types "^15.7.2" +react-native-autoheight-webview@^1.5.7: + version "1.5.7" + resolved "https://registry.yarnpkg.com/react-native-autoheight-webview/-/react-native-autoheight-webview-1.5.7.tgz#9931595768277304aaaec46ad01d5d19217aa6ef" + integrity sha512-0tAJ7rtz2w0esq+YLqGYLiDuEjpwqJws9aQTPsSPrB0oNsLwhOFfXMrdFRp2JfVJ0V/hKPr2sgeBgpLPfKaqGw== + dependencies: + prop-types "^15.7.2" + react-native-config@luggit/react-native-config#master: version "1.3.3" resolved "https://codeload.github.com/luggit/react-native-config/tar.gz/3ed79e4bb6f8756ec5b458201229179cf363d512" @@ -7758,14 +7549,13 @@ react-native-version@^4.0.0: resolve-from "^5.0.0" semver "^7.0.0" -react-native-webview@^8.0.4: - version "8.2.1" - resolved "https://registry.yarnpkg.com/react-native-webview/-/react-native-webview-8.2.1.tgz#23f9e156a3361fee316d54b60e64da1a27f9f73b" - integrity sha512-A2+JTOPloKHrBkKtJVEaT1jKeM4Lv+qx9e6+w/GISVkCMQj8WhBsx7YTvqi0jj0m3dxk7gkrtwVtUDaS7xK/ug== +react-native-webview@^11.2.1: + version "11.2.1" + resolved "https://registry.yarnpkg.com/react-native-webview/-/react-native-webview-11.2.1.tgz#abe68c38808f34aeed0a10740b2efba74ac610b8" + integrity sha512-dfChyqqWVJe0kdCuDZ4mJt+RgOYNie+rCjCrZ55OW6X7f/rvNVd3Mbnv/1mbYjU8wm5C3/1/oqVJoTB/7GAGjQ== dependencies: escape-string-regexp "2.0.0" invariant "2.2.4" - rnpm-plugin-windows "^0.5.1-0" react-native@0.61.5: version "0.61.5" @@ -8103,7 +7893,7 @@ request-promise-native@^1.0.5: stealthy-require "^1.1.1" tough-cookie "^2.3.3" -request@2.x.x, request@^2.87.0, request@^2.88.0, request@^2.88.2: +request@^2.87.0, request@^2.88.2: version "2.88.2" resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== @@ -8243,20 +8033,6 @@ rn-placeholder@^1.3.2: dependencies: prop-types "15.6.2" -rnpm-plugin-windows@^0.5.1-0: - version "0.5.1-0" - resolved "https://registry.yarnpkg.com/rnpm-plugin-windows/-/rnpm-plugin-windows-0.5.1-0.tgz#9ffdd38653c6024c538a98a1046a37625d56eddb" - integrity sha512-0EX2shP1OI18MylpVHmZRhDX5GSdvHDgSQoFDZx/Ir73dt3dPVtz7iNviiz3vPa8/8HgTOog3Xzn/gXxfPRrnw== - dependencies: - chalk "^1.1.3" - extract-zip "^1.6.7" - fs-extra "^7.0.1" - npm-registry "^0.1.13" - prompts "^2.3.0" - request "^2.88.0" - semver "^6.1.1" - valid-url "^1.0.9" - rsvp@^4.8.4: version "4.8.5" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734" @@ -8372,17 +8148,12 @@ semver-compare@^1.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@2.2.x: - version "2.2.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-2.2.1.tgz#7941182b3ffcc580bff1c17942acdf7951c0d213" - integrity sha1-eUEYKz/8xYC/8cF5QqzfeVHA0hM= - semver@5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA== -semver@^6.0.0, semver@^6.1.1, semver@^6.2.0, semver@^6.3.0: +semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== @@ -9048,11 +8819,6 @@ test-exclude@^5.2.3: read-pkg-up "^4.0.0" require-main-filename "^2.0.0" -text-hex@0.0.x: - version "0.0.0" - resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-0.0.0.tgz#578fbc85a6a92636e42dd17b41d0218cce9eb2b3" - integrity sha1-V4+8haapJjbkLdF7QdAhjM6esrM= - text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" @@ -9357,11 +9123,6 @@ uuid@^3.0.0, uuid@^3.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== -valid-url@^1.0.9: - version "1.0.9" - resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200" - integrity sha1-HBRHm0DxOXp1eC8RXkCGRHQzogA= - validate-npm-package-license@^3.0.1: version "3.0.4" resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" @@ -9652,7 +9413,7 @@ xss@^1.0.8: commander "^2.20.3" cssfilter "0.0.10" -xtend@^4.0.0, xtend@~4.0.1: +xtend@~4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== @@ -9782,11 +9543,3 @@ yargs@^9.0.0: which-module "^2.0.0" y18n "^3.2.1" yargs-parser "^7.0.0" - -yauzl@^2.10.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" - integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= - dependencies: - buffer-crc32 "~0.2.3" - fd-slicer "~1.1.0" From 352cff75b1c02f39070e0348130ee7ffc3157f13 Mon Sep 17 00:00:00 2001 From: feruz Date: Thu, 4 Feb 2021 14:51:57 +0200 Subject: [PATCH 30/32] ios production local image --- ios/Podfile | 18 ++++++++++++++++++ ios/Podfile.lock | 8 ++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index cb4bcbdb45..adceafb850 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -41,6 +41,11 @@ target 'Ecency' do # Pods for testing end + post_install do |installer| + find_and_replace("../node_modules/react-native/Libraries/Image/RCTUIImageViewAnimated.m", + "_currentFrame.CGImage;","_currentFrame.CGImage ;} else { [super displayLayer:layer];") + end + use_native_modules! end @@ -52,4 +57,17 @@ target 'Ecency-tvOS' do # Pods for testing end +end + +def find_and_replace(dir, findstr, replacestr) + Dir[dir].each do |name| + text = File.read(name) + replace = text.gsub(findstr,replacestr) + if text != replace + puts "Fix: " + name + File.open(name, "w") { |file| file.puts replace } + STDOUT.flush + end + end + Dir[dir + '*/'].each(&method(:find_and_replace)) end \ No newline at end of file diff --git a/ios/Podfile.lock b/ios/Podfile.lock index e8b37a40d3..0109278bf0 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -331,8 +331,8 @@ PODS: - React - react-native-version-number (0.3.6): - React - - react-native-webview (8.2.1): - - React + - react-native-webview (11.2.1): + - React-Core - React-RCTActionSheet (0.61.5): - React-Core/RCTActionSheetHeaders (= 0.61.5) - React-RCTAnimation (0.61.5): @@ -692,7 +692,7 @@ SPEC CHECKSUMS: react-native-safe-area-context: b6e0e284002381d2ff29fa4fff42b4d8282e3c94 react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865 react-native-version-number: b415bbec6a13f2df62bf978e85bc0d699462f37f - react-native-webview: 160ac8d6bb974e2933f2de6bb7464a8e934ff31d + react-native-webview: a4751ec8f0a6a397026f22ed54c1efeec4540555 React-RCTActionSheet: 600b4d10e3aea0913b5a92256d2719c0cdd26d76 React-RCTAnimation: 791a87558389c80908ed06cc5dfc5e7920dfa360 React-RCTBlob: d89293cc0236d9cb0933d85e430b0bbe81ad1d72 @@ -725,6 +725,6 @@ SPEC CHECKSUMS: toolbar-android: 85f3ef4d691469f2d304e7dee4bca013aa1ba1ff Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b -PODFILE CHECKSUM: 1f30c7da5061dbc47185442a6ab4a3c95ac48c04 +PODFILE CHECKSUM: fe3729fa5bd9034637b0c0653446c2895b1c839d COCOAPODS: 1.9.3 From 911ea6c77b13aeffb68458f8dadeb7ecab6a87f6 Mon Sep 17 00:00:00 2001 From: feruz Date: Thu, 4 Feb 2021 19:37:14 +0200 Subject: [PATCH 31/32] improve posts parsing --- .../postCard/container/postCardContainer.js | 25 ++++++++++++++++--- .../posts/container/postsContainer.js | 2 +- src/providers/ecency/ecency.js | 2 +- src/utils/postParser.js | 22 ++++++++++------ 4 files changed, 38 insertions(+), 13 deletions(-) diff --git a/src/components/postCard/container/postCardContainer.js b/src/components/postCard/container/postCardContainer.js index 2f221996ab..abf135bd1e 100644 --- a/src/components/postCard/container/postCardContainer.js +++ b/src/components/postCard/container/postCardContainer.js @@ -39,14 +39,31 @@ const PostCardContainer = ({ }, [isRefresh]); useEffect(() => { + let isCancelled = false; + const fetchData = async (val) => { + try { + const dd = await getPostReblogs(val); + if (!isCancelled) { + setReblogs(dd); + return dd; + } + } catch (e) { + if (!isCancelled) { + setReblogs([]); + return val; + } + } + }; + if (_content) { setActiveVotes(get(_content, 'active_votes', [])); - - getPostReblogs(_content).then((result) => { - setReblogs(result); - }); setContent(_content); + fetchData(_content); } + + return () => { + isCancelled = true; + }; }, [_content]); const _handleOnUserPress = () => { diff --git a/src/components/posts/container/postsContainer.js b/src/components/posts/container/postsContainer.js index 6f8eb6477f..952adbbabe 100644 --- a/src/components/posts/container/postsContainer.js +++ b/src/components/posts/container/postsContainer.js @@ -85,8 +85,8 @@ const PostsContainer = ({ useEffect(() => { if (isConnected) { - _getPromotePosts(); _loadPosts(); + _getPromotePosts(); } }, [ _getPromotePosts, diff --git a/src/providers/ecency/ecency.js b/src/providers/ecency/ecency.js index 4a655aa350..7b92fd779a 100644 --- a/src/providers/ecency/ecency.js +++ b/src/providers/ecency/ecency.js @@ -417,7 +417,7 @@ export const getSCAccessToken = (code) => export const getPromotePosts = () => { try { - return api.get('/promoted-posts?limit=50').then((resp) => resp.data); + return api.get('/promoted-posts?limit=10').then((resp) => resp.data); } catch (error) { return error; } diff --git a/src/utils/postParser.js b/src/utils/postParser.js index cd7a1bc76b..6790dc4f00 100644 --- a/src/utils/postParser.js +++ b/src/utils/postParser.js @@ -7,7 +7,7 @@ import { postBodySummary, renderPostBody, catchPostImage } from '@ecency/render- // Utils import parseAsset from './parseAsset'; import { getReputation } from './reputation'; -import { getResizedAvatar } from './image'; +import { getResizedAvatar, getResizedImage } from './image'; const webp = Platform.OS === 'ios' ? false : true; @@ -27,13 +27,21 @@ export const parsePost = (post, currentUserName, isPromoted, isList = false) => post.markdownBody = post.body; } post.is_promoted = isPromoted; - try { - post.json_metadata = JSON.parse(post.json_metadata); - } catch (error) { - post.json_metadata = {}; + if (typeof post.json_metadata === 'string' || post.json_metadata instanceof String) { + try { + post.json_metadata = JSON.parse(post.json_metadata); + } catch (error) { + post.json_metadata = {}; + } + } + if (post.json_metadata && post.json_metadata.image) { + const [imageLink] = post.json_metadata.image; + post.thumbnail = getResizedImage(imageLink, 10); + post.image = getResizedImage(imageLink, 600); + } else { + post.image = catchPostImage(post.body, 600, 500, webp ? 'webp' : 'match'); + post.thumbnail = catchPostImage(post.body, 10, 7, webp ? 'webp' : 'match'); } - post.image = catchPostImage(post.body, 600, 500, webp ? 'webp' : 'match'); - post.thumbnail = catchPostImage(post.body, 10, 7, webp ? 'webp' : 'match'); post.author_reputation = getReputation(post.author_reputation); post.avatar = getResizedAvatar(get(post, 'author')); if (!isList) { From bf20defe6162b306aaa086cbd8772a88b78fed27 Mon Sep 17 00:00:00 2001 From: feruz Date: Thu, 4 Feb 2021 20:39:32 +0200 Subject: [PATCH 32/32] unfollow tag label --- .../basicUIElements/view/userListItem/userListItem.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/basicUIElements/view/userListItem/userListItem.js b/src/components/basicUIElements/view/userListItem/userListItem.js index 228bb8afb3..be6238a6e6 100644 --- a/src/components/basicUIElements/view/userListItem/userListItem.js +++ b/src/components/basicUIElements/view/userListItem/userListItem.js @@ -90,7 +90,7 @@ const UserListItem = ({ ) : ( {isFollowing ? ( - + ) : ( <>