From 2ee86b98a51737f440e065e616a1fa10dc8218f5 Mon Sep 17 00:00:00 2001 From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com> Date: Mon, 7 Oct 2024 12:55:36 +0100 Subject: [PATCH 1/2] Revert "chore(wallet-mobile): Update sentry/react-native to fix xcode build issues (#3674)" This reverts commit 9d43847e1f5e7b66ba44abaa1a33af0c17dc1f28. --- apps/wallet-mobile/ios/Podfile.lock | 17 +- apps/wallet-mobile/package.json | 2 +- yarn.lock | 259 +++++++++++----------------- 3 files changed, 106 insertions(+), 172 deletions(-) diff --git a/apps/wallet-mobile/ios/Podfile.lock b/apps/wallet-mobile/ios/Podfile.lock index a8d7b4705c..f094a30104 100644 --- a/apps/wallet-mobile/ios/Podfile.lock +++ b/apps/wallet-mobile/ios/Podfile.lock @@ -516,12 +516,9 @@ PODS: - RNScreens (3.22.1): - React-Core - React-RCTImage - - RNSentry (5.33.1): - - hermes-engine - - RCT-Folly (= 2021.07.22.00) + - RNSentry (5.8.0): - React-Core - - React-hermes - - Sentry/HybridSDK (= 8.36.0) + - Sentry/HybridSDK (= 8.9.3) - RNShare (10.0.2): - React-Core - RNSVG (13.8.0): @@ -537,7 +534,9 @@ PODS: - SDWebImageWebPCoder (0.11.0): - libwebp (~> 1.0) - SDWebImage/Core (~> 5.15) - - Sentry/HybridSDK (8.36.0) + - Sentry/HybridSDK (8.9.3): + - SentryPrivate (= 8.9.3) + - SentryPrivate (8.9.3) - Yoga (1.14.0) - ZXingObjC/Core (3.6.9) - ZXingObjC/OneD (3.6.9): @@ -651,6 +650,7 @@ SPEC REPOS: - SDWebImageSVGCoder - SDWebImageWebPCoder - Sentry + - SentryPrivate - ZXingObjC EXTERNAL SOURCES: @@ -919,14 +919,15 @@ SPEC CHECKSUMS: RNPermissions: f1b49dd05fa9b83993cd05a9ee115247944d8f1a RNReanimated: d6b4b867b6d1ee0798f5fb372708fa4bb8d66029 RNScreens: 50ffe2fa2342eabb2d0afbe19f7c1af286bc7fb3 - RNSentry: 0744d3c79504bc4778190d047d1b60daf4a378cd + RNSentry: f9e637773502a61c7b455c4ce65bc7008ce22a6e RNShare: 859ff710211285676b0bcedd156c12437ea1d564 RNSVG: c1e76b81c76cdcd34b4e1188852892dc280eb902 SDWebImage: cb032eba469c54e0000e78bcb0a13cdde0a52798 SDWebImageAVIFCoder: 8348fef6d0ec69e129c66c9fe4d74fbfbf366112 SDWebImageSVGCoder: 15a300a97ec1c8ac958f009c02220ac0402e936c SDWebImageWebPCoder: 295a6573c512f54ad2dd58098e64e17dcf008499 - Sentry: f8374b5415bc38dfb5645941b3ae31230fbeae57 + Sentry: 97161cac725da1ecbe77d1445bf8a61c1e5667f1 + SentryPrivate: 9a76def09fb08f9501997b8df946e8097947b94f Yoga: e71803b4c1fff832ccf9b92541e00f9b873119b9 ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5 diff --git a/apps/wallet-mobile/package.json b/apps/wallet-mobile/package.json index 67db416f1f..013273d2ca 100644 --- a/apps/wallet-mobile/package.json +++ b/apps/wallet-mobile/package.json @@ -120,7 +120,7 @@ "@react-navigation/native": "^6.1.6", "@react-navigation/routers": "^6.1.5", "@react-navigation/stack": "^6.3.16", - "@sentry/react-native": "^5.33.1", + "@sentry/react-native": "^5.8.0", "@shopify/flash-list": "^1.4.1", "@types/bip39": "^3.0.0", "@types/pbkdf2": "^3.1.2", diff --git a/yarn.lock b/yarn.lock index 526e6e0c06..812aadb4f9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4574,34 +4574,6 @@ exenv "^1.2.2" prop-types "^15.6.2" -"@sentry-internal/feedback@7.119.0": - version "7.119.0" - resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-7.119.0.tgz#429b3ea0fd34e928d2e7de5dcbe9377272a3f221" - integrity sha512-om8TkAU5CQGO8nkmr7qsSBVkP+/vfeS4JgtW3sjoTK0fhj26+DljR6RlfCGWtYQdPSP6XV7atcPTjbSnsmG9FQ== - dependencies: - "@sentry/core" "7.119.0" - "@sentry/types" "7.119.0" - "@sentry/utils" "7.119.0" - -"@sentry-internal/replay-canvas@7.119.0": - version "7.119.0" - resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-7.119.0.tgz#85669d184ba79150e64d05de02f5e2b616e68371" - integrity sha512-NL02VQx6ekPxtVRcsdp1bp5Tb5w6vnfBKSIfMKuDRBy5A10Uc3GSoy/c3mPyHjOxB84452A+xZSx6bliEzAnuA== - dependencies: - "@sentry/core" "7.119.0" - "@sentry/replay" "7.119.0" - "@sentry/types" "7.119.0" - "@sentry/utils" "7.119.0" - -"@sentry-internal/tracing@7.119.0": - version "7.119.0" - resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.119.0.tgz#201561af2a4ad1837333287c26050a5e688537ca" - integrity sha512-oKdFJnn+56f0DHUADlL8o9l8jTib3VDLbWQBVkjD9EprxfaCwt2m8L5ACRBdQ8hmpxCEo4I8/6traZ7qAdBUqA== - dependencies: - "@sentry/core" "7.119.0" - "@sentry/types" "7.119.0" - "@sentry/utils" "7.119.0" - "@sentry-internal/tracing@7.52.0": version "7.52.0" resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.52.0.tgz#c4e0750ad0c3949c5bb4b59cbb708b0fef274080" @@ -4622,24 +4594,15 @@ "@sentry/utils" "7.52.1" tslib "^1.9.3" -"@sentry/babel-plugin-component-annotate@2.20.1": - version "2.20.1" - resolved "https://registry.yarnpkg.com/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-2.20.1.tgz#204c63ed006a048f48f633876e1b8bacf87a9722" - integrity sha512-4mhEwYTK00bIb5Y9UWIELVUfru587Vaeg0DQGswv4aIRHIiMKLyNqCEejaaybQ/fNChIZOKmvyqXk430YVd7Qg== - -"@sentry/browser@7.119.0": - version "7.119.0" - resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.119.0.tgz#65004015c107be5d2f49a852ebcffc5d19d90e0d" - integrity sha512-WwmW1Y4D764kVGeKmdsNvQESZiAn9t8LmCWO0ucBksrjL2zw9gBPtOpRcO6l064sCLeSxxzCN+kIxhRm1gDFEA== - dependencies: - "@sentry-internal/feedback" "7.119.0" - "@sentry-internal/replay-canvas" "7.119.0" - "@sentry-internal/tracing" "7.119.0" - "@sentry/core" "7.119.0" - "@sentry/integrations" "7.119.0" - "@sentry/replay" "7.119.0" - "@sentry/types" "7.119.0" - "@sentry/utils" "7.119.0" +"@sentry-internal/tracing@7.60.1": + version "7.60.1" + resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.60.1.tgz#c20766a7e31589962ffe9ea9dc58b6f475432303" + integrity sha512-2vM+3/ddzmoBfi92OOD9FFTHXf0HdQhKtNM26+/RsmkKnTid+/inbvA7nKi+Qa7ExcnlC6eclEHQEg+0X3yDkQ== + dependencies: + "@sentry/core" "7.60.1" + "@sentry/types" "7.60.1" + "@sentry/utils" "7.60.1" + tslib "^2.4.1 || ^1.9.3" "@sentry/browser@7.52.0": version "7.52.0" @@ -4665,40 +4628,17 @@ "@sentry/utils" "7.52.1" tslib "^1.9.3" -"@sentry/cli-darwin@2.36.1": - version "2.36.1" - resolved "https://registry.yarnpkg.com/@sentry/cli-darwin/-/cli-darwin-2.36.1.tgz#786adf6984dbe3c6fb7dac51b625c314117b807d" - integrity sha512-JOHQjVD8Kqxm1jUKioAP5ohLOITf+Dh6+DBz4gQjCNdotsvNW5m63TKROwq2oB811p+Jzv5304ujmN4cAqW1Ww== - -"@sentry/cli-linux-arm64@2.36.1": - version "2.36.1" - resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.36.1.tgz#ff449d7e7e715166257998c02cf635ca02acbadd" - integrity sha512-R//3ZEkbzvoStr3IA7nxBZNiBYyxOljOqAhgiTnejXHmnuwDzM3TBA2n5vKPE/kBFxboEBEw0UTzTIRb1T0bgw== - -"@sentry/cli-linux-arm@2.36.1": - version "2.36.1" - resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm/-/cli-linux-arm-2.36.1.tgz#1ae5d335a1b4cd217a34c2bd6c6f5e0670136eb3" - integrity sha512-gvEOKN0fWL2AVqUBKHNXPRZfJNvKTs8kQhS8cQqahZGgZHiPCI4BqW45cKMq+ZTt1UUbLmt6khx5Dz7wi+0i5A== - -"@sentry/cli-linux-i686@2.36.1": - version "2.36.1" - resolved "https://registry.yarnpkg.com/@sentry/cli-linux-i686/-/cli-linux-i686-2.36.1.tgz#112b9e26357e918cbbba918114ec8cdab07cdf60" - integrity sha512-R7sW5Vk/HacVy2YgQoQB+PwccvFYf2CZVPSFSFm2z7MEfNe77UYHWUq+sjJ4vxWG6HDWGVmaX0fjxyDkE01JRA== - -"@sentry/cli-linux-x64@2.36.1": - version "2.36.1" - resolved "https://registry.yarnpkg.com/@sentry/cli-linux-x64/-/cli-linux-x64-2.36.1.tgz#c3e5bdb0c9a4bb44c83927c62a3cd7e006709bf7" - integrity sha512-UMr3ik8ksA7zQfbzsfwCb+ztenLnaeAbX94Gp+bzANZwPfi/vVHf2bLyqsBs4OyVt9SPlN1bbM/RTGfMjZ3JOw== - -"@sentry/cli-win32-i686@2.36.1": - version "2.36.1" - resolved "https://registry.yarnpkg.com/@sentry/cli-win32-i686/-/cli-win32-i686-2.36.1.tgz#819573320e885e1dbf59b0a01d3bd370c84c1708" - integrity sha512-CflvhnvxPEs5GWQuuDtYSLqPrBaPbcSJFlBuUIb+8WNzRxvVfjgw1qzfZmkQqABqiy/YEsEekllOoMFZAvCcVA== - -"@sentry/cli-win32-x64@2.36.1": - version "2.36.1" - resolved "https://registry.yarnpkg.com/@sentry/cli-win32-x64/-/cli-win32-x64-2.36.1.tgz#80779b4bffb4e2e32944eae72c60e6f40151b4dc" - integrity sha512-wWqht2xghcK3TGnooHZSzA3WSjdtno/xFjZLvWmw38rblGwgKMxLZnlxV6uDyS+OJ6CbfDTlCRay/0TIqA0N8g== +"@sentry/browser@7.60.1": + version "7.60.1" + resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.60.1.tgz#d11e86f127f3f1b48a7156a4df63ab2b76e534ee" + integrity sha512-opZQee3S0c459LXt8YGpwOM/qiTlzluHEEnfW2q+D2yVCWh8iegsDX3kbRiv4i/mtQu9yPhM9M761KDnc/0eZw== + dependencies: + "@sentry-internal/tracing" "7.60.1" + "@sentry/core" "7.60.1" + "@sentry/replay" "7.60.1" + "@sentry/types" "7.60.1" + "@sentry/utils" "7.60.1" + tslib "^2.4.1 || ^1.9.3" "@sentry/cli@2.17.5": version "2.17.5" @@ -4711,24 +4651,16 @@ proxy-from-env "^1.1.0" which "^2.0.2" -"@sentry/cli@2.36.1": - version "2.36.1" - resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-2.36.1.tgz#a9146b798cb6d2f782a7a48d74633ddcd88dc8d3" - integrity sha512-gzK5uQKDWKhyH5udoB5+oaUNrS//urWyaXgKvHKz4gFfl744HuKY9dpLPP2nMnf0zLGmGM6xJnMXLqILq0mtxw== +"@sentry/cli@2.19.4": + version "2.19.4" + resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-2.19.4.tgz#d6a07d8224b457a8023b4b2a56b764abb60b53d2" + integrity sha512-wsSr2O/GVgr/i+DYtie+DNhODyI+HL7F5/0t1HwWMjHJWm4+5XTEauznYgbh2mewkzfUk9+t0CPecA82lEgspg== dependencies: https-proxy-agent "^5.0.0" node-fetch "^2.6.7" progress "^2.0.3" proxy-from-env "^1.1.0" which "^2.0.2" - optionalDependencies: - "@sentry/cli-darwin" "2.36.1" - "@sentry/cli-linux-arm" "2.36.1" - "@sentry/cli-linux-arm64" "2.36.1" - "@sentry/cli-linux-i686" "2.36.1" - "@sentry/cli-linux-x64" "2.36.1" - "@sentry/cli-win32-i686" "2.36.1" - "@sentry/cli-win32-x64" "2.36.1" "@sentry/core@6.19.7": version "6.19.7" @@ -4741,14 +4673,6 @@ "@sentry/utils" "6.19.7" tslib "^1.9.3" -"@sentry/core@7.119.0": - version "7.119.0" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.119.0.tgz#a6e41119bb03ec27689f9ad04e79d1fba5b7fc37" - integrity sha512-CS2kUv9rAJJEjiRat6wle3JATHypB0SyD7pt4cpX5y0dN5dZ1JrF57oLHRMnga9fxRivydHz7tMTuBhSSwhzjw== - dependencies: - "@sentry/types" "7.119.0" - "@sentry/utils" "7.119.0" - "@sentry/core@7.52.0": version "7.52.0" resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.52.0.tgz#6c820ca48fe2f06bfd6b290044c96de2375f2ad4" @@ -4767,6 +4691,15 @@ "@sentry/utils" "7.52.1" tslib "^1.9.3" +"@sentry/core@7.60.1": + version "7.60.1" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.60.1.tgz#789ebb2ba6808042e8c288f6881b82ff108c9c7c" + integrity sha512-yr/0VFYWOJyXj+F2nifkRYxXskotsNnDggUnFOZZN2ZgTG94IzRFsOZQ6RslHJ8nrYPTBNO74reU0C0GB++xRw== + dependencies: + "@sentry/types" "7.60.1" + "@sentry/utils" "7.60.1" + tslib "^2.4.1 || ^1.9.3" + "@sentry/hub@6.19.7": version "6.19.7" resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.19.7.tgz#58ad7776bbd31e9596a8ec46365b45cd8b9cfd11" @@ -4776,15 +4709,6 @@ "@sentry/utils" "6.19.7" tslib "^1.9.3" -"@sentry/hub@7.119.0": - version "7.119.0" - resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-7.119.0.tgz#a94d657b9d3cfd4cc061c5c238f86faefb55d5d8" - integrity sha512-183h5B/rZosLxpB+ZYOvFdHk0rwZbKskxqKFtcyPbDAfpCUgCass41UTqyxF6aH1qLgCRxX8GcLRF7frIa/SOg== - dependencies: - "@sentry/core" "7.119.0" - "@sentry/types" "7.119.0" - "@sentry/utils" "7.119.0" - "@sentry/hub@7.52.0": version "7.52.0" resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-7.52.0.tgz#ffc087d58c745d57108862faa0f701b15503dcc2" @@ -4795,15 +4719,15 @@ "@sentry/utils" "7.52.0" tslib "^1.9.3" -"@sentry/integrations@7.119.0": - version "7.119.0" - resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-7.119.0.tgz#5b25c603026dbacfe1ae7bb8d768506a129149fb" - integrity sha512-OHShvtsRW0A+ZL/ZbMnMqDEtJddPasndjq+1aQXw40mN+zeP7At/V1yPZyFaURy86iX7Ucxw5BtmzuNy7hLyTA== +"@sentry/hub@7.60.1": + version "7.60.1" + resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-7.60.1.tgz#fd554a1e6148806b2bd3159c4c27a19b1ea3dbfd" + integrity sha512-cYDcn1amIn7hu9sa8Oh0wgf+h7aojxjv7ukdR7zfMQgUpSeMsJLjA3YdL3983dPyxbnMhaZkviqtmzInYq9tfg== dependencies: - "@sentry/core" "7.119.0" - "@sentry/types" "7.119.0" - "@sentry/utils" "7.119.0" - localforage "^1.8.1" + "@sentry/core" "7.60.1" + "@sentry/types" "7.60.1" + "@sentry/utils" "7.60.1" + tslib "^2.4.1 || ^1.9.3" "@sentry/integrations@7.52.0": version "7.52.0" @@ -4825,6 +4749,16 @@ localforage "^1.8.1" tslib "^1.9.3" +"@sentry/integrations@7.60.1": + version "7.60.1" + resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-7.60.1.tgz#2c0054d57ae337599d3c3a2d412226b4a7a62567" + integrity sha512-GkxGGUOGyRZ2aJrHfGPGJ40wh+r03xDHgjeM7SMHwdJdxTgFhv4xUZAl6NlywbxL5t2jhVwCMZNYIvy/vUrcFQ== + dependencies: + "@sentry/types" "7.60.1" + "@sentry/utils" "7.60.1" + localforage "^1.8.1" + tslib "^2.4.1 || ^1.9.3" + "@sentry/minimal@6.19.7": version "6.19.7" resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.19.7.tgz#b3ee46d6abef9ef3dd4837ebcb6bdfd01b9aa7b4" @@ -4862,31 +4796,19 @@ "@sentry/types" "7.52.0" "@sentry/utils" "7.52.0" -"@sentry/react-native@^5.33.1": - version "5.33.1" - resolved "https://registry.yarnpkg.com/@sentry/react-native/-/react-native-5.33.1.tgz#5427bb71205443c7fe0f5ea001bbe2ff724a686e" - integrity sha512-k463M0wC+5FNJrKvzsE6uq7cjMKOrzT+hNm79sFjxqbw6vXgMHOjOcYsji7jFr5Nqr0jEOHm2niwsVlYEXGVAg== - dependencies: - "@sentry/babel-plugin-component-annotate" "2.20.1" - "@sentry/browser" "7.119.0" - "@sentry/cli" "2.36.1" - "@sentry/core" "7.119.0" - "@sentry/hub" "7.119.0" - "@sentry/integrations" "7.119.0" - "@sentry/react" "7.119.0" - "@sentry/types" "7.119.0" - "@sentry/utils" "7.119.0" - -"@sentry/react@7.119.0": - version "7.119.0" - resolved "https://registry.yarnpkg.com/@sentry/react/-/react-7.119.0.tgz#79f2c9d94322a3afbfa8af9f5b872f7c2e9b0820" - integrity sha512-cf8Cei+qdSA26gx+IMAuc/k44PeBImNzIpXi3930SLhUe44ypT5OZ/44L6xTODHZzTIyMSJPduf59vT2+eW9yg== - dependencies: - "@sentry/browser" "7.119.0" - "@sentry/core" "7.119.0" - "@sentry/types" "7.119.0" - "@sentry/utils" "7.119.0" - hoist-non-react-statics "^3.3.2" +"@sentry/react-native@^5.8.0": + version "5.8.0" + resolved "https://registry.yarnpkg.com/@sentry/react-native/-/react-native-5.8.0.tgz#82dc72d8851c327cea5b60bc0299f2feec529167" + integrity sha512-vOTgm/7pXwlIttq58gade7Gm9Zoe5NMFuR4IIaPssJVwTpWTaUTnrvtsTXyjFceaL/EmgAVqK0B0JtOFwfykEA== + dependencies: + "@sentry/browser" "7.60.1" + "@sentry/cli" "2.19.4" + "@sentry/core" "7.60.1" + "@sentry/hub" "7.60.1" + "@sentry/integrations" "7.60.1" + "@sentry/react" "7.60.1" + "@sentry/types" "7.60.1" + "@sentry/utils" "7.60.1" "@sentry/react@7.52.0": version "7.52.0" @@ -4910,15 +4832,16 @@ hoist-non-react-statics "^3.3.2" tslib "^1.9.3" -"@sentry/replay@7.119.0": - version "7.119.0" - resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.119.0.tgz#50881079d013c77f87a994331d8bcad1d49e0960" - integrity sha512-BnNsYL+X5I4WCH6wOpY6HQtp4MgVt0NVlhLUsEyrvMUiTs0bPkDBrulsgZQBUKJsbOr3l9nHrFoNVB/0i6WNLA== +"@sentry/react@7.60.1": + version "7.60.1" + resolved "https://registry.yarnpkg.com/@sentry/react/-/react-7.60.1.tgz#ceeb35dadebb41454f488c17d0b9c2e5d59e5ff4" + integrity sha512-977wb5gp7SHv9kHPs1HZtL60slt2WBFY9/YJI9Av7BjjJ/A89OhtBwbVhIcKXZ4hwHQVWuOiFCJdMrIfZXpFPA== dependencies: - "@sentry-internal/tracing" "7.119.0" - "@sentry/core" "7.119.0" - "@sentry/types" "7.119.0" - "@sentry/utils" "7.119.0" + "@sentry/browser" "7.60.1" + "@sentry/types" "7.60.1" + "@sentry/utils" "7.60.1" + hoist-non-react-statics "^3.3.2" + tslib "^2.4.1 || ^1.9.3" "@sentry/replay@7.52.0": version "7.52.0" @@ -4938,16 +4861,20 @@ "@sentry/types" "7.52.1" "@sentry/utils" "7.52.1" +"@sentry/replay@7.60.1": + version "7.60.1" + resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.60.1.tgz#07ad56f47255706504ee099729bfe476538aa91d" + integrity sha512-WHQxEpJbHICs12L17LGgS/ql91yn9wJDH/hgb+1H90HaasjoR54ofWCKul29OvYV0snTWuHd6xauwtzyv9tzvg== + dependencies: + "@sentry/core" "7.60.1" + "@sentry/types" "7.60.1" + "@sentry/utils" "7.60.1" + "@sentry/types@6.19.7", "@sentry/types@^6.2.5": version "6.19.7" resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.19.7.tgz#c6b337912e588083fc2896eb012526cf7cfec7c7" integrity sha512-jH84pDYE+hHIbVnab3Hr+ZXr1v8QABfhx39KknxqKWr2l0oEItzepV0URvbEhB446lk/S/59230dlUUIBGsXbg== -"@sentry/types@7.119.0": - version "7.119.0" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.119.0.tgz#8b3d7a1405c362e75cd900d46089df4e70919d2a" - integrity sha512-27qQbutDBPKGbuJHROxhIWc1i0HJaGLA90tjMu11wt0E4UNxXRX+UQl4Twu68v4EV3CPvQcEpQfgsViYcXmq+w== - "@sentry/types@7.52.0": version "7.52.0" resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.52.0.tgz#b7d5372f17355e3991cbe818ad567f3fe277cc6b" @@ -4958,6 +4885,11 @@ resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.52.1.tgz#bcff6d0462d9b9b7b9ec31c0068fe02d44f25da2" integrity sha512-OMbGBPrJsw0iEXwZ2bJUYxewI1IEAU2e1aQGc0O6QW5+6hhCh+8HO8Xl4EymqwejjztuwStkl6G1qhK+Q0/Row== +"@sentry/types@7.60.1": + version "7.60.1" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.60.1.tgz#2f8740db56ae4cae87523ae7a0daf753308496f0" + integrity sha512-8lKKSCOhZ953cWxwnfZwoR3ZFFlZG4P3PQFTaFt/u4LxLh/0zYbdtgvtUqXRURjMCi5P6ddeE9Uw9FGnTJCsTw== + "@sentry/utils@6.19.7": version "6.19.7" resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.19.7.tgz#6edd739f8185fd71afe49cbe351c1bbf5e7b7c79" @@ -4966,13 +4898,6 @@ "@sentry/types" "6.19.7" tslib "^1.9.3" -"@sentry/utils@7.119.0": - version "7.119.0" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.119.0.tgz#debe29020f6ef3786a5bd855cf1b97116b7be826" - integrity sha512-ZwyXexWn2ZIe2bBoYnXJVPc2esCSbKpdc6+0WJa8eutXfHq3FRKg4ohkfCBpfxljQGEfP1+kfin945lA21Ka+A== - dependencies: - "@sentry/types" "7.119.0" - "@sentry/utils@7.52.0": version "7.52.0" resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.52.0.tgz#cacc36d905036ba7084c14965e964fc44239d7f0" @@ -4989,6 +4914,14 @@ "@sentry/types" "7.52.1" tslib "^1.9.3" +"@sentry/utils@7.60.1": + version "7.60.1" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.60.1.tgz#27b20bd2926c877011eb39fcb4b2db95dc72243f" + integrity sha512-ik+5sKGBx4DWuvf6UUKPSafaDiASxP+Xvjg3C9ppop2I/JWxP1FfZ5g22n5ZmPmNahD6clTSoTWly8qyDUlUOw== + dependencies: + "@sentry/types" "7.60.1" + tslib "^2.4.1 || ^1.9.3" + "@servie/events@^1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@servie/events/-/events-1.0.0.tgz#8258684b52d418ab7b86533e861186638ecc5dc1" @@ -22239,7 +22172,7 @@ tslib@^1, tslib@^1.14.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.3.0: +tslib@^2.3.0, "tslib@^2.4.1 || ^1.9.3": version "2.6.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.1.tgz#fd8c9a0ff42590b25703c0acb3de3d3f4ede0410" integrity sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig== From bf707c903ef6b9c84db005a3913de04f07948c54 Mon Sep 17 00:00:00 2001 From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com> Date: Mon, 7 Oct 2024 14:05:05 +0100 Subject: [PATCH 2/2] fix(wallet-mobile): qr link full read within yoroi (#3682) --- .../.storybook/storybook.requires.js | 1 + apps/wallet-mobile/src/WalletNavigator.tsx | 73 ++-- apps/wallet-mobile/src/YoroiApp.tsx | 25 +- .../Settings/SettingsScreenNavigator.tsx | 335 +++++++++--------- .../messages/src/WalletNavigator.json | 96 ++--- .../Settings/SettingsScreenNavigator.json | 160 ++++----- 6 files changed, 341 insertions(+), 349 deletions(-) diff --git a/apps/wallet-mobile/.storybook/storybook.requires.js b/apps/wallet-mobile/.storybook/storybook.requires.js index f593d32e88..7046d09d9b 100644 --- a/apps/wallet-mobile/.storybook/storybook.requires.js +++ b/apps/wallet-mobile/.storybook/storybook.requires.js @@ -75,6 +75,7 @@ const getStories = () => { "./src/components/ExpandableInfoCard/ExpandableInfoCard.stories.tsx": require("../src/components/ExpandableInfoCard/ExpandableInfoCard.stories.tsx"), "./src/components/HideableText/HideableText.stories.tsx": require("../src/components/HideableText/HideableText.stories.tsx"), "./src/components/Icon/Icon.stories.tsx": require("../src/components/Icon/Icon.stories.tsx"), + "./src/components/InfoBanner/InfoBanner.stories.tsx": require("../src/components/InfoBanner/InfoBanner.stories.tsx"), "./src/components/LanguagePicker/LanguagePicker.stories.tsx": require("../src/components/LanguagePicker/LanguagePicker.stories.tsx"), "./src/components/LanguagePicker/LanguagePickerWarning.stories.tsx": require("../src/components/LanguagePicker/LanguagePickerWarning.stories.tsx"), "./src/components/legacy/Modal/Modal.stories.tsx": require("../src/components/legacy/Modal/Modal.stories.tsx"), diff --git a/apps/wallet-mobile/src/WalletNavigator.tsx b/apps/wallet-mobile/src/WalletNavigator.tsx index 31169b7b74..b67c47d16a 100644 --- a/apps/wallet-mobile/src/WalletNavigator.tsx +++ b/apps/wallet-mobile/src/WalletNavigator.tsx @@ -10,7 +10,6 @@ import { swapStorageMaker, } from '@yoroi/swap' import {useTheme} from '@yoroi/theme' -import {TransferProvider} from '@yoroi/transfer' import {Swap} from '@yoroi/types' import React from 'react' import {defineMessages, useIntl} from 'react-intl' @@ -233,51 +232,49 @@ export const WalletNavigator = () => { } return ( - - - + + {children}, }} - > - {children}, - }} - component={SelectWalletFromList} - /> + component={SelectWalletFromList} + /> - + - + - + - CatalystNavigator} - /> + CatalystNavigator} + /> - + - + - - - - + + + ) } diff --git a/apps/wallet-mobile/src/YoroiApp.tsx b/apps/wallet-mobile/src/YoroiApp.tsx index 97c06b05aa..fc98586531 100644 --- a/apps/wallet-mobile/src/YoroiApp.tsx +++ b/apps/wallet-mobile/src/YoroiApp.tsx @@ -2,6 +2,7 @@ import {AsyncStorageProvider} from '@yoroi/common' import {LinksProvider} from '@yoroi/links' import {SetupWalletProvider} from '@yoroi/setup-wallet' import {ThemeProvider} from '@yoroi/theme' +import {TransferProvider} from '@yoroi/transfer' import React from 'react' import {LogBox, StyleSheet} from 'react-native' import * as RNP from 'react-native-paper' @@ -58,17 +59,19 @@ const Yoroi = () => { - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/apps/wallet-mobile/src/features/Settings/SettingsScreenNavigator.tsx b/apps/wallet-mobile/src/features/Settings/SettingsScreenNavigator.tsx index fff982f18a..6054fdd899 100644 --- a/apps/wallet-mobile/src/features/Settings/SettingsScreenNavigator.tsx +++ b/apps/wallet-mobile/src/features/Settings/SettingsScreenNavigator.tsx @@ -2,7 +2,6 @@ import {createMaterialTopTabNavigator} from '@react-navigation/material-top-tabs import {useFocusEffect, useNavigation} from '@react-navigation/native' import {createStackNavigator} from '@react-navigation/stack' import {useTheme} from '@yoroi/theme' -import {TransferProvider} from '@yoroi/transfer' import React from 'react' import {defineMessages, useIntl} from 'react-intl' import {TouchableOpacity} from 'react-native' @@ -19,7 +18,6 @@ import { } from '../../kernel/navigation' import {ChangePinScreen} from '../Auth/ChangePinScreen' import {EnableLoginWithPin} from '../Auth/EnableLoginWithPin' -import {useSelectedWallet} from '../WalletManager/common/hooks/useSelectedWallet' import {About} from './About' import {ApplicationSettingsScreen} from './ApplicationSettings' import {ChangeLanguageScreen} from './ChangeLanguage' @@ -45,7 +43,6 @@ import {WalletSettingsScreen} from './WalletSettings' const Stack = createStackNavigator() export const SettingsScreenNavigator = () => { const strings = useStrings() - const {wallet} = useSelectedWallet() const {track} = useMetrics() const {atoms, color} = useTheme() const {handleOpenModal} = useHandleOpenNetworkNoticeModal() @@ -57,176 +54,170 @@ export const SettingsScreenNavigator = () => { ) return ( - - + + + + + + + {children}, + }} + /> + + + + + + + + + + + + + + + + + + ( + + + + ), + }} + /> + + + + + + + + + + + + + + + + null, + }} + component={SubmittedTxScreen} + /> + + - - - - - - - {children}, - }} - /> - - - - - - - - - - - - - - - - - - ( - - - - ), - }} - /> - - - - - - - - - - - - - - - - null, - }} - component={SubmittedTxScreen} - /> - - - - - - + component={FailedTxScreen} + /> + + + ) } diff --git a/apps/wallet-mobile/translations/messages/src/WalletNavigator.json b/apps/wallet-mobile/translations/messages/src/WalletNavigator.json index 0a23067a8f..6e8179e2ac 100644 --- a/apps/wallet-mobile/translations/messages/src/WalletNavigator.json +++ b/apps/wallet-mobile/translations/messages/src/WalletNavigator.json @@ -4,14 +4,14 @@ "defaultMessage": "!!!Transactions", "file": "src/WalletNavigator.tsx", "start": { - "line": 306, + "line": 303, "column": 22, - "index": 10644 + "index": 10476 }, "end": { - "line": 309, + "line": 306, "column": 3, - "index": 10747 + "index": 10579 } }, { @@ -19,14 +19,14 @@ "defaultMessage": "!!!Send", "file": "src/WalletNavigator.tsx", "start": { - "line": 310, + "line": 307, "column": 14, - "index": 10763 + "index": 10595 }, "end": { - "line": 313, + "line": 310, "column": 3, - "index": 10862 + "index": 10694 } }, { @@ -34,14 +34,14 @@ "defaultMessage": "!!!Receive", "file": "src/WalletNavigator.tsx", "start": { - "line": 314, + "line": 311, "column": 17, - "index": 10881 + "index": 10713 }, "end": { - "line": 317, + "line": 314, "column": 3, - "index": 10986 + "index": 10818 } }, { @@ -49,14 +49,14 @@ "defaultMessage": "!!!Dashboard", "file": "src/WalletNavigator.tsx", "start": { - "line": 318, + "line": 315, "column": 19, - "index": 11007 + "index": 10839 }, "end": { - "line": 321, + "line": 318, "column": 3, - "index": 11104 + "index": 10936 } }, { @@ -64,14 +64,14 @@ "defaultMessage": "!!!Delegate", "file": "src/WalletNavigator.tsx", "start": { - "line": 322, + "line": 319, "column": 18, - "index": 11124 + "index": 10956 }, "end": { - "line": 325, + "line": 322, "column": 3, - "index": 11219 + "index": 11051 } }, { @@ -79,14 +79,14 @@ "defaultMessage": "!!!Wallet", "file": "src/WalletNavigator.tsx", "start": { - "line": 326, + "line": 323, "column": 16, - "index": 11237 + "index": 11069 }, "end": { - "line": 329, + "line": 326, "column": 3, - "index": 11335 + "index": 11167 } }, { @@ -94,14 +94,14 @@ "defaultMessage": "!!!Staking", "file": "src/WalletNavigator.tsx", "start": { - "line": 330, + "line": 327, "column": 17, - "index": 11354 + "index": 11186 }, "end": { - "line": 333, + "line": 330, "column": 3, - "index": 11419 + "index": 11251 } }, { @@ -109,14 +109,14 @@ "defaultMessage": "!!!NFT Gallery", "file": "src/WalletNavigator.tsx", "start": { - "line": 334, + "line": 331, "column": 14, - "index": 11435 + "index": 11267 }, "end": { - "line": 337, + "line": 334, "column": 3, - "index": 11529 + "index": 11361 } }, { @@ -124,14 +124,14 @@ "defaultMessage": "!!!Menu", "file": "src/WalletNavigator.tsx", "start": { - "line": 338, + "line": 335, "column": 14, - "index": 11545 + "index": 11377 }, "end": { - "line": 341, + "line": 338, "column": 3, - "index": 11597 + "index": 11429 } }, { @@ -139,14 +139,14 @@ "defaultMessage": "!!!Discover", "file": "src/WalletNavigator.tsx", "start": { - "line": 342, + "line": 339, "column": 18, - "index": 11617 + "index": 11449 }, "end": { - "line": 345, + "line": 342, "column": 3, - "index": 11706 + "index": 11538 } }, { @@ -154,14 +154,14 @@ "defaultMessage": "!!!My wallets", "file": "src/WalletNavigator.tsx", "start": { - "line": 346, + "line": 343, "column": 31, - "index": 11739 + "index": 11571 }, "end": { - "line": 349, + "line": 346, "column": 3, - "index": 11848 + "index": 11680 } }, { @@ -169,14 +169,14 @@ "defaultMessage": "!!!Portfolio", "file": "src/WalletNavigator.tsx", "start": { - "line": 350, + "line": 347, "column": 19, - "index": 11869 + "index": 11701 }, "end": { - "line": 353, + "line": 350, "column": 3, - "index": 11938 + "index": 11770 } } ] \ No newline at end of file diff --git a/apps/wallet-mobile/translations/messages/src/features/Settings/SettingsScreenNavigator.json b/apps/wallet-mobile/translations/messages/src/features/Settings/SettingsScreenNavigator.json index 0b85270988..98c2c91766 100644 --- a/apps/wallet-mobile/translations/messages/src/features/Settings/SettingsScreenNavigator.json +++ b/apps/wallet-mobile/translations/messages/src/features/Settings/SettingsScreenNavigator.json @@ -4,14 +4,14 @@ "defaultMessage": "!!!Wallet", "file": "src/features/Settings/SettingsScreenNavigator.tsx", "start": { - "line": 274, + "line": 265, "column": 18, - "index": 8562 + "index": 8007 }, "end": { - "line": 277, + "line": 268, "column": 3, - "index": 8660 + "index": 8105 } }, { @@ -19,14 +19,14 @@ "defaultMessage": "!!!Application", "file": "src/features/Settings/SettingsScreenNavigator.tsx", "start": { - "line": 278, + "line": 269, "column": 15, - "index": 8677 + "index": 8122 }, "end": { - "line": 281, + "line": 272, "column": 3, - "index": 8786 + "index": 8231 } }, { @@ -34,14 +34,14 @@ "defaultMessage": "!!!Change PIN", "file": "src/features/Settings/SettingsScreenNavigator.tsx", "start": { - "line": 282, + "line": 273, "column": 24, - "index": 8812 + "index": 8257 }, "end": { - "line": 285, + "line": 276, "column": 3, - "index": 8921 + "index": 8366 } }, { @@ -49,14 +49,14 @@ "defaultMessage": "!!!Change spending password", "file": "src/features/Settings/SettingsScreenNavigator.tsx", "start": { - "line": 286, + "line": 277, "column": 23, - "index": 8946 + "index": 8391 }, "end": { - "line": 289, + "line": 280, "column": 3, - "index": 9060 + "index": 8505 } }, { @@ -64,14 +64,14 @@ "defaultMessage": "!!!Remove wallet", "file": "src/features/Settings/SettingsScreenNavigator.tsx", "start": { - "line": 290, + "line": 281, "column": 21, - "index": 9083 + "index": 8528 }, "end": { - "line": 293, + "line": 284, "column": 3, - "index": 9184 + "index": 8629 } }, { @@ -79,14 +79,14 @@ "defaultMessage": "!!!Terms of Service Agreement", "file": "src/features/Settings/SettingsScreenNavigator.tsx", "start": { - "line": 294, + "line": 285, "column": 23, - "index": 9209 + "index": 8654 }, "end": { - "line": 297, + "line": 288, "column": 3, - "index": 9325 + "index": 8770 } }, { @@ -94,14 +94,14 @@ "defaultMessage": "!!!Change wallet name", "file": "src/features/Settings/SettingsScreenNavigator.tsx", "start": { - "line": 298, + "line": 289, "column": 25, - "index": 9352 + "index": 8797 }, "end": { - "line": 301, + "line": 292, "column": 3, - "index": 9456 + "index": 8901 } }, { @@ -109,14 +109,14 @@ "defaultMessage": "!!!Support", "file": "src/features/Settings/SettingsScreenNavigator.tsx", "start": { - "line": 302, + "line": 293, "column": 16, - "index": 9474 + "index": 8919 }, "end": { - "line": 305, + "line": 296, "column": 3, - "index": 9565 + "index": 9010 } }, { @@ -124,14 +124,14 @@ "defaultMessage": "!!!Easy confirmation", "file": "src/features/Settings/SettingsScreenNavigator.tsx", "start": { - "line": 306, + "line": 297, "column": 31, - "index": 9598 + "index": 9043 }, "end": { - "line": 309, + "line": 300, "column": 3, - "index": 9713 + "index": 9158 } }, { @@ -139,14 +139,14 @@ "defaultMessage": "!!!Easy confirmation", "file": "src/features/Settings/SettingsScreenNavigator.tsx", "start": { - "line": 310, + "line": 301, "column": 32, - "index": 9747 + "index": 9192 }, "end": { - "line": 313, + "line": 304, "column": 3, - "index": 9863 + "index": 9308 } }, { @@ -154,14 +154,14 @@ "defaultMessage": "!!!Set PIN", "file": "src/features/Settings/SettingsScreenNavigator.tsx", "start": { - "line": 314, + "line": 305, "column": 18, - "index": 9883 + "index": 9328 }, "end": { - "line": 317, + "line": 308, "column": 3, - "index": 9981 + "index": 9426 } }, { @@ -169,14 +169,14 @@ "defaultMessage": "!!!Settings", "file": "src/features/Settings/SettingsScreenNavigator.tsx", "start": { - "line": 318, + "line": 309, "column": 17, - "index": 10000 + "index": 9445 }, "end": { - "line": 321, + "line": 312, "column": 3, - "index": 10103 + "index": 9548 } }, { @@ -184,14 +184,14 @@ "defaultMessage": "!!!Language", "file": "src/features/Settings/SettingsScreenNavigator.tsx", "start": { - "line": 322, + "line": 313, "column": 17, - "index": 10122 + "index": 9567 }, "end": { - "line": 325, + "line": 316, "column": 3, - "index": 10220 + "index": 9665 } }, { @@ -199,14 +199,14 @@ "defaultMessage": "!!!Theming", "file": "src/features/Settings/SettingsScreenNavigator.tsx", "start": { - "line": 326, + "line": 317, "column": 14, - "index": 10236 + "index": 9681 }, "end": { - "line": 329, + "line": 320, "column": 3, - "index": 10330 + "index": 9775 } }, { @@ -214,14 +214,14 @@ "defaultMessage": "!!!Network", "file": "src/features/Settings/SettingsScreenNavigator.tsx", "start": { - "line": 330, + "line": 321, "column": 16, - "index": 10348 + "index": 9793 }, "end": { - "line": 333, + "line": 324, "column": 3, - "index": 10444 + "index": 9889 } }, { @@ -229,14 +229,14 @@ "defaultMessage": "!!!App settings", "file": "src/features/Settings/SettingsScreenNavigator.tsx", "start": { - "line": 334, + "line": 325, "column": 20, - "index": 10466 + "index": 9911 }, "end": { - "line": 337, + "line": 328, "column": 3, - "index": 10584 + "index": 10029 } }, { @@ -244,14 +244,14 @@ "defaultMessage": "!!!About", "file": "src/features/Settings/SettingsScreenNavigator.tsx", "start": { - "line": 338, + "line": 329, "column": 14, - "index": 10600 + "index": 10045 }, "end": { - "line": 341, + "line": 332, "column": 3, - "index": 10700 + "index": 10145 } }, { @@ -259,14 +259,14 @@ "defaultMessage": "!!!Privacy Policy", "file": "src/features/Settings/SettingsScreenNavigator.tsx", "start": { - "line": 342, + "line": 333, "column": 22, - "index": 10724 + "index": 10169 }, "end": { - "line": 345, + "line": 336, "column": 3, - "index": 10827 + "index": 10272 } }, { @@ -274,14 +274,14 @@ "defaultMessage": "!!!Collateral", "file": "src/features/Settings/SettingsScreenNavigator.tsx", "start": { - "line": 346, + "line": 337, "column": 14, - "index": 10843 + "index": 10288 }, "end": { - "line": 349, + "line": 340, "column": 3, - "index": 10914 + "index": 10359 } }, { @@ -289,14 +289,14 @@ "defaultMessage": "!!!Log", "file": "src/features/Settings/SettingsScreenNavigator.tsx", "start": { - "line": 350, + "line": 341, "column": 18, - "index": 10934 + "index": 10379 }, "end": { - "line": 353, + "line": 344, "column": 3, - "index": 10991 + "index": 10436 } } ] \ No newline at end of file