Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
2ad7082
nope
marcaaron Sep 29, 2020
f7d32c8
add new expensimark
marcaaron Sep 29, 2020
0f8b37a
fix up style
marcaaron Sep 29, 2020
5771855
Fix broken tests
marcaaron Sep 29, 2020
dacd085
fix style in ExpensiMark
marcaaron Sep 29, 2020
005d168
disable eslint rule since there are many example where it doesnt make…
marcaaron Sep 29, 2020
dc3f591
add jest config
marcaaron Sep 29, 2020
ddd56b4
run tests in build step
marcaaron Sep 29, 2020
f59bffa
guess i cannot do that
marcaaron Sep 29, 2020
7f0333e
Add styles and style code/pre tags
marcaaron Sep 30, 2020
50d387d
looks good on web
marcaaron Sep 30, 2020
4a4f48f
fix iOS
marcaaron Sep 30, 2020
5d334f2
add monospace GTA font
marcaaron Sep 30, 2020
d4bac0e
add monospace font
marcaaron Sep 30, 2020
96be0d8
fix conflicts
marcaaron Sep 30, 2020
443c1ba
remove ExpensiMark from RNC
marcaaron Oct 1, 2020
060e489
undo a few things
marcaaron Oct 1, 2020
3126f70
fix plist
marcaaron Oct 1, 2020
8c8169c
try this again
marcaaron Oct 1, 2020
1897ca6
bump js-libs
marcaaron Oct 1, 2020
fa94c8b
try editing yml web script
marcaaron Oct 1, 2020
256c916
Revert "try editing yml web script"
marcaaron Oct 2, 2020
c8d8639
try this
marcaaron Oct 2, 2020
3ebeebb
add to the lint script maybe?
marcaaron Oct 2, 2020
2435f8b
remove platform code
marcaaron Oct 2, 2020
1b9e278
try this maybe
marcaaron Oct 2, 2020
21ee106
...
marcaaron Oct 2, 2020
a41307b
stop using ssh to see if that works
marcaaron Oct 2, 2020
1dee5b3
try this
marcaaron Oct 2, 2020
2cbc682
hmm
marcaaron Oct 2, 2020
0bc5bed
fix conflicts
marcaaron Oct 3, 2020
8e5d4f0
fix conflicts
marcaaron Oct 3, 2020
9a118ed
fix style
marcaaron Oct 3, 2020
3507560
update to use merge commit
marcaaron Oct 5, 2020
f64d13e
fix conflict
marcaaron Oct 5, 2020
f723ad5
yml indentation is real
marcaaron Oct 5, 2020
e2ee55d
use the ssh key for all node_modules installs
marcaaron Oct 5, 2020
2c0612c
fix conflict
marcaaron Oct 6, 2020
9a2841b
add propTypes
marcaaron Oct 6, 2020
5876cfc
just use node
marcaaron Oct 6, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ jobs:
- name: Install gems
run: bundle install

- uses: webfactory/ssh-agent@v0.4.0
with:
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}

- name: Install node packages
run: npm install

Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ jobs:
with:
node-version: '14.x'

- uses: webfactory/ssh-agent@v0.4.0
with:
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}

- name: Install node packages
run: npm install

Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ jobs:
- name: Install gems
run: bundle install

- uses: webfactory/ssh-agent@v0.4.0
with:
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}

- name: Install node packages
run: npm install

Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ jobs:
with:
node-version: '14.x'

- uses: webfactory/ssh-agent@v0.4.0
with:
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}

- run: npm install

- run: npm run lint
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ jobs:
with:
node-version: '14.x'

- uses: webfactory/ssh-agent@v0.4.0
with:
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}

- name: Install dependenices
run: npm install

Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ jobs:
aws-region: us-east-1

# Install node modules
- uses: webfactory/ssh-agent@v0.4.0
with:
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}

- name: Install dependenices
run: npm install

