Skip to content

Commit

Permalink
feat: osmosis swap (#466)
Browse files Browse the repository at this point in the history
* feat: swap osmosis

* Optimize Osmosis illustration asset

* Optimize NFT placeholder asset

* Update packages/components/CurrencyIcon.tsx

Co-authored-by: n0izn0iz <[email protected]>

* fix: submit fixes for PR review

* fix: yarn-install

* fix: fix after rebase

* fix: fixes after rebase and rollback on forwardRef in TextInputCustom

* wip: disable feature and try to find what causes "out of memory" build issue

* wip: enable feature

* chore: add generated network.json

* wip: test fixing out of memory

* fix: make networks.json

* Lazy load components

* [big] Fix Lint issues

Import order

Lazy load components

* yarn files test

* fix npx ts-node packages/scripts/validateNetworks.ts

* fix Cannot find module '/home/runner/work/teritori-dapp/teritori-dapp/.yarn/releases/yarn-3.5.0.cjs'

* fix Cannot find module '/home/runner/work/teritori-dapp/teritori-dapp/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs'

* fix: test updated deps

* Revert "fix: test updated deps"

* Fix: swap view instead of swap modal, some fixes

* run make generate.contracts-clients

* fix: fix white screen related to useRewards

* fix: limiting networks

* fix conflicts with main

---------

Co-authored-by: Eng. Juan Combetto <[email protected]>
Co-authored-by: n0izn0iz <[email protected]>
Co-authored-by: yo1110 <[email protected]>
Co-authored-by: Juan Manuel Combetto <[email protected]>
  • Loading branch information
5 people authored Apr 4, 2023
1 parent 0afd503 commit ee896a9
Show file tree
Hide file tree
Showing 240 changed files with 34,991 additions and 22,455 deletions.
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ PRICES_DB_PASSWORD=magic

PRICES_SERVICE_URI=prices.mainnet.teritori.com:443

DISPLAYED_NETWORKS_IDS=teritori,teritori-testnet,ethereum,ethereum-goerli,cosmos-hub,juno,osmosis,solana
SELECTABLE_NETWORKS_IDS=teritori,teritori-testnet,ethereum,ethereum-goerli
DISPLAYED_NETWORKS_IDS=teritori,teritori-testnet,ethereum,ethereum-goerli,cosmos-hub,juno,osmosis,osmosis-testnet,solana
SELECTABLE_NETWORKS_IDS=teritori,teritori-testnet,ethereum,ethereum-goerli,osmosis,osmosis-testnet

PINATA_JWT=your_pinata_admin_jwt_key_here
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/.yarn/** linguist-vendored
/.yarn/releases/* binary
/.yarn/plugins/**/* binary
/.pnp.* binary linguist-generated
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ node_modules/
npm-debug.log
yarn-error.log
package-lock.json
.yarn/

# BUCK
buck-out/
Expand Down
541 changes: 541 additions & 0 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

Large diffs are not rendered by default.

873 changes: 873 additions & 0 deletions .yarn/releases/yarn-3.5.0.cjs

Large diffs are not rendered by default.

45 changes: 45 additions & 0 deletions .yarnclean
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# test directories
__tests__
test
tests
powered-test

# asset directories
docs
doc
website
images
assets

# examples
example
examples

# code coverage directories
coverage
.nyc_output

# build scripts
Makefile
Gulpfile.js
Gruntfile.js

# configs
appveyor.yml
circle.yml
codeship-services.yml
codeship-steps.yml
wercker.yml
.tern-project
.gitattributes
.editorconfig
.*ignore
.eslintrc
.jshintrc
.flowconfig
.documentup.json
.yarn-metadata.json
.travis.yml

# misc
*.md
5 changes: 5 additions & 0 deletions .yarnrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
# yarn lockfile v1


yarn-path ".yarn/releases/yarn-1.22.19.cjs"
7 changes: 7 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
nodeLinker: node-modules

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"

yarnPath: .yarn/releases/yarn-3.5.0.cjs
56 changes: 29 additions & 27 deletions App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { NavigationContainer } from "@react-navigation/native";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { StatusBar } from "expo-status-bar";
import { MetaMaskProvider } from "metamask-react";
import React from "react";
import React, { Suspense } from "react";
import { useForm, FormProvider } from "react-hook-form";
import { Platform } from "react-native";
import { MenuProvider } from "react-native-popup-menu";
Expand Down Expand Up @@ -49,32 +49,34 @@ export default function App() {
return (
<QueryClientProvider client={queryClient}>
<FormProvider<DefaultForm> {...methods}>
<MetaMaskProvider>
<NavigationContainer linking={linking}>
<SafeAreaProvider>
<ReduxProvider store={store}>
<FeedbacksContextProvider>
<DropdownsContextProvider>
<WalletsProvider>
<TransactionModalsProvider>
<TNSContextProvider>
<TNSMetaDataListContextProvider>
<MenuProvider>
<SidebarContextProvider>
<StatusBar style="inverted" />
<Navigator />
</SidebarContextProvider>
</MenuProvider>
</TNSMetaDataListContextProvider>
</TNSContextProvider>
</TransactionModalsProvider>
</WalletsProvider>
</DropdownsContextProvider>
</FeedbacksContextProvider>
</ReduxProvider>
</SafeAreaProvider>
</NavigationContainer>
</MetaMaskProvider>
<Suspense fallback={<></>}>
<MetaMaskProvider>
<NavigationContainer linking={linking}>
<SafeAreaProvider>
<ReduxProvider store={store}>
<FeedbacksContextProvider>
<DropdownsContextProvider>
<WalletsProvider>
<TransactionModalsProvider>
<TNSContextProvider>
<TNSMetaDataListContextProvider>
<MenuProvider>
<SidebarContextProvider>
<StatusBar style="inverted" />
<Navigator />
</SidebarContextProvider>
</MenuProvider>
</TNSMetaDataListContextProvider>
</TNSContextProvider>
</TransactionModalsProvider>
</WalletsProvider>
</DropdownsContextProvider>
</FeedbacksContextProvider>
</ReduxProvider>
</SafeAreaProvider>
</NavigationContainer>
</MetaMaskProvider>
</Suspense>
</FormProvider>
</QueryClientProvider>
);
Expand Down
5 changes: 5 additions & 0 deletions assets/icons/chevron-circle-down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions assets/icons/chevron-circle-up.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions assets/icons/networks/juno-circle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/icons/nft.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 0 additions & 14 deletions assets/icons/nft.svg

This file was deleted.

4 changes: 4 additions & 0 deletions assets/icons/settings.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/osmosis-illustration.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
4 changes: 2 additions & 2 deletions mainnet.env
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ PRICES_DB_PASSWORD=magic

PRICES_SERVICE_URI=prices.mainnet.teritori.com:443

DISPLAYED_NETWORKS_IDS=teritori,teritori-testnet,ethereum,ethereum-goerli,cosmos-hub,juno,osmosis,solana
SELECTABLE_NETWORKS_IDS=teritori,teritori-testnet,ethereum,ethereum-goerli
DISPLAYED_NETWORKS_IDS=teritori,teritori-testnet,ethereum,ethereum-goerli,cosmos-hub,juno,osmosis,osmosis-testnet,solana
SELECTABLE_NETWORKS_IDS=teritori,teritori-testnet,ethereum,ethereum-goerli,osmosis,osmosis-testnet
Loading

0 comments on commit ee896a9

Please sign in to comment.