Merge pull request #510 from persistenceOne/redirect-fix

persistenceOne · Jan 16, 2024 · 6c76f23 · 6c76f23
2 parents bd3cee9 + 73a1c1a
commit 6c76f23
Show file tree

Hide file tree

Showing 3 changed files with 167 additions and 98 deletions.
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
@@ -5,93 +5,129 @@ name: Staging
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
 jobs:
   testnet:
-
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        node-version: [ 16.x ]
+        node-version: [16.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-    - run: git config --global url."https://github.com/".insteadOf ssh://git@github.com/
-    - run: npm ci
-    - run: npm run build --if-present
-      env:
-        CI: false
-        REACT_APP_API_KEY: 'https://rest.testnet2.persistence.one'
-        REACT_APP_TENDERMINT_RPC_ENDPOINT: 'https://rpc.testnet2.persistence.one'
-        REACT_APP_WEBSITE_URL: 'https://test-core-1.wallet.persistence.one'
-        REACT_APP_EXPLORER_API: 'https://testnet.mintscan.io/persistence-testnet'
-        REACT_APP_MAIL_CHIMP_URL: 'https://one.us17.list-manage.com/subscribe/post?u=fd70c7f5c39a43acbedb49253&amp;id=7f8e2dbc48'
-        REACT_APP_CHAIN_ID: 'test-core-2'
-        REACT_APP_CHAIN_NAME: 'Persistence Testnet'
-        REACT_APP_IBC_CONFIG: 'ibcStaging.json'
-        REACT_APP_GA_TRACKING_ID: 'UA-219210130-1'
-        REACT_APP_SENTRY_API: ''
-    - name: Upload to IPFS
-      uses: aquiladev/ipfs-action@v0.3.1
-      with:
-        path: ./build
-        service: pinata
-        pinataKey: ${{ secrets.PINATA_API_KEY }}
-        pinataSecret: ${{ secrets.PINATA_API_SECRET }}
-        pinName: pWallet ${{ github.event.release.name }} - Testnet Staging
-    - name: Publish
-      uses: cloudflare/wrangler-action@1.3.0
-      with:
-        apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-        accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-        environment: 'testnet-staging'
-
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: git config --global url."https://github.com/".insteadOf ssh://git@github.com/
+      - run: npm ci
+      - run: npm run build:ipfs --if-present
+        env:
+          CI: false
+          REACT_APP_API_KEY: "https://rest.testnet2.persistence.one"
+          REACT_APP_TENDERMINT_RPC_ENDPOINT: "https://rpc.testnet2.persistence.one"
+          REACT_APP_WEBSITE_URL: "https://test-core-1.wallet.persistence.one"
+          REACT_APP_EXPLORER_API: "https://testnet.mintscan.io/persistence-testnet"
+          REACT_APP_MAIL_CHIMP_URL: "https://one.us17.list-manage.com/subscribe/post?u=fd70c7f5c39a43acbedb49253&amp;id=7f8e2dbc48"
+          REACT_APP_CHAIN_ID: "test-core-2"
+          REACT_APP_CHAIN_NAME: "Persistence Testnet"
+          REACT_APP_IBC_CONFIG: "ibcStaging.json"
+          REACT_APP_GA_TRACKING_ID: "UA-219210130-1"
+          REACT_APP_SENTRY_API: ""
+          REACT_APP_IPFS: true
+      - name: Upload to IPFS
+        id: ipfs-build
+        uses: aquiladev/ipfs-action@v0.3.1
+        with:
+          path: ./build
+          service: pinata
+          pinataKey: ${{ secrets.PINATA_API_KEY }}
+          pinataSecret: ${{ secrets.PINATA_API_SECRET }}
+          pinName: pWallet ${{ github.event.release.name }} - Testnet Staging
+      - name: Delete IPFS Build
+        if: steps.ipfs-build.outcome == 'success'
+        run: rm -rf ./build
+      - run: npm run build --if-present
+        env:
+          CI: false
+          REACT_APP_API_KEY: "https://rest.testnet2.persistence.one"
+          REACT_APP_TENDERMINT_RPC_ENDPOINT: "https://rpc.testnet2.persistence.one"
+          REACT_APP_WEBSITE_URL: "https://test-core-1.wallet.persistence.one"
+          REACT_APP_EXPLORER_API: "https://testnet.mintscan.io/persistence-testnet"
+          REACT_APP_MAIL_CHIMP_URL: "https://one.us17.list-manage.com/subscribe/post?u=fd70c7f5c39a43acbedb49253&amp;id=7f8e2dbc48"
+          REACT_APP_CHAIN_ID: "test-core-2"
+          REACT_APP_CHAIN_NAME: "Persistence Testnet"
+          REACT_APP_IBC_CONFIG: "ibcStaging.json"
+          REACT_APP_GA_TRACKING_ID: "UA-219210130-1"
+          REACT_APP_SENTRY_API: ""
+          REACT_APP_IPFS: false
+      - name: Publish
+        uses: cloudflare/wrangler-action@1.3.0
+        with:
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          environment: "testnet-staging"
 
   mainnet:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [ 16.x ]
+        node-version: [16.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-    - run: git config --global url."https://github.com/".insteadOf ssh://git@github.com/
-    - run: npm ci
-    - run: npm run build --if-present
-      env:
-        CI: false
-        REACT_APP_API_KEY: 'https://rest.core.persistence.one'
-        REACT_APP_TENDERMINT_RPC_ENDPOINT: 'https://rpc.core.persistence.one'
-        REACT_APP_WEBSITE_URL: 'https://staging.wallet.persistence.one'
-        REACT_APP_EXPLORER_API: 'https://www.mintscan.io/persistence'
-        REACT_APP_MAIL_CHIMP_URL: 'https://one.us17.list-manage.com/subscribe/post?u=fd70c7f5c39a43acbedb49253&amp;id=7f8e2dbc48'
-        REACT_APP_CHAIN_ID: 'core-1'
-        REACT_APP_CHAIN_NAME: 'Persistence'
-        REACT_APP_IBC_CONFIG: 'ibcMainnet.json'
-        REACT_APP_GA_TRACKING_ID: 'UA-219210130-1'
-        REACT_APP_SENTRY_API: 'https://a31c61f5ce774e0791ffdc3b830b406c@o1083089.ingest.sentry.io/6092403'
-    - name: Upload to IPFS
-      uses: aquiladev/ipfs-action@v0.3.1
-      with:
-        path: ./build
-        service: pinata
-        pinataKey: ${{ secrets.PINATA_API_KEY }}
-        pinataSecret: ${{ secrets.PINATA_API_SECRET }}
-        pinName: pWallet ${{ github.event.release.name }} - Mainnet Staging
-    - name: Publish
-      uses: cloudflare/wrangler-action@1.3.0
-      with:
-        apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-        accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-        environment: 'mainnet-staging'
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: git config --global url."https://github.com/".insteadOf ssh://git@github.com/
+      - run: npm ci
+      - run: npm run build:ipfs --if-present
+        env:
+          CI: false
+          REACT_APP_API_KEY: "https://rest.core.persistence.one"
+          REACT_APP_TENDERMINT_RPC_ENDPOINT: "https://rpc.core.persistence.one"
+          REACT_APP_WEBSITE_URL: "https://staging.wallet.persistence.one"
+          REACT_APP_EXPLORER_API: "https://www.mintscan.io/persistence"
+          REACT_APP_MAIL_CHIMP_URL: "https://one.us17.list-manage.com/subscribe/post?u=fd70c7f5c39a43acbedb49253&amp;id=7f8e2dbc48"
+          REACT_APP_CHAIN_ID: "core-1"
+          REACT_APP_CHAIN_NAME: "Persistence"
+          REACT_APP_IBC_CONFIG: "ibcMainnet.json"
+          REACT_APP_GA_TRACKING_ID: "UA-219210130-1"
+          REACT_APP_SENTRY_API: "https://a31c61f5ce774e0791ffdc3b830b406c@o1083089.ingest.sentry.io/6092403"
+          REACT_APP_IPFS: true
+      - name: Upload to IPFS
+        id: ipfs-build
+        uses: aquiladev/ipfs-action@v0.3.1
+        with:
+          path: ./build
+          service: pinata
+          pinataKey: ${{ secrets.PINATA_API_KEY }}
+          pinataSecret: ${{ secrets.PINATA_API_SECRET }}
+          pinName: pWallet ${{ github.event.release.name }} - Mainnet Staging
+      - name: Delete IPFS Build
+        if: steps.ipfs-build.outcome == 'success'
+        run: rm -rf ./build
+      - run: npm run build --if-present
+        env:
+          CI: false
+          REACT_APP_API_KEY: "https://rest.testnet2.persistence.one"
+          REACT_APP_TENDERMINT_RPC_ENDPOINT: "https://rpc.testnet2.persistence.one"
+          REACT_APP_WEBSITE_URL: "https://test-core-1.wallet.persistence.one"
+          REACT_APP_EXPLORER_API: "https://testnet.mintscan.io/persistence-testnet"
+          REACT_APP_MAIL_CHIMP_URL: "https://one.us17.list-manage.com/subscribe/post?u=fd70c7f5c39a43acbedb49253&amp;id=7f8e2dbc48"
+          REACT_APP_CHAIN_ID: "test-core-2"
+          REACT_APP_CHAIN_NAME: "Persistence Testnet"
+          REACT_APP_IBC_CONFIG: "ibcStaging.json"
+          REACT_APP_GA_TRACKING_ID: "UA-219210130-1"
+          REACT_APP_SENTRY_API: ""
+          REACT_APP_IPFS: false
+      - name: Publish
+        uses: cloudflare/wrangler-action@1.3.0
+        with:
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          environment: "mainnet-staging"
diff --git a/package.json b/package.json
@@ -2,7 +2,6 @@
   "name": "pwallet",
   "version": "3.1.1",
   "private": true,
-  "homepage": ".",
   "dependencies": {
     "@cosmjs/crypto": "^0.31.1",
     "@cosmjs/encoding": "^0.31.1",
@@ -64,6 +63,7 @@
   },
   "scripts": {
     "start": "react-app-rewired start",
+    "build:ipfs": "PUBLIC_URL=. react-app-rewired build",
     "build": "react-app-rewired build",
     "test": "react-app-rewired test",
     "eject": "react-app-rewired eject"

diff --git a/src/App.js b/src/App.js
@@ -1,7 +1,6 @@
-import React, { useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 import {
   HashRouter,
-  Redirect,
   Route,
   Switch,
   useHistory,
@@ -81,13 +80,7 @@ const Main = () => {
   address = loginInfo && loginInfo.address;
   const page = location.pathname;
 
-  useEffect(() => {
-    if (window.location.pathname === "/dashboard/wallet") {
-      window.location.replace("/#/dashboard/wallet");
-    } else if (window.location.pathname === "/dashboard/staking") {
-      window.location.replace("/#/dashboard/staking");
-    }
-  }, []);
+  const isIpfs = process.env.REACT_APP_IPFS === "true";
 
   useEffect(() => {
     const fetchApi = async () => {
@@ -174,21 +167,48 @@ const Main = () => {
       ) : (
         ""
       )}
-      <HashRouter>
+      {isIpfs ? (
+        <HashRouter>
+          <Switch>
+            <Route
+              key="/"
+              exact
+              component={
+                JSON.parse(window.localStorage.getItem(LOGIN_INFO)) === null ||
+                address === undefined ||
+                address === null ||
+                address === ""
+                  ? withRouter(Homepage)
+                  : withRouter(DashboardWallet)
+              }
+              path="/"
+            />
+            {routes.map((route) => {
+              if (route.private) {
+                return (
+                  <PrivateRoute
+                    key={route.path}
+                    exact
+                    component={withRouter(route.component)}
+                    path={route.path}
+                  />
+                );
+              }
+
+              return (
+                <Route
+                  key={route.path}
+                  exact
+                  component={withRouter(route.component)}
+                  path={route.path}
+                />
+              );
+            })}
+            <Route component={RouteNotFound} />
+          </Switch>
+        </HashRouter>
+      ) : (
         <Switch>
-          <Route
-            key="/"
-            exact
-            component={
-              JSON.parse(window.localStorage.getItem(LOGIN_INFO)) === null ||
-              address === undefined ||
-              address === null ||
-              address === ""
-                ? withRouter(Homepage)
-                : withRouter(DashboardWallet)
-            }
-            path="/"
-          />
           {routes.map((route) => {
             if (route.private) {
               return (
@@ -210,9 +230,22 @@ const Main = () => {
               />
             );
           })}
+          <Route
+            key="/"
+            exact
+            component={
+              JSON.parse(window.localStorage.getItem(LOGIN_INFO)) === null ||
+              address === undefined ||
+              address === null ||
+              address === ""
+                ? withRouter(Homepage)
+                : withRouter(DashboardWallet)
+            }
+            path="/"
+          />
           <Route component={RouteNotFound} />
         </Switch>
-      </HashRouter>
+      )}
       <ModalTerms />
     </>
   );