Fixing merge conflicts with master

gatsby-config.js

@@ -7,7 +7,7 @@
 module.exports = {
   /* Your site config here */
   plugins: [
-    'fullstack-gatsby-theme-bch-wallet',
+    "fullstack-gatsby-theme-bch-wallet",
     // 'bch-wallet-plugin-postoffice',
     // {
     //   resolve: 'gatsby-plugin-compile-es6-packages',
@@ -16,8 +16,8 @@ module.exports = {
     //   }
     // },
     // require.resolve('/home/trout/work/psf/gatsby-plugin-bch-sweep')
-    'fullstack-gatsby-plugin-bch-sweep',
-    'gatsby-plugin-bch-create-token'
+    "fullstack-gatsby-plugin-bch-sweep"
+    // 'gatsby-plugin-bch-create-token'
   ],
   // https://www.gatsbyjs.com/docs/reference/release-notes/v2.28/#feature-flags-in-gatsby-configjs
   flags: {

gatsby-node.js

@@ -0,0 +1,16 @@
+const path = require('path')
+// const webpack = require('webpack')
+exports.onCreateWebpackConfig = ({ stage, actions, getConfig, plugins }) => {
+  // console.log('stage', stage)
+  // console.log('actions', actions)
+  // console.log('getConfig', getConfig)
+
+  // https://webpack.js.org/configuration/resolve/
+  actions.setWebpackConfig({
+    resolve: {
+      alias: {
+        'adminlte-2-react': path.resolve('./node_modules/adminlte-2-react')
+      }
+    }
+  })
+}

package.json

@@ -24,10 +24,10 @@
     "@capacitor/android": "2.4.6",
     "@capacitor/cli": "2.4.6",
     "@capacitor/core": "2.4.6",
-    "gatsby": "4.4.0",
-    "gatsby-plugin-bch-create-token": "1.1.2",
-    "gatsby-plugin-bch-sweep": "1.5.6",
-    "fullstack-gatsby-theme-bch-wallet": "1.0.3"
+    "adminlte-2-react": "0.2.0-beta.10",
+    "fullstack-gatsby-plugin-bch-sweep": "1.0.0",
+    "fullstack-gatsby-theme-bch-wallet": "1.0.4",
+    "gatsby": "4.4.0"
   },
   "repository": {
     "type": "git",

src/fullstack-gatsby-theme-bch-wallet/components/menu-components.js

@@ -6,65 +6,65 @@
   It over-rides he default file in the gatsby-ipfs-web-wallet Theme.
 */
 
-import React from 'react'
-import { Sidebar } from 'adminlte-2-react'
+import React from "react"
+import { Sidebar } from "adminlte-2-react"
 
-import Wallet from 'fullstack-gatsby-theme-bch-wallet/src/components/admin-lte/wallet'
-import Tokens from 'fullstack-gatsby-theme-bch-wallet/src/components/admin-lte/tokens'
-import Configure from 'fullstack-gatsby-theme-bch-wallet/src/components/admin-lte/configure'
-import SendReceive from 'fullstack-gatsby-theme-bch-wallet/src/components/admin-lte/send-receive'
+import Wallet from "fullstack-gatsby-theme-bch-wallet/src/components/admin-lte/wallet"
+import Tokens from "fullstack-gatsby-theme-bch-wallet/src/components/admin-lte/tokens"
+import Configure from "fullstack-gatsby-theme-bch-wallet/src/components/admin-lte/configure"
+import SendReceive from "fullstack-gatsby-theme-bch-wallet/src/components/admin-lte/send-receive"
 
-import About from '../../about'
-import Sweep from 'fullstack-gatsby-plugin-bch-sweep/src/components/sweep/index'
-import CreateToken from 'gatsby-plugin-bch-create-token/src/components/create-token'
+import About from "../../about"
+import Sweep from "fullstack-gatsby-plugin-bch-sweep/src/components/sweep/index"
+// import CreateToken from "gatsby-plugin-bch-create-token/src/components/create-token"
 
 const { Item } = Sidebar
 
 const MenuComponents = props => {
   return [
     {
-      key: 'Tokens',
-      component: <Tokens key='Tokens' {...props} />,
-      menuItem: <Item icon='fas-coins' key='Tokens' text='Tokens' />
+      key: "Tokens",
+      component: <Tokens key="Tokens" {...props} />,
+      menuItem: <Item icon="fas-coins" key="Tokens" text="Tokens" />
     },
     {
-      key: 'Send/Receive BCH',
-      component: <SendReceive key='Send/Receive BCH' {...props} />,
+      key: "Send/Receive BCH",
+      component: <SendReceive key="Send/Receive BCH" {...props} />,
       menuItem: (
         <Item
-          icon='fa-exchange-alt'
-          key='Send/Receive BCH'
-          text='Send/Receive BCH'
+          icon="fa-exchange-alt"
+          key="Send/Receive BCH"
+          text="Send/Receive BCH"
         />
       )
     },
     {
-      key: 'Sweep',
-      component: <Sweep key='Sweep' {...props} />,
-      menuItem: <Item icon='fas-arrow-circle-up' key='Sweep' text='Sweep' />
+      key: "Sweep",
+      component: <Sweep key="Sweep" {...props} />,
+      menuItem: <Item icon="fas-arrow-circle-up" key="Sweep" text="Sweep" />
     },
     {
-      key: 'Wallet',
-      component: <Wallet key='Wallet' interface='rest-api' {...props} />,
+      key: "Wallet",
+      component: <Wallet key="Wallet" interface="rest-api" {...props} />,
       // component: <Wallet key="Wallet" interface="consumer-api" {...props} />,
-      menuItem: <Item icon='fa-wallet' key='Wallet' text='Wallet' />
+      menuItem: <Item icon="fa-wallet" key="Wallet" text="Wallet" />
+    },
+    // {
+    //   key: 'Create Token',
+    //   component: <CreateToken key='Create Token' {...props} />,
+    //   menuItem: (
+    //     <Item icon='fas-plus-square' key='Create Token' text='Create Token' />
+    //   )
+    // },
+    {
+      key: "Configure",
+      component: <Configure key="Configure" {...props} />,
+      menuItem: <Item icon="fas-cog" key="Configure" text="Configure" />
     },
     {
-      key: 'Create Token',
-      component: <CreateToken key='Create Token' {...props} />,
-      menuItem: (
-        <Item icon='fas-plus-square' key='Create Token' text='Create Token' />
-      )
-    },
-    {
-      key: 'Configure',
-      component: <Configure key='Configure' {...props} />,
-      menuItem: <Item icon='fas-cog' key='Configure' text='Configure' />
-    },
-    {
-      key: 'About',
-      component: <About key='About' {...props} />,
-      menuItem: <Item icon='fas-question' key='About' text='About' />
+      key: "About",
+      component: <About key="About" {...props} />,
+      menuItem: <Item icon="fas-question" key="About" text="About" />
     }
   ]
 }