refactor: migrate widgets (#2481)

* refactor(widgets): migrate widgets

* chore(widgets): add migration for existing users

Author: pwltr

android/app/src/main/AndroidManifest.xml

@@ -69,7 +69,6 @@
         <data android:scheme="bitkit" />
         <data android:scheme="slash" />
         <data android:scheme="slashauth" />
-        <data android:scheme="slashfeed" />
         <data android:scheme="bitcoin" />
         <data android:scheme="BITCOIN" />
         <data android:scheme="lightning" />
@@ -88,7 +87,6 @@
         <data android:scheme="bitkit" />
         <data android:scheme="slash" />
         <data android:scheme="slashauth" />
-        <data android:scheme="slashfeed" />
         <data android:scheme="bitcoin" />
         <data android:scheme="BITCOIN" />
         <data android:scheme="lightning" />

e2e/backup.e2e.js

@@ -97,7 +97,7 @@ d('Backup', () => {
 		// remove 2 default widgets, leave PriceWidget
 		await element(by.id('WalletsScrollView')).scroll(200, 'down', NaN, 0.85);
 		await element(by.id('WidgetsEdit')).tap();
-		for (const w of ['HeadlinesWidget', 'BlocksWidget']) {
+		for (const w of ['NewsWidget', 'BlocksWidget']) {
 			await element(by.id('WidgetActionDelete').withAncestor(by.id(w))).tap();
 			await element(by.text('Yes, Delete')).tap();
 			await expect(element(by.id(w))).not.toBeVisible();
@@ -126,7 +126,7 @@ d('Backup', () => {
 		// check widgets
 		await element(by.id('WalletsScrollView')).scroll(300, 'down', NaN, 0.85);
 		await expect(element(by.id('PriceWidget'))).toExist();
-		await expect(element(by.id('HeadlinesWidget'))).not.toExist();
+		await expect(element(by.id('NewsWidget'))).not.toExist();
 		await expect(element(by.id('BlocksWidget'))).not.toExist();
 
 		markComplete('backup-1');

e2e/widgets.e2e.js

@@ -28,7 +28,7 @@ d('Widgets', () => {
 
 		// delete all default widgets
 		await element(by.id('WidgetsEdit')).tap();
-		for (const w of ['PriceWidget', 'HeadlinesWidget', 'BlocksWidget']) {
+		for (const w of ['PriceWidget', 'NewsWidget', 'BlocksWidget']) {
 			await element(by.id('WidgetActionDelete').withAncestor(by.id(w))).tap();
 			await element(by.text('Yes, Delete')).tap();
 			await expect(element(by.id(w))).not.toBeVisible();
@@ -38,16 +38,16 @@ d('Widgets', () => {
 		await element(by.id('WalletsScrollView')).scroll(300, 'down', NaN, 0.85);
 		await element(by.id('WidgetsAdd')).tap();
 		await element(by.id('WidgetsOnboarding-button')).tap();
-		await element(by.id('PriceWidget')).tap();
+		await element(by.id('WidgetListItem-price')).tap();
 		await waitFor(element(by.id('WidgetEdit')))
 			.toBeVisible()
 			.withTimeout(20000);
 		await expect(element(by.text('Default'))).toBeVisible();
 		await element(by.id('WidgetEdit')).tap();
 		await element(by.id('WidgetEditField-BTC/EUR')).tap();
 		await element(by.id('WidgetEditScrollView')).scrollTo('bottom');
-		await element(by.id('PriceWidgetSetting-1W')).tap();
-		await element(by.id('WidgetEditSource')).tap();
+		await element(by.id('WidgetEditField-1W')).tap();
+		await element(by.id('WidgetEditField-showSource')).tap();
 		await element(by.id('WidgetEditPreview')).tap();
 		await element(by.id('WidgetSave')).tap();
 		await element(by.id('WalletsScrollView')).scroll(200, 'down', NaN, 0.85);

ios/bitkit/Info.plist

@@ -28,7 +28,6 @@
 				<string>bitkit</string>
 				<string>slash</string>
 				<string>slashauth</string>
-				<string>slashfeed</string>
 				<string>bitcoin</string>
 				<string>BITCOIN</string>
 				<string>lightning</string>

package.json

@@ -47,18 +47,13 @@
     "@reduxjs/toolkit": "2.2.6",
     "@shopify/react-native-skia": "1.3.11",
     "@synonymdev/blocktank-lsp-http-client": "2.2.0",
-    "@synonymdev/feeds": "3.0.0",
     "@synonymdev/react-native-ldk": "0.0.155",
     "@synonymdev/react-native-lnurl": "0.0.10",
     "@synonymdev/react-native-pubky": "^0.3.0",
     "@synonymdev/result": "0.0.2",
     "@synonymdev/slashtags-keychain": "1.0.0",
     "@synonymdev/slashtags-profile": "2.0.0",
     "@synonymdev/slashtags-url": "1.0.1",
-    "@synonymdev/slashtags-widget-bitcoin-feed": "1.0.0",
-    "@synonymdev/slashtags-widget-facts-feed": "1.1.0",
-    "@synonymdev/slashtags-widget-news-feed": "1.1.0",
-    "@synonymdev/slashtags-widget-price-feed": "1.1.0",
     "@synonymdev/web-relay": "1.0.7",
     "beignet": "0.0.52",
     "bip21": "2.0.3",

src/assets/icons/widgets.ts

@@ -1,5 +1,12 @@
-export const bitfinexIcon = (): string =>
-	'<svg fill="none" height="40" viewBox="0 0 40 40" width="40" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><clipPath id="a"><path d="m10 10h20v20h-20z"/></clipPath><path d="m0 0h40v40h-40z" fill="#0e3452"/><g clip-path="url(#a)" fill="#03ca9b"><path d="m10.1704 22.995c-.17231-2.788.9987-5.887 3.4105-8.2988 5.2443-5.24423 16.1656-4.5092 16.2278-4.5049-.0299.0432-8.0138 11.619-17.4749 12.7017-.7314.0837-1.4542.1166-2.1634.102z"/><path d="m11.2784 26.5596c.2701.4307.5894.8341.9588 1.2034 3.2372 3.2372 9.0874 2.6356 13.0668-1.3438 5.2591-5.2592 4.5047-16.2279 4.5047-16.2279-.0291.065-5.7521 12.8938-14.8479 15.692-1.2347.3799-2.4724.6012-3.6824.6763z"/></g></svg>';
+export const blocksIcon = (): string =>
+	`<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="64" height="64" rx="8" fill="#FF4400"/>
+<path opacity="0.2" d="M17.7972 23.9707C17.6844 24.1626 17.625 24.3812 17.625 24.6038V39.3952C17.625 39.6165 17.6838 39.8339 17.7953 40.0251C17.9069 40.2163 18.0672 40.3744 18.2599 40.4834L31.3849 47.9018C31.5726 48.0079 31.7845 48.0637 32 48.0636V48.0636L32.1659 31.9995L17.7973 23.9708L17.7972 23.9707Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M32.1788 30.7501C32.8691 30.7572 33.423 31.3226 33.4158 32.0129L33.2499 48.077C33.2428 48.7674 32.6774 49.3212 31.9871 49.3141C31.2968 49.3069 30.7429 48.7415 30.7501 48.0512L30.916 31.9871C30.9231 31.2968 31.4885 30.7429 32.1788 30.7501Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M30.7699 15.0091C31.1451 14.797 31.5689 14.6855 32 14.6855C32.4311 14.6855 32.8549 14.797 33.2301 15.0091L46.3551 22.4276C46.7406 22.6455 47.0612 22.9618 47.2843 23.3441C47.5074 23.7265 47.625 24.1613 47.625 24.604V39.3954C47.625 39.8381 47.5074 40.2729 47.2843 40.6553C47.0612 41.0376 46.7406 41.3539 46.3551 41.5718L33.2301 48.9903C32.8549 49.2024 32.4311 49.3138 32 49.3138C31.5689 49.3138 31.1452 49.2024 30.7699 48.9903L17.6449 41.5718C17.2594 41.3539 16.9388 41.0376 16.7157 40.6553C16.4926 40.2729 16.375 39.8381 16.375 39.3954V24.604C16.375 24.1613 16.4926 23.7265 16.7157 23.3441C16.9388 22.9617 17.2594 22.6455 17.6449 22.4276L18.2599 23.5158L17.6449 22.4276L30.7699 15.0091ZM32 17.1855L18.875 24.604V39.3954L32 46.8138L45.125 39.3954V24.604L32 17.1855L32.6151 16.0973L32 17.1855Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.7059 23.3612C17.0426 22.7585 17.8042 22.543 18.4068 22.8797L32.1586 30.5638L45.583 22.8875C46.1823 22.5448 46.9459 22.7529 47.2886 23.3522C47.6313 23.9515 47.4233 24.7151 46.824 25.0578L32.7862 33.0848C32.4056 33.3025 31.9387 33.3048 31.556 33.0909L17.1874 25.0621C16.5847 24.7254 16.3691 23.9639 16.7059 23.3612Z" fill="white"/>
+</svg>
+`;
 
 export const calculatorIcon = (): string =>
 	`<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
@@ -14,6 +21,36 @@ export const calculatorIcon = (): string =>
 </svg>
 `;
 
+export const factsIcon = (): string =>
+	`<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="64" height="64" rx="8" fill="#FF4400"/>
+<path opacity="0.2" d="M24.4989 38.2502C22.4004 36.6759 20.8503 34.4813 20.0683 31.9771C19.2863 29.473 19.3119 26.7862 20.1417 24.2975C20.9714 21.8088 22.5631 19.6441 24.6914 18.1103C26.8196 16.5764 29.3766 15.751 32 15.751C34.6234 15.751 37.1803 16.5764 39.3086 18.1102C41.4369 19.6441 43.0286 21.8087 43.8583 24.2975C44.6881 26.7862 44.7137 29.4729 43.9317 31.9771C43.1497 34.4812 41.5997 36.6759 39.5011 38.2501" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.75 43.25C25.75 42.5596 26.3096 42 27 42H37C37.6904 42 38.25 42.5596 38.25 43.25C38.25 43.9404 37.6904 44.5 37 44.5H27C26.3096 44.5 25.75 43.9404 25.75 43.25Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27 48.25C27 47.5596 27.5596 47 28.25 47H35.75C36.4404 47 37 47.5596 37 48.25C37 48.9404 36.4404 49.5 35.75 49.5H28.25C27.5596 49.5 27 48.9404 27 48.25Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M32 17.001C29.6389 17.001 27.3377 17.7438 25.4222 19.1243C23.5068 20.5048 22.0743 22.453 21.3275 24.6928C20.5807 26.9327 20.5576 29.3508 21.2615 31.6045C21.9653 33.8582 23.3603 35.8334 25.249 37.2502C25.8013 37.6645 25.9131 38.448 25.4988 39.0003C25.0846 39.5525 24.3011 39.6644 23.7488 39.2501C21.4404 37.5184 19.7353 35.1043 18.8751 32.3497C18.0149 29.5952 18.0431 26.6398 18.9558 23.9021C19.8685 21.1645 21.6194 18.7835 23.9605 17.0962C26.3016 15.4089 29.1142 14.501 32 14.501C34.8857 14.501 37.6984 15.4089 40.0394 17.0962C42.3805 18.7834 44.1314 21.1645 45.0441 23.9021C45.9569 26.6397 45.9851 29.5951 45.1249 32.3497C44.2647 35.1043 42.5596 37.5184 40.2512 39.2501C39.699 39.6643 38.9155 39.5525 38.5012 39.0003C38.0869 38.448 38.1988 37.6645 38.751 37.2502C40.6397 35.8334 42.0347 33.8582 42.7386 31.6045C43.4424 29.3507 43.4192 26.9327 42.6725 24.6928C41.9257 22.4529 40.4932 20.5048 38.5777 19.1243C36.6623 17.7438 34.3611 17.001 32 17.001Z" fill="white"/>
+</svg>
+`;
+
+export const newsIcon = (): string =>
+	`<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="48" height="48" rx="6.4" fill="#FF4400"/>
+<path opacity="0.2" d="M12.75 33.375C13.2473 33.375 13.7242 33.1775 14.0758 32.8258C14.4275 32.4742 14.625 31.9973 14.625 31.5V15.5625C14.625 15.3139 14.7238 15.0754 14.8996 14.8996C15.0754 14.7238 15.3139 14.625 15.5625 14.625H35.25C35.4986 14.625 35.7371 14.7238 35.9129 14.8996C36.0887 15.0754 36.1875 15.3139 36.1875 15.5625V31.5C36.1875 31.9973 35.99 32.4742 35.6383 32.8258C35.2867 33.1775 34.8098 33.375 34.3125 33.375H12.75Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.375 20.25C18.375 19.7322 18.7947 19.3125 19.3125 19.3125H31.5C32.0178 19.3125 32.4375 19.7322 32.4375 20.25C32.4375 20.7678 32.0178 21.1875 31.5 21.1875H19.3125C18.7947 21.1875 18.375 20.7678 18.375 20.25Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.375 24C18.375 23.4822 18.7947 23.0625 19.3125 23.0625H31.5C32.0178 23.0625 32.4375 23.4822 32.4375 24C32.4375 24.5178 32.0178 24.9375 31.5 24.9375H19.3125C18.7947 24.9375 18.375 24.5178 18.375 24Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.375 27.75C18.375 27.2322 18.7947 26.8125 19.3125 26.8125H31.5C32.0178 26.8125 32.4375 27.2322 32.4375 27.75C32.4375 28.2678 32.0178 28.6875 31.5 28.6875H19.3125C18.7947 28.6875 18.375 28.2678 18.375 27.75Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.2367 14.2367C14.5883 13.885 15.0652 13.6875 15.5625 13.6875H35.25C35.7473 13.6875 36.2242 13.885 36.5758 14.2367C36.9275 14.5883 37.125 15.0652 37.125 15.5625V31.5C37.125 32.2459 36.8287 32.9613 36.3012 33.4887C35.7738 34.0162 35.0584 34.3125 34.3125 34.3125H12.75C12.2322 34.3125 11.8125 33.8928 11.8125 33.375C11.8125 32.8572 12.2322 32.4375 12.75 32.4375C12.9986 32.4375 13.2371 32.3387 13.4129 32.1629C13.5887 31.9871 13.6875 31.7486 13.6875 31.5V15.5625C13.6875 15.0652 13.885 14.5883 14.2367 14.2367ZM15.4017 32.4375H34.3125C34.5611 32.4375 34.7996 32.3387 34.9754 32.1629C35.1512 31.9871 35.25 31.7486 35.25 31.5V15.5625L15.5625 15.5625V31.5C15.5625 31.8225 15.5071 32.1392 15.4017 32.4375Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.875 17.4375C11.3928 17.4375 11.8125 17.8572 11.8125 18.375V31.5C11.8125 31.7486 11.9113 31.9871 12.0871 32.1629C12.2629 32.3387 12.5014 32.4375 12.75 32.4375C13.2678 32.4375 13.6875 32.8572 13.6875 33.375C13.6875 33.8928 13.2678 34.3125 12.75 34.3125C12.0041 34.3125 11.2887 34.0162 10.7613 33.4887C10.2338 32.9613 9.9375 32.2459 9.9375 31.5V18.375C9.9375 17.8572 10.3572 17.4375 10.875 17.4375Z" fill="white"/>
+</svg>
+`;
+
+export const priceIcon = (): string =>
+	`<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="64" height="64" rx="8" fill="#FF4400"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17 18.25C17.6904 18.25 18.25 18.8096 18.25 19.5V43.25H47C47.6904 43.25 48.25 43.8096 48.25 44.5C48.25 45.1904 47.6904 45.75 47 45.75H17C16.3096 45.75 15.75 45.1904 15.75 44.5V19.5C15.75 18.8096 16.3096 18.25 17 18.25Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M47.9407 26.1769C48.3953 26.6964 48.3427 27.4861 47.8231 27.9407L37.8231 36.6907C37.3786 37.0797 36.7225 37.1044 36.25 36.75L27.0606 29.858L17.8231 37.9407C17.3036 38.3953 16.5139 38.3427 16.0593 37.8231C15.6047 37.3036 15.6573 36.5139 16.1769 36.0593L26.1769 27.3093C26.6214 26.9203 27.2775 26.8956 27.75 27.25L36.9394 34.1421L46.1769 26.0593C46.6964 25.6047 47.4861 25.6573 47.9407 26.1769Z" fill="white"/>
+</svg>
+`;
+
 export const weatherIcon = (): string =>
 	`<svg width="33" height="32" viewBox="0 0 33 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <rect x="0.776611" width="32" height="32" rx="6.4" fill="#FF4400"/>