Merge branch 'master' into armani/wormhole

extension/src/manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "Sollet",
   "description": "Solana SPL Token Wallet",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "browser_action": {
     "default_popup": "index.html",
     "default_title": "Open the popup"
@@ -13,7 +13,7 @@
     "512": "logo512.png"
   },
   "background": {
-    "persistent": false,
+    "persistent": true,
     "scripts": ["background.js"]
   },
   "permissions": [

src/components/DeleteMnemonicDialog.js

@@ -21,7 +21,7 @@ export default function DeleteMnemonicDialog({ open, onClose }) {
         }}
         fullWidth
       >
-        <DialogTitle>{'Log Out & Delete Mnemonic'}</DialogTitle>
+        <DialogTitle>{'Delete Mnemonic & Log Out'}</DialogTitle>
         <DialogContentText style={{ margin: 20 }}>
           <div
             style={{

src/components/NavigationFrame.js

@@ -230,7 +230,7 @@ function NetworkSelector() {
                 <CheckIcon fontSize="small" />
               ) : null}
             </ListItemIcon>
-            {cluster.apiUrl}
+            {cluster.name === 'mainnet-beta-backup' ? 'Mainnet Beta Backup' : cluster.apiUrl}
           </MenuItem>
         ))}
       </Menu>
@@ -391,7 +391,7 @@ function WalletSelector() {
           <ListItemIcon className={classes.menuItemIcon}>
             <ExitToApp fontSize="small" />
           </ListItemIcon>
-          {'Log Out & Delete Mnemonic'}
+          {'Delete Mnemonic & Log Out'}
         </MenuItem>
       </Menu>
     </>

src/components/SendDialog.js

@@ -461,7 +461,7 @@ function SendSwapDialog({
       />
     );
   }
-
+  const bitcoinDisable = (blockchain === 'btc' ? parseFloat(transferAmountString) < 0.001 : false);
   let sendButton = (
     <Button
       type="submit"
@@ -470,7 +470,8 @@ function SendSwapDialog({
         sending ||
         (needMetamask && !ethAccount) ||
         !validAmount ||
-        insufficientEthBalance
+        insufficientEthBalance ||
+        bitcoinDisable
       }
     >
       Send

src/utils/clusters.js

@@ -1,26 +1,36 @@
 import { clusterApiUrl } from '@solana/web3.js';
-import { MAINNET_URL } from '../utils/connection';
+import { MAINNET_URL, MAINNET_VIP_URL } from '../utils/connection';
 
 export const CLUSTERS = [
   {
     name: 'mainnet-beta',
     apiUrl: MAINNET_URL,
-    label: 'Mainnet Beta'
+		label: 'Mainnet Beta',
+		clusterSlug: 'mainnet-beta',
+  },
+  {
+    name: 'mainnet-beta-backup',
+    apiUrl: MAINNET_VIP_URL,
+			label: 'Mainnet Beta Backup',
+		clusterSlug: 'mainnet-beta',
   },
   {
     name: 'devnet',
     apiUrl: clusterApiUrl('devnet'),
-    label: 'Devnet'
+		label: 'Devnet',
+		clusterSlug: 'devnet',
   },
   {
     name: 'testnet',
     apiUrl: clusterApiUrl('testnet'),
-    label: 'Testnet'
+		label: 'Testnet',
+		clusterSlug: 'testnet',
   },
   {
     name: 'localnet',
     apiUrl: 'http://localhost:8899',
-    label: null
+		label: null,
+		clusterSlug: 'localnet',
   }
 ];
 

src/utils/connection.tsx

@@ -17,8 +17,9 @@ const ConnectionContext = React.createContext<{
   connection: Connection;
 } | null>(null);
 
-//export const MAINNET_URL = 'https://solana-api.projectserum.com';
-export const MAINNET_URL = 'https://api.mainnet-beta.solana.com';
+export const MAINNET_URL = 'https://solana-api.projectserum.com';
+export const MAINNET_VIP_URL = 'https://vip-api.mainnet-beta.solana.com/';
+
 export function ConnectionProvider({ children }) {
   const [endpoint, setEndpoint] = useLocalStorageState(
     'connectionEndpoint',
@@ -57,7 +58,7 @@ export function useIsProdNetwork() {
   if (!context) {
     throw new Error('Missing connection context');
   }
-  return context.endpoint === MAINNET_URL;
+  return context.endpoint === MAINNET_URL || context.endpoint === MAINNET_VIP_URL;
 }
 
 export function useSolanaExplorerUrlSuffix() {

src/utils/tokens/names.js

@@ -279,7 +279,7 @@ export function TokenRegistryProvider(props) {
       const cluster = clusterForEndpoint(endpoint);
 
       const filteredTokenListContainer = tokenListContainer?.filterByClusterSlug(
-        cluster?.name,
+				cluster?.clusterSlug
       );
       const tokenInfos =
         tokenListContainer !== filteredTokenListContainer