Expand Down
Binary file not shown.
Binary file added assets/fonts/GTAmericaExpMono-Rg.otf
Binary file not shown.
4 changes: 4 additions & 0 deletions ios/ReactNativeChat.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
/* Begin PBXBuildFile section */
00E356F31AD99517003FC87E /* ReactNativeChatTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* ReactNativeChatTests.m */; };
097C76E5807C5DFC565DC655 /* libPods-ReactNativeChat-ReactNativeChatTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C4F81DB9C6DA6418525441E5 /* libPods-ReactNativeChat-ReactNativeChatTests.a */; };
12DD1878FCB9487C9F031C86 /* GTAmericaExpMono-Rg.otf in Resources */ = {isa = PBXBuildFile; fileRef = 8437A5A38F2047E0BCCD7C2F /* GTAmericaExpMono-Rg.otf */; };
13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
Expand Down Expand Up @@ -49,6 +50,7 @@
67D5C3A6A7FA417C8A853FC1 /* GTAmericaExp-Light.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "GTAmericaExp-Light.otf"; path = "../assets/fonts/GTAmericaExp-Light.otf"; sourceTree = "<group>"; };
6ABF95746519766B23B4E2D0 /* libPods-ReactNativeChat.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ReactNativeChat.a"; sourceTree = BUILT_PRODUCTS_DIR; };
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = ReactNativeChat/LaunchScreen.storyboard; sourceTree = "<group>"; };
8437A5A38F2047E0BCCD7C2F /* GTAmericaExpMono-Rg.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "GTAmericaExpMono-Rg.otf"; path = "../assets/fonts/GTAmericaExpMono-Rg.otf"; sourceTree = "<group>"; };
8C7003903C1E4957824899BB /* GTAmericaExp-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "GTAmericaExp-Regular.otf"; path = "../assets/fonts/GTAmericaExp-Regular.otf"; sourceTree = "<group>"; };
9B9FEA91E46D2B2609028E69 /* Pods-ReactNativeChat.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ReactNativeChat.debug.xcconfig"; path = "Target Support Files/Pods-ReactNativeChat/Pods-ReactNativeChat.debug.xcconfig"; sourceTree = "<group>"; };
A292718541C841859D97DF2F /* GTAmericaExp-Thin.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "GTAmericaExp-Thin.otf"; path = "../assets/fonts/GTAmericaExp-Thin.otf"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -166,6 +168,7 @@
AE65058949E14DA5A2D5435D /* GTAmericaExp-Medium.otf */,
8C7003903C1E4957824899BB /* GTAmericaExp-Regular.otf */,
A292718541C841859D97DF2F /* GTAmericaExp-Thin.otf */,
8437A5A38F2047E0BCCD7C2F /* GTAmericaExpMono-Rg.otf */,
A8D6F2F722FD4E66A38EBBB6 /* GTAmericaExp-BdIt.otf */,
DB5A1365442D4419AF6F08E5 /* GTAmericaExp-MdIt.otf */,
918D7FEFF96242E6B5F5E14D /* GTAmericaExp-RgIt.otf */,
Expand Down Expand Up @@ -281,6 +284,7 @@
files = (
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */,
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
12DD1878FCB9487C9F031C86 /* GTAmericaExpMono-Rg.otf in Resources */,
1E76D5212522316A005A268F /* GTAmericaExp-Bold.otf in Resources */,
1E76D5222522316A005A268F /* GTAmericaExp-Light.otf in Resources */,
1E76D5232522316A005A268F /* GTAmericaExp-Medium.otf in Resources */,
Expand Down
19 changes: 10 additions & 9 deletions ios/ReactNativeChat/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -23,35 +23,35 @@
<key>CFBundleVersion</key>
<string>99</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false />
<false/>
<key>LSRequiresIPhoneOS</key>
<true />
<true/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true />
<true/>
<key>NSExceptionDomains</key>
<dict>
<key>localhost</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true />
<true/>
<key>NSIncludesSubdomains</key>
<true />
<true/>
</dict>
<key>www.expensify.com.dev</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true />
<true/>
<key>NSIncludesSubdomains</key>
<true />
<true/>
</dict>
</dict>
</dict>
<key>NSCameraUsageDescription</key>
<string>Your camera is used to create chat attachments.</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string />
<string/>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>Your camera roll is used to store chat attachments.</string>
<key>NSPhotoLibraryUsageDescription</key>
Expand All @@ -63,6 +63,7 @@
<string>GTAmericaExp-Medium.otf</string>
<string>GTAmericaExp-Regular.otf</string>
<string>GTAmericaExp-Thin.otf</string>
<string>GTAmericaExpMono-Rg.otf</string>
<string>GTAmericaExp-BdIt.otf</string>
<string>GTAmericaExp-MdIt.otf</string>
<string>GTAmericaExp-RgIt.otf</string>
Expand All @@ -81,6 +82,6 @@
<string>UIInterfaceOrientationPortraitUpsideDown</string>
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false />
<false/>
</dict>
</plist>
108 changes: 105 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"electron-updater": "^4.3.4",
"file-loader": "^6.0.0",
"html-entities": "^1.3.1",
"jquery": "^3.5.1",
"js-libs": "git+https://git@github.com:Expensify/JS-Libs.git#c2a2bb1b0b725b9b0681e71cb99123f9e711ec20",
"lodash.get": "^4.4.2",
"lodash.has": "^4.5.2",
"lodash.orderby": "^4.6.0",
Expand Down
18 changes: 18 additions & 0 deletions src/components/InlineCodeBlock/index.android.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import React from 'react';
import PropTypes from 'prop-types';
import {View} from 'react-native';
import {webViewStyles} from '../../style/StyleSheet';

const propTypes = {
children: PropTypes.node.isRequired,
};

const InlineCodeBlock = ({children}) => (
<View style={[webViewStyles.codeTagStyle]}>
{children}
</View>
);

InlineCodeBlock.propTypes = propTypes;
InlineCodeBlock.displayName = 'InlineCodeBlock';
export default InlineCodeBlock;
18 changes: 18 additions & 0 deletions src/components/InlineCodeBlock/index.ios.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import React from 'react';
import PropTypes from 'prop-types';
import {View} from 'react-native';
import styles, {webViewStyles} from '../../style/StyleSheet';

const propTypes = {
children: PropTypes.node.isRequired,
};

const InlineCodeBlock = ({children}) => (
<View style={[webViewStyles.codeTagStyle, styles.mbn5]}>
{children}
</View>
);

InlineCodeBlock.propTypes = propTypes;
InlineCodeBlock.displayName = 'InlineCodeBlock';
export default InlineCodeBlock;
18 changes: 18 additions & 0 deletions src/components/InlineCodeBlock/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import React from 'react';
import PropTypes from 'prop-types';
import {Text} from 'react-native';
import {webViewStyles} from '../../style/StyleSheet';

const propTypes = {
children: PropTypes.node.isRequired,
};

const InlineCodeBlock = ({children}) => (
<Text style={[webViewStyles.codeTagStyle]}>
{children}
</Text>
);

InlineCodeBlock.propTypes = propTypes;
InlineCodeBlock.displayName = 'InlineCodeBlock';
export default InlineCodeBlock;
Loading