Fix in page provider injection (#794)

* changes (#792) * Fix in page provider injection --------- Co-authored-by: Terence Ng <[email protected]>
secretkeylabs · Feb 7, 2024 · 286ac33 · 286ac33
1 parent 23474bd
commit 286ac33
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 17 deletions.
diff --git a/src/app/screens/nftDashboard/rareSatsTabGridItem.tsx b/src/app/screens/nftDashboard/rareSatsTabGridItem.tsx
@@ -85,8 +85,8 @@ function RareSatsTabGridItem({ bundle, maxItems }: { bundle: Bundle; maxItems: n
 
     return icons.map((sats, index) => (
       <Range key={`${bundle.satRanges[index].block}-${bundle.satRanges[index].offset}`}>
-        {sats.map((sattribute, indexSatributes) => {
-          if (sattribute === 'ellipsis') {
+        {sats.map((satribute, indexSatributes) => {
+          if (satribute === 'ellipsis') {
             return (
               <DotsThree
                 key={`${totalTilesDisplayed}-ellipsis`}
@@ -96,7 +96,7 @@ function RareSatsTabGridItem({ bundle, maxItems }: { bundle: Bundle; maxItems: n
             );
           }
 
-          if (sattribute === '+X') {
+          if (satribute === '+X') {
             return (
               <TileText key={`${totalTilesDisplayed}-+X`} typography="body_m">
                 +{totalTiles - totalTilesDisplayed}
@@ -105,7 +105,7 @@ function RareSatsTabGridItem({ bundle, maxItems }: { bundle: Bundle; maxItems: n
           }
           return (
             // eslint-disable-next-line react/no-array-index-key
-            <RareSatIcon key={`${sattribute}-${indexSatributes}`} type={sattribute} size={24} />
+            <RareSatIcon key={`${satribute}-${indexSatributes}`} type={satribute} size={24} />
           );
         })}
       </Range>

diff --git a/src/app/screens/ordinalDetail/index.tsx b/src/app/screens/ordinalDetail/index.tsx
@@ -607,7 +607,7 @@ function OrdinalDetailScreen() {
   const stributesBadges = showSatributes && (
     <SatributesBadgeContainer isGallery={isGalleryOpen}>
       <StyledP typography="body_medium_m" color="white_400">
-        {commonT('SATTRIBUTES')}
+        {commonT('SATRIBUTES')}
       </StyledP>
       <SatributesBadges isGallery={isGalleryOpen}>
         {ordinalSatributes.map((satribute, index) => {

diff --git a/src/inpage/index.ts b/src/inpage/index.ts
@@ -9,21 +9,29 @@ declare global {
     StacksProvider: StacksProvider;
   }
 }
-// we inject these in case implementors call the default providers
-if (document.currentScript?.dataset.isPriority) {
-  Object.defineProperties(window, {
-    StacksProvider: { get: () => StacksMethodsProvider, set: () => {} },
-    BitcoinProvider: { get: () => SatsMethodsProvider, set: () => {} },
-  });
-} else {
-  window.StacksProvider = StacksMethodsProvider as StacksProvider;
-  window.BitcoinProvider = SatsMethodsProvider;
-}
 
-// We also inject the providers in an Xverse object in order to have them exclusively available for Xverse wallet
+// We inject the providers in an Xverse object in order to have them exclusively available for Xverse wallet
 // and not clash with providers from other wallets
 window.XverseProviders = {
   // @ts-ignore
   StacksProvider: StacksMethodsProvider as StacksProvider,
   BitcoinProvider: SatsMethodsProvider as BitcoinProvider,
 };
+
+// we inject these in case implementors call the default providers
+try {
+  if (document.currentScript?.dataset.isPriority) {
+    Object.defineProperties(window, {
+      StacksProvider: { get: () => StacksMethodsProvider, set: () => {} },
+      BitcoinProvider: { get: () => SatsMethodsProvider, set: () => {} },
+    });
+  } else {
+    window.StacksProvider = StacksMethodsProvider as StacksProvider;
+    window.BitcoinProvider = SatsMethodsProvider;
+  }
+} catch (e) {
+  console.log(
+    'Failed setting Xverse default providers. Another wallet may have already set them in an immutable way.',
+  );
+  console.error(e);
+}
diff --git a/src/locales/en.json b/src/locales/en.json
@@ -4,7 +4,7 @@
     "SEND": "Send",
     "COMBO": "Combo",
     "SATS": "Sats",
-    "SATTRIBUTES": "Sattributes",
+    "SATRIBUTES": "Satributes",
     "INPUT": "Input",
     "SIZE": "Size",
     "BUNDLE": "Bundle"