diff --git a/web/cashtab/src/components/Send/__tests__/__snapshots__/Send.test.js.snap b/web/cashtab/src/components/Send/__tests__/__snapshots__/Send.test.js.snap
--- a/web/cashtab/src/components/Send/__tests__/__snapshots__/Send.test.js.snap
+++ b/web/cashtab/src/components/Send/__tests__/__snapshots__/Send.test.js.snap
@@ -44,7 +44,7 @@
className="sc-iwsKbI bwAByd"
>
@@ -154,7 +155,7 @@
className="sc-iwsKbI bwAByd"
>
@@ -365,25 +367,27 @@
role="button"
tabIndex={0}
>
-
-
-
+
+
+
Advanced
@@ -430,25 +434,27 @@
role="button"
tabIndex={0}
>
-
-
-
+
+
+
Sign Message
@@ -500,7 +506,7 @@
className="sc-iwsKbI bwAByd"
>
@@ -610,7 +617,7 @@
className="sc-iwsKbI bwAByd"
>
@@ -821,25 +829,27 @@
role="button"
tabIndex={0}
>
-
-
-
+
+
+
Advanced
@@ -886,25 +896,27 @@
role="button"
tabIndex={0}
>
-
-
-
+
+
+
Sign Message
@@ -963,7 +975,7 @@
className="sc-iwsKbI bwAByd"
>
@@ -1073,7 +1086,7 @@
className="sc-iwsKbI bwAByd"
>
@@ -1284,25 +1298,27 @@
role="button"
tabIndex={0}
>
-
-
-
+
+
+
Advanced
@@ -1350,25 +1366,27 @@
role="button"
tabIndex={0}
>
-
-
-
+
+
+
Sign Message
@@ -1420,7 +1438,7 @@
className="sc-iwsKbI bwAByd"
>
@@ -1530,7 +1549,7 @@
className="sc-iwsKbI bwAByd"
>
@@ -1741,25 +1761,27 @@
role="button"
tabIndex={0}
>
-
-
-
+
+
+
Advanced
@@ -1806,25 +1828,27 @@
role="button"
tabIndex={0}
>
-
-
-
+
+
+
Sign Message
@@ -1876,7 +1900,7 @@
className="sc-iwsKbI bwAByd"
>
@@ -1986,7 +2011,7 @@
className="sc-iwsKbI bwAByd"
>
@@ -2197,25 +2223,27 @@
role="button"
tabIndex={0}
>
-
-
-
+
+
+
Advanced
@@ -2262,25 +2290,27 @@
role="button"
tabIndex={0}
>
-
-
-
+
+
+
Sign Message
diff --git a/web/cashtab/src/components/Send/__tests__/__snapshots__/SendToken.test.js.snap b/web/cashtab/src/components/Send/__tests__/__snapshots__/SendToken.test.js.snap
--- a/web/cashtab/src/components/Send/__tests__/__snapshots__/SendToken.test.js.snap
+++ b/web/cashtab/src/components/Send/__tests__/__snapshots__/SendToken.test.js.snap
@@ -47,9 +47,6 @@
-
@@ -81,7 +78,7 @@
className="sc-VigVT ktfrOp"
>
@@ -191,7 +189,7 @@
className="sc-VigVT ktfrOp"
>
diff --git a/web/cashtab/src/components/Tokens/__tests__/__snapshots__/CreateTokenForm.test.js.snap b/web/cashtab/src/components/Tokens/__tests__/__snapshots__/CreateTokenForm.test.js.snap
--- a/web/cashtab/src/components/Tokens/__tests__/__snapshots__/CreateTokenForm.test.js.snap
+++ b/web/cashtab/src/components/Tokens/__tests__/__snapshots__/CreateTokenForm.test.js.snap
@@ -21,25 +21,27 @@
role="button"
tabIndex={0}
>
-
-
-
+
+
+
Create eToken
diff --git a/web/cashtab/src/components/Tokens/__tests__/__snapshots__/Tokens.test.js.snap b/web/cashtab/src/components/Tokens/__tests__/__snapshots__/Tokens.test.js.snap
--- a/web/cashtab/src/components/Tokens/__tests__/__snapshots__/Tokens.test.js.snap
+++ b/web/cashtab/src/components/Tokens/__tests__/__snapshots__/Tokens.test.js.snap
@@ -52,9 +52,6 @@
-
@@ -83,25 +80,27 @@
role="button"
tabIndex={-1}
>
-
-
-
+
+
+
Create eToken
@@ -179,9 +178,6 @@
-
@@ -210,25 +206,27 @@
role="button"
tabIndex={-1}
>
-
-
-
+
+
+
Create eToken
@@ -307,9 +305,6 @@
-
@@ -338,25 +333,27 @@
role="button"
tabIndex={0}
>
-
-
-
+
+
+
Create eToken
@@ -439,9 +436,6 @@
-
@@ -470,25 +464,27 @@
role="button"
tabIndex={-1}
>
-
-
-
+
+
+
Create eToken
@@ -566,9 +562,6 @@
-
@@ -597,25 +590,27 @@
role="button"
tabIndex={-1}
>
-
-
-
+
+
+
Create eToken
diff --git a/web/cashtab/src/serviceWorker.js b/web/cashtab/src/serviceWorker.js
--- a/web/cashtab/src/serviceWorker.js
+++ b/web/cashtab/src/serviceWorker.js
@@ -1,52 +1,62 @@
-workbox.setConfig({
- debug: false,
-});
+import { clientsClaim } from 'workbox-core';
+import { setCacheNameDetails } from 'workbox-core';
+import { precacheAndRoute } from 'workbox-precaching';
+import { registerRoute } from 'workbox-routing';
+import { CacheFirst } from 'workbox-strategies';
+import { CacheableResponsePlugin } from 'workbox-cacheable-response';
+import { ExpirationPlugin } from 'workbox-expiration';
-workbox.core.skipWaiting();
-workbox.core.clientsClaim();
+clientsClaim();
+self.skipWaiting();
-const cachedPathNames = [
- '/v2/transaction/details',
- '/v2/rawtransactions/getRawTransaction',
- '/v2/slp/validateTxid',
-];
+// cofingure prefix, suffix, and cacheNames
+const prefix = 'cashtab';
+const suffix = 'v1.0.0';
+const staticAssetsCache = `static-assets`;
-workbox.routing.registerRoute(
- ({ url, event }) =>
- cachedPathNames.some(cachedPathName =>
- url.pathname.includes(cachedPathName),
- ),
- async ({ event, url }) => {
- try {
- const cache = await caches.open('api-cache');
- const cacheKeys = await cache.keys();
- if (cacheKeys.length > 100) {
- await Promise.all(cacheKeys.map(key => cache.delete(key)));
- }
- const requestBody = await event.request.clone().text();
+// configure prefix and suffix for default cache names
+setCacheNameDetails({
+ prefix: prefix,
+ suffix: suffix,
+ precache: staticAssetsCache,
+});
- try {
- const response = await cache.match(
- `${url.pathname}/${requestBody}`,
- );
- if (!response) {
- throw new Error('SW: Not cached!');
- }
- return response;
- } catch (error) {
- const response = await fetch(event.request.clone());
- if (response.status === 200) {
- const body = await response.clone().text();
- cache.put(
- `${url.pathname}/${requestBody}`,
- new Response(body, { status: 200 }),
- );
- }
- return response.clone();
- }
- } catch (err) {
- return fetch(event.request.clone());
- }
+// injection point for static assets caching
+precacheAndRoute(self.__WB_MANIFEST);
+
+// Caching TX and Token Details using CacheFirst Strategy
+const txDetailsCaches = [
+ {
+ // ecash tx
+ path: '/rawtransactions/getRawTransaction/',
+ name: `${prefix}-tx-data-${suffix}`,
+ },
+ {
+ // slp tx
+ path: '/slp/txDetails/',
+ name: `${prefix}-slp-tx-data-${suffix}`,
},
- 'POST',
-);
+ {
+ // slp token
+ path: '/slp/tokenStats/',
+ name: `${prefix}-slp-token-stats-${suffix}`,
+ },
+];
+
+txDetailsCaches.forEach(cache => {
+ registerRoute(
+ ({ url }) => url.pathname.includes(cache.path),
+ new CacheFirst({
+ cacheName: cache.name,
+ plugins: [
+ new CacheableResponsePlugin({
+ statuses: [200],
+ }),
+ new ExpirationPlugin({
+ maxEntries: 1000,
+ maxAgeSeconds: 365 * 24 * 60 * 60,
+ }),
+ ],
+ }),
+ );
+